Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,193 Commits 64 Branches 1,256 Tags
e966de7bf0fd0f4eecff7ace286d4863565bbd7b
Commit Graph

9193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alice Harris c1a6c514e6 fix capitalisation of GitHub 2014-08-21 05:22:33 +10:00
Tyler Renelle 50a34eb6c7 fix(tags): fix sortable tags by separating edit & !edit into diff 
<ul>s (cc @Fandekasp)
 2014-08-19 15:21:39 -06:00
Tyler Renelle a55738b06f Merge branch 'Fandekasp-sortable_tags' into develop 2014-08-19 15:02:06 -06:00
Tyler Renelle 88d27e2153 Merge branch 'Fandekasp-sortable_tags' into develop 
Conflicts:
	public/js/directives/directives.js
 2014-08-19 15:00:36 -06:00
Tyler Renelle 750135b673 feat(sortable): use angular-ui-sortable instead of jqueryui directly 2014-08-19 14:35:10 -06:00
Tyler Renelle ba8cda2e51 Merge pull request #3425 from denis-sokolov/user-findtask-patch 
chore(user): tiny cleanup in findTask function
 2014-08-19 13:12:51 -06:00
Tyler Renelle 978d0e0528 Merge remote-tracking branch 'remotes/denis-sokolov/patch-1' into develop 
Conflicts:
	README.md
 2014-08-19 13:05:43 -06:00
Tyler Renelle 3ca84d8ef1 Merge pull request #3139 from mapleoin/partygems 
fix Guild Gems strings on the party tab
 2014-08-19 12:55:11 -06:00
Tyler Renelle b85caaf248 Merge pull request #2079 from fmarier/optimized_images 
Optimized images
 2014-08-19 12:50:13 -06:00
Tyler Renelle cac37d75bf Merge pull request #3846 from titilambert/develop 
Add docker file
 2014-08-19 12:48:08 -06:00
