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

444 Commits

Author SHA1 Message Date
Negue bf662ff119 fix rootCtrl.js ; forgot a comma while merging... 2014-10-01 20:53:29 +02:00
negue a595880568 Merge pull request #4044 from negue/apiUrlService 
Use ApiUrlService in all services
 2014-10-01 19:58:26 +02:00
Alice Harris ee325ce27f Merge pull request #4093 from deilann/release_pets 
feat(pets): release pets
 2014-10-01 06:35:36 +10:00
deilann 8427c53d90 release pets feature 2014-09-29 13:35:38 -07:00
Tyler Renelle efd17fe86b GA demographics 2014-09-26 13:45:01 -06:00
Negue 8f468c27ff use ApiUrlService instead of API_URL; fixed spacing in groupsCtrl.js 2014-09-16 20:52:32 +02:00
Alice Harris 6e33c237d3 Merge pull request #4022 from Alys/partyAvatarSortOrder 
improve and clarify party avatar sort options for header - fixes https://github.com/HabitRPG/habitrpg/issues/2239
 2014-09-16 14:15:01 +10:00
Alice Harris b5ee56b079 Merge pull request #4007 from Alys/pushToBottom-sortOrder-Sep03 
add support for pushTaskToBottom to help with To-Do sort order bug
 2014-09-12 14:05:52 +10:00
Alice Harris e6a29f80fa Merge pull request #4002 from Alys/questAbortFix 
add Cancel button for quests, allow party to cancel/abort if quest owner missing, add Debug tools for quest testing
 2014-09-12 14:01:09 +10:00
Alice Harris 5afb258aa9 add sort by name and background for party avatars in header, remove sort option from guilds pages 2014-09-12 09:47:02 +10:00
Alice Harris d9661cf089 hide Plain Egg mounts and remove them from the totalMounts count 2014-09-11 17:59:37 +10:00
Alice Harris 6cc1d1146e refactor User.user.ops.sortTask into $scope.pushTask 2014-09-09 17:04:13 +10:00
Alice Harris b5ac0c635a improve new code for cancelling quests in invitation stage and for handling the cases where the quest owner is no longer in the quest or in the party 2014-09-09 06:00:23 +10:00
Alice Harris f520b8ae66 add extra Debug tools useful for quests 2014-09-09 06:00:23 +10:00
Alice Harris 2350989dfb prevent harmless but annoying 404 errors for sound files when sound is off 2014-09-05 18:45:52 +10:00
Alice Harris 28505c139f allow newly created tag to have the same UUID on client and server - fixes https://github.com/HabitRPG/habitrpg/issues/2856 2014-09-03 06:16:46 +10:00
Tyler Renelle f981223153 fix(sortable): revert back to jqueryUI, fixes #3946 2014-08-28 16:32:05 -06:00
Tyler Renelle 4ba860ea8c fix(sortable): don't trigger sort when dragging in place, fixes #3926 2014-08-26 14:32:21 -06:00
Tyler Renelle 96532ed6bd Merge pull request #3925 from ebiagogo/develop 
Fixed bug #3007 where using wrong "old password" when changing password ...
 2014-08-26 14:00:18 -06:00
Michael Looby e19aca0036 Fixed bug #3007 where using wrong "old password" when changing password results in "Password changed succesfully" message even though password change fails. 2014-08-26 15:33:36 -04:00
Tyler Renelle ef322443f9 refactor(tags): small cleanup 2014-08-26 10:24:43 -06:00
Tyler Renelle 0b9c5271bb feat(newStuff): show newStuff modal on page load if present 2014-08-25 17:49:53 -06:00
Tyler Renelle 184e145914 Merge remote-tracking branch 'refs/remotes/nmjones/develop' into develop 
Conflicts:
	views/options/settings.jade
 2014-08-23 16:05:17 -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 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 06b6b4cde0 Merge pull request #3856 from Fandekasp/add_audio 
Add audio
 2014-08-15 17:30:12 -06:00
Alice Harris 2566ddac94 fixes missing drop notifications - fixes https://github.com/HabitRPG/habitrpg/issues/3787 2014-08-12 07:14:50 +10:00
Adrien Lemaire e00ea4c248 add missing sound actions 2014-08-09 19:09:58 +09:00
Adrien Lemaire d7aaec2262 fix bug switch audio wasn't working 2014-08-09 18:57:17 +09:00
Adrien Lemaire a5f1e30880 fix bug music not playing if music menu not open + integrate daily/todo/reward sounds 2014-08-09 17:29:56 +09:00
Adrien Lemaire 3d2d8fbfef clean branch from develop to add audio 2014-08-08 23:03:52 +09:00
Tyler Renelle 2d34c1cb9b Merge pull request #3818 from cstyles/null-history 
Don't display chart if history is empty (#3691)
 2014-08-06 18:38:30 -06:00
Matteo Pagliazzi 1d92ddd645 feat(i18n): add change language button on front page, fix #3530 2014-08-03 18:23:13 +02:00
Matteo Pagliazzi 176b39a1a0 fix(typo) 2014-08-03 12:55:17 +02:00
Matteo Pagliazzi a30ee4368a fix(notifications): fix drop notifications 2014-08-03 12:28:29 +02:00
Collin Styles 0b01ff2201 Don't display chart if history is empty. 2014-07-31 14:56:52 -07:00
Tyler Renelle 6e29facb98 feat(block-user): allow suspending user accounts (due to TOS violation or such) through Hall. @lemoness 2014-07-25 12:14:48 -06:00
Tyler Renelle dda7f86433 Merge branch 'thedavemarshall-update_billing_info' into develop 2014-07-21 14:48:17 -06:00
David Marshall 5cc4c60329 Edit stripe cc subscriptions 2014-07-21 01:08:56 -07:00
Tyler Renelle acc874c60d Merge pull request #3597 from 3onyc/feature/username-change 
Implement "Change username" feature
 2014-07-19 16:48:20 -06:00
Tyler Renelle 34236536df feat(admin): allow admins to update user's items (restoring lost items, 
granting quest scrolls, etc). @deilann :)
 2014-07-17 14:09:39 -06:00
Tyler Renelle d848faee8e fix(quests): show completion dialog 2014-07-12 14:32:13 -06:00
Tyler Renelle 80dbc1111e fix(quests): when leaving group, if leader or quest.leader is leaving, 
re-assign to most senior member. #3709
 2014-07-11 16:29:42 -06:00
Tyler Renelle c180d899c1 perf(groups): bindonce on guild listings for better performance guild 
page. This requires refreshing when making changes to guilds. Fixes #3663
 2014-06-29 13:33:40 -06:00
Nicolás Jones 9f8baa617e Update settingsCtrl.js 2014-06-18 00:03:45 -03:00
Nicolás Jones f7727eef23 Update settingsCtrl.js 2014-06-18 00:03:21 -03:00
Tyler Renelle 3136b4cc2c feat(debug): debug buttons for NODE_ENV==test too 2014-06-16 13:25:51 -06:00
deilann 7ec679d11a Merge pull request #3609 from yafinee/chart 
#1623 - charts: readable (vertical) labels on horizontal axis
 2014-06-15 01:58:35 -07:00
vagrant 0d73330ab6 #1623 - charts: readable (vertical) labels on horizontal axis 2014-06-15 08:50:03 +00:00