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

513 Commits

Author SHA1 Message Date
Tyler Renelle a608419bba feat(coupons): add coupon-code feature 2014-04-16 23:28:37 -06:00
Tyler Renelle 178cfcd6e6 feat(toolbar): only one expanded menu at a time 2014-04-16 22:46:49 -06: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
James Hsiao a68bb48eb2 Upped opacity on notifications 2014-04-16 09:59:35 -04:00
Tyler Renelle 56ab7384cf feat(premium): disallow deleting accounts until they've cancelled 
payment plans
 2014-04-14 23:07:30 -06:00
James Hsiao abed47d80f updated width and positioning of pnotify items 2014-04-13 20:56:21 -04:00
James Hsiao 1811585165 Added pnotify in place of growl 2014-04-08 22:16:05 -04:00
benmanley fa91234907 Add Groups to $rootScope 
Allows messages to be cleared from a view
 2014-04-08 16:45:47 +01:00
benmanley c80f7671db Add filter to round gold > 999 to nearest thousand 2014-04-08 16:43:58 +01:00
Tyler Renelle 8c23bd0d21 chore(april-fools): revert april fools 2014-04-02 00:05:33 -06:00
Tyler Renelle 71a23096cc feat(april-fools): april fools (revert here when done) 2014-03-31 20:12:16 -06: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
Sabe Jones e109128570 fix(alerts): Align alerts better with new toolbar 
Changes the top offset for Experience, Gold, etc. alerts so that they don't obscure the currency set in the new top toolbar.
 2014-03-22 11:37:21 -05:00
Tyler Renelle 239e8abf68 feat(equipment): remove base gear from equipment. index.coffee is now 
such that when you click the same gear you have equipped, it un-equips.
 2014-03-21 15:03:46 -06:00
Matteo Pagliazzi acb31b99ad fix(stikyHeader): fix #2904 2014-03-06 14:47:35 +01:00
Tyler Renelle 2209bd5a0c chore(bower): back to angular-ui-router SHA, I'll explain on GH for this commit 2014-02-28 23:48:20 -07:00
Tyler Renelle 01180416ef fix(ui-router): upgraded angular-ui-router, $anchorScroll no 
longer supported. See https://github.com/angular-ui/ui-router/pull/715
for autoscroll attribute if we need to enable/disable ui-view
autoscrolling in certain locations (cc @paglias)
 2014-02-28 22:42:27 -07:00
Matteo Pagliazzi c41097b6ec fix(i18n): remove duplicate string 2014-02-24 18:35:48 +01:00
Tyler Renelle a8e890a6df feat(premium): mystery items 2014-02-21 17:37:37 -08: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 5501d57e10 fix(toolbar): tweaks 2014-02-12 21:51:35 -07:00
Tyler Renelle c95c6a4c3b chore(modals): remove mathUpdates modal (no longer in use). reference 
this commit for any future emergency updates
 2014-02-12 21:24:50 -07:00
Tyler Renelle ce82be637d feat(groups): add group chat notifications 2014-02-12 21:21:30 -07:00
Matteo Pagliazzi 99474729aa fix(typo) 2014-02-12 19:10:45 +01:00
Matteo Pagliazzi 8fdc5327e9 refactor(grunt and caching): cache icon fonts, spritesmith and use icons from spritesmith for coins notification 2014-02-12 15:10:22 +01: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
Matteo Pagliazzi fa2c64d2d8 chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings 2014-02-11 19:30:55 +01:00
Tyler Renelle cbb448478e feat(marketing): more copy for mobile 2014-02-11 01:34:42 -07:00
Tyler Renelle cb079977e6 feat(marketing): start fleshing out the about page with images, content, 
etc. Create separate videos page
 2014-02-11 00:51:29 -07:00
Tyler Renelle ebd1df932e fix(bs3): fix to MemberModalCtrl parameter 2014-02-10 13:48:34 -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 f7b4a04a59 feat(event-tracking): add server-side GA tracking for ecommerce events 2014-02-10 11:35:33 -07:00
Tyler Renelle ffb42906e1 feat(event-tracking): start adding some client-side GA event-tracking 2014-02-10 11:33:40 -07:00
Lorian 322b257b72 Separated stable into dropped pets, quest pets, and rare pets, and made countPets only count the former. Made countMounts only count dropped and quest-hatched mounts, not rare mounts. 2014-02-08 16:57:28 -08:00
Matteo Pagliazzi 3447524d41 refactor(bs3): chat suggestions, revert 2014-02-09 00:44:39 +01:00
Matteo Pagliazzi 1e3042a4b6 refactor(bs3): maybe fix for chat suggestions 2014-02-08 20:23:50 +01:00
Matteo Pagliazzi 9ea9ed841d refactor(bs3): buyQuest fix, add back badges colors, minor fixes 2014-02-08 19:20:10 +01:00
Tyler Renelle ce8351d622 chore(Merge): branch 'develop' into origin-paglias-bs3 
Conflicts:
	views/options/social/tavern.jade
 2014-02-07 00:03:33 -07:00
Tyler Renelle 106a7fa475 refactor(errors): refactor the way errors, offline, & queued ops are handled 2014-02-06 21:10:13 -07:00
Matteo Pagliazzi d6b3279e5c refactor(bs3): misc fixes 2014-02-06 18:35:12 +01:00
Matteo Pagliazzi e4bd817443 refactor(bs3): sync with develop 2014-02-06 17:36:33 +01:00
Matteo Pagliazzi 90e9a1aeaa i18n(refactor): load all files in a locale, not the ones defined in app.json, move env.t client code to own file, add env.isStaticPage (from isFrontPage) 2014-02-06 17:17:21 +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 5d4d82ad51 refactor(bs3): port options (profile, inventory, social (groups and hall)) and misc 2014-02-05 19:05:42 +01:00
Matteo Pagliazzi ce5edbee58 refactor(bs3): consistent style for modals 2014-02-05 16:51:35 +01:00
Matteo Pagliazzi ccc1230828 refactor(bs3): misc 2014-02-04 22:21:12 +01:00