Tyler Renelle 5e19663b71 fix(i18n): es_419 bug, use english translation for now (@paglias is this ok?) 2014-08-19 12:39:23 -06:00
Matteo Pagliazzi 6340312695 fix(fbAuth): get user email @lefnire this should be all we need but not having the keys i can not test before going live 2014-08-19 04:41:04 +02:00
Tyler Renelle faed77f186 bailey(mobile): 2014-08-18 19:58:47 -06:00
Tyler Renelle ae1c075f8a refactor(spritesmith): move potions, eggs, food to stable/*. Move 
remaining inventory to misc/*
 2014-08-18 19:15:19 -06:00
Tyler Renelle ab9393b694 bailey(audio): add bailey for audio 2014-08-18 19:12:05 -06:00
Tyler Renelle a88fde9862 feat(quests): parrot quest 2014-08-18 19:04:31 -06:00
Tyler Renelle 475e4c0e4e feat(quests): Parrot quest 2014-08-18 19:00:36 -06:00
Matteo Pagliazzi 81b96b0f7e fix(i18n): add support for latin american spanish 2014-08-18 19:17:40 +02:00
Matteo Pagliazzi 8ec929c040 chore(i18n): update locales & add latin american spanish 2014-08-18 19:03:16 +02:00
Matteo Pagliazzi 6db5b53c81 fix(groupsServices): allow for direct modification of data @lefnire it is necessary for mobile but does not break anything 2014-08-18 13:48:01 +02:00
Matteo Pagliazzi 6d251aeb91 feat(mobile): adapt boss box to mobile 2014-08-17 15:39:12 +02:00
Matteo Pagliazzi 4c8309c8cc fix(jade): fix warings 2014-08-17 13:32:09 +02:00
Matteo Pagliazzi 0837f2c39b fix(mobile): start adapting boss to mobile 2014-08-17 13:29:40 +02:00
Alice Harris 3c971b630e create a mongodb JavaScript script to report on how many users own specified gear 2014-08-17 17:25:53 +10:00
Matteo Pagliazzi 15641b5f37 fix(i18n): add moment support for chinese 2014-08-16 20:16:44 +02:00
Matteo Pagliazzi ed5f67b5d4 chore(i18n): add chinese, update locales 2014-08-16 19:11:44 +02:00
Matteo Pagliazzi 9f56819d81 chore(i18n): update locales 2014-08-16 13:16:07 +02:00
Alice Harris 59500b93ab create localisation strings for Community Guidelines document 2014-08-16 19:18:57 +10:00
Tyler Renelle f27e547740 feat(audio): update audio locales for https://github.com/HabitRPG/habitrpg/commit/39911ef8e043cd3826d3c39a98126df8dad6a793 2014-08-16 19:18:56 +10:00
Matteo Pagliazzi 59a3afa3fd chore(i18n): update locales 2014-08-16 19:18:56 +10:00
Tyler Renelle c2ac401c76 feat(quests): lvl 15 ATOM quest drop 2014-08-16 19:18:56 +10:00
Adrien Lemaire dacb435110 add 2 more translatable strings 2014-08-16 19:18:55 +10:00
Adrien Lemaire 5ed2322fa8 add music translatable strings 2014-08-16 19:18:54 +10:00
efim 80a869d1bd Added notification to challenge prize pop, for issue #2094, until gems get refunded on challenge cancelation. 2014-08-16 19:18:54 +10:00
Tyler Renelle 6ce622d9f3 Revert "Change newPassSent to reflect 'Reset Password' not failing on non-existent email" 
This reverts commit 2d2c2d27a1.
 2014-08-16 19:18:54 +10:00
Tyler Renelle 890db5bd6d Merge pull request #3858 from pizzeys/develop 
Fix gem text alignment on the menubar.
 2014-08-15 20:07:22 -06:00
Tyler Renelle 39911ef8e0 feat(audio): refactor user.preferences.{sound,soundTheme} into just 
user.preferences.sound. Fix audio dropdown bug by moving to list-items instead
 2014-08-15 18:13:59 -06:00
Tyler Renelle 80a63575c9 feat(audio): update audio locales for https://github.com/HabitRPG/habitrpg/commit/39911ef8e043cd3826d3c39a98126df8dad6a793 2014-08-15 18:13:44 -06:00
Tyler Renelle 06b6b4cde0 Merge pull request #3856 from Fandekasp/add_audio 
Add audio
 2014-08-15 17:30:12 -06:00
Tyler Renelle 808c06e46f Merge pull request #275 from Fandekasp/add_audio 
add music translatable strings
 2014-08-15 17:28:31 -06:00
Matteo Pagliazzi 1a7646bc98 chore(i18n): update locales 2014-08-15 20:18:08 +02:00
Alice Harris eba0d2ad5c add Tavern Community Guidelines message 2014-08-13 09:20:00 +10:00
Tyler Renelle fb16458efd bailey(quests): lvl 15 ATOM drop 2014-08-12 16:18:26 -07:00
Tyler Renelle d3520e48e4 feat(quests): lvl 15 ATOM quest drop 2014-08-12 16:18:08 -07:00
Alice Harris 2ad5d4b00b Merge pull request #3870 from Alys/dropNotifications 
adds drop notifications for eggs, food - partial? fix for https://github.com/HabitRPG/habitrpg/issues/3787
 2014-08-12 07:29:41 +10:00
Alice Harris 2566ddac94 fixes missing drop notifications - fixes https://github.com/HabitRPG/habitrpg/issues/3787 2014-08-12 07:14:50 +10:00
Alice Harris 87bd2c9023 add communityGuidelines text 2014-08-12 06:39:33 +10:00
Adrien Lemaire 5ca2084744 add shared logic for tag sorting 2014-08-10 23:01:30 +09:00
Adrien Lemaire e5bb299ad0 Make tags sortable with drag&drop 2014-08-10 23:00:27 +09:00
Alice Harris 9078f4d007 remove redundant moderator message 2014-08-10 14:42:27 +10:00