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

84 Commits

Author SHA1 Message Date
Negue bf662ff119 fix rootCtrl.js ; forgot a comma while merging... 2014-10-01 20:53:29 +02:00
Negue 8f468c27ff use ApiUrlService instead of API_URL; fixed spacing in groupsCtrl.js 2014-09-16 20:52:32 +02: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
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 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
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
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 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 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
vagrant 0d73330ab6 #1623 - charts: readable (vertical) labels on horizontal axis 2014-06-15 08:50:03 +00:00
Tyler Renelle 0dadc86a61 fix(subscriptions): expose cancelSubscription on $rootScope (don't know 
why $scope doesn't work here). Fix UI bug
 2014-05-12 12:18:53 -06:00
Matteo Pagliazzi d242ee3291 refactor(i18n): use strings for content 2014-05-06 20:04:09 +02:00
Tyler Renelle 5296a584de Merge pull request #3155 from benmanley/notif-restyle 
Consolidate notifications into one menu
 2014-04-16 11:40:20 -06:00
benmanley fa91234907 Add Groups to $rootScope 
Allows messages to be cleared from a view
 2014-04-08 16:45:47 +01:00
Tyler Renelle 0f430e102e feat(subscriptions): add paypal recurring cancelation. refactor stripe & paypal code to use auth.authWithUrl. 2014-03-24 20:47:25 -06:00
Tyler Renelle 10c9595662 feat(subscriptions): convert paypal gem purchases from client-side javascriptButtons to serverside NVP 2014-03-24 20:47:18 -06:00
Tyler Renelle d1a2fbbbd9 feat(subscriptions): implement partial paypal-recurring. It's having issues with cookies 2014-03-24 20:47:10 -06:00
Matteo Pagliazzi c41097b6ec fix(i18n): remove duplicate string 2014-02-24 18:35:48 +01:00
Tyler Renelle 55782512bf feat(valentine): remove valentine event 2014-02-18 11:22:31 -07:00
Tyler Renelle fd6eb8724e feat(valentine): valentine event 2014-02-13 18:40:33 -07:00
Tyler Renelle ff9d4b886e fix(event-tracking): typo 2014-02-11 19:02:20 -07:00
Tyler Renelle b093717b8d feat(event-tracking): better page-view tracking via ui-router 2014-02-11 18:30:43 -07:00
Tyler Renelle 2480591444 refactor(bs3): put paypal button back in, use javascript API to 
construct button on `ng-init` (since you can't nest script tags)
 2014-02-10 13:28:16 -07:00
Tyler Renelle ffb42906e1 feat(event-tracking): start adding some client-side GA event-tracking 2014-02-10 11:33:40 -07:00
Matteo Pagliazzi e4bd817443 refactor(bs3): sync with develop 2014-02-06 17:36:33 +01:00
Marcelo Sizer 386d108c3c Replace hard-coded strings for window.env.t on js files 2014-02-05 20:43:49 -02:00
Matteo Pagliazzi ce5edbee58 refactor(bs3): consistent style for modals 2014-02-05 16:51:35 +01:00
Matteo Pagliazzi cdc13d2ffb refactor(bs3): misc 2014-02-03 19:24:37 +01:00
Matteo Pagliazzi 07593dc122 refactor(bs3): port quests modals, fix restore modal and various bugs 2014-02-02 16:43:58 +01:00
Matteo Pagliazzi 571954b5cf refactor(bs3): misc fixes, port restore, delete and reset modals 2014-02-02 16:06:30 +01:00
Matteo Pagliazzi 317a148760 refactor(bs3): port newStuff and member modals, misc fixes 2014-02-02 15:55:01 +01:00
Matteo Pagliazzi f6a8b9e4cb refactor(bs3): port some modals & css fixes 2014-02-01 19:19:48 +01:00
Matteo Pagliazzi af42ec263e refactor(bs3): port several modals & css fixes 2014-02-01 17:04:21 +01:00
Sabe Jones 2d97577708 Textual tweaks for spellcasting 
Makes the notification for casting a spell on the party consistent with the message generated in party chat.
 2014-02-01 07:01:40 -06:00
Tyler Renelle 2e18f0eb82 feat(premium): backport client-side premium code to public repo, it's 
client-side anyway (@colegleason @paglias)
 2014-01-27 16:34:22 -08:00
Matteo Pagliazzi 13131087ff fix(translations): add env.t to rootScope 2014-01-24 23:19:17 +01:00
Tyler Renelle 47bd6dcb79 fix(spells): more $rootScope spell-casting bug fixes 2014-01-22 00:27:55 -08:00
Tyler Renelle e0646bb98d fix(spells): add some spells tests, don't send up body to spell paths 2014-01-22 00:16:52 -08:00
Tyler Renelle c6f7ab8a5c fix(spells): some $rootScope.applying action fixes so cast-ending is 
immediate instead of waiting on response. Also, slim down party
population to the essentials to avoid RequestEntityTooLarge
 2014-01-21 23:04:01 -08:00
Tyler Renelle a1df41ad81 fix(spells): <ESC> to cancel spell-casting 2014-01-18 14:15:45 -07:00
Andrew Bloomgarden dc368bb652 Remove references to $rootScope.Shared & .Content in non-view code. 
Instead, have them request services that return them so tests don’t need to prepare special state.
 2014-01-15 21:33:58 -08:00
Tyler Renelle 8095397317 Quests: hurt boss via score method, refactor chat function, change all content.*.name to content.*.key for consistency 2013-12-23 01:19:18 -07:00
Tyler Renelle 8b8f385fff winter: make bailey head more visible with holiday gear (remember to 
revert this after 1/31!)
 2013-12-20 23:14:08 -07:00
Tyler Renelle bf699ca466 Merge branch 'winter' into develop 2013-12-20 21:59:54 -07:00
Tyler Renelle 58195d9eeb #2012 preventDefault as well as stopPropagation. This will preven the 
checkbox from getting checked, which may not be desirable, but at least
 prevents the bug for now
 2013-12-20 19:57:03 -07:00
Tyler Renelle a4ba5b036f save user on spell-cast (so we don't get second mp loss notif) 2013-12-20 18:52:14 -07:00