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

4560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Renelle fd6eb8724e feat(valentine): valentine event 2014-02-13 18:40:33 -07:00
Tyler Renelle 8ba12ef392 chore(contribs_plan): add migration so contribl.lvl >= 7 gets free 
plan4life
 2014-02-13 11:54:45 -07:00
Tyler Renelle c8faffcc72 fix(css): temp fix for bailey height 2014-02-12 22:31:32 -07:00
Tyler Renelle 7456f00dc6 feat(toolbar): try with icons instead of text, test against prod / beta 
& get a vote.
 2014-02-12 22:17:26 -07:00
Tyler Renelle 5501d57e10 fix(toolbar): tweaks 2014-02-12 21:51:35 -07:00
Tyler Renelle f6abfc67b3 feat(tracking): gems > toolbar separately from wallet 2014-02-12 21:44:27 -07:00
Tyler Renelle 2750548d35 chore(bailey): bailey for chat notifs & toolbar 2014-02-12 21:37:14 -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 f72cb21300 feat(toolbar): add toolbar featuring navigation, gems / subs, bailey, & 
chat / invite notifications
 2014-02-12 21:21:36 -07:00
Tyler Renelle ce82be637d feat(groups): add group chat notifications 2014-02-12 21:21:30 -07:00
Matteo Pagliazzi bb852ce9e5 Merge pull request #2827 from HabitRPG/paglias/optimizations 
Optimizations
 2014-02-12 19:21:10 +01:00
Matteo Pagliazzi 99474729aa fix(typo) 2014-02-12 19:10:45 +01:00
Matteo Pagliazzi bb6931fe83 refactor(grunt): cache gifs 2014-02-12 18:08:17 +01:00
Matteo Pagliazzi fef858d555 refactor(caching): cache emojis and remove gemoji from bower 2014-02-12 15:21:40 +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
Matteo Pagliazzi fb496de42f refactor(caching): only 1 css file, use grunt-contrib-cssmin to rewrite urls 2014-02-12 14:34:50 +01:00
Matteo Pagliazzi fbe3ecc033 refactor(grunt): simplify run:dev task 2014-02-12 13:59:13 +01:00
Matteo Pagliazzi aaa230790b Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2014-02-12 10:49:30 +01:00
Matteo Pagliazzi 094a4be001 fix(i18n): do not save user language for now 2014-02-12 10:49:10 +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
Tyler Renelle 72b6c9bc91 feat(event-tracking): track registration count 2014-02-11 17:53:12 -07:00
Tyler Renelle 9217b5174a feat(event-tracking): pass ga to server user.ops 2014-02-11 17:49:19 -07:00
Matteo Pagliazzi c4244bc3b6 fix(misc) 2014-02-11 21:43:17 +01: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
Matteo Pagliazzi 19139f562b fix(misc): isStaticPage and debug buttons 2014-02-11 18:44:22 +01:00
Matteo Pagliazzi 975b516573 fix(css): menu and gems wallet margin 2014-02-11 18:37:20 +01:00
Matteo Pagliazzi e75a9423d4 Merge pull request #2813 from benmanley/develop 
Fix alignment of task meta icons (glyphicons)
 2014-02-11 18:10:07 +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 42766125d5 fix(pets): add questPets to UserSchema.items.mounts too fixes #2814 2014-02-10 19:51:53 -07:00
Tyler Renelle 0c99976bf5 fix(event-tracking): stripe sub, not pp 2014-02-10 18:54:29 -07:00
benmanley 39ec102326 Fix alignment of task meta icons (glyphicons) 2014-02-10 22:22:54 +00:00
Tyler Renelle d89fb17b03 feat(event-tracking): track ecommerce events 2014-02-10 14:14:45 -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 2b9089a204 Merge branch 'event-tracking' into develop 2014-02-10 13:26:55 -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
Matteo Pagliazzi a22e28143f fix(css): lighter columns title 2014-02-10 19:04:57 +01:00
Matteo Pagliazzi 1c41c4ddb9 fix(css): better food tray 2014-02-10 18:38:58 +01:00
Matteo Pagliazzi 4a05c36687 Merge pull request #2809 from benmanley/develop 
Fix food tray z-index
 2014-02-10 18:35:55 +01:00
benmanley 18f922c756 Fix food tray z-index 2014-02-10 13:30:54 +00:00
Matteo Pagliazzi a7e3e76daa refactor(bs3): add fixed height modals & panels for quests & group members 2014-02-09 16:29:16 +01:00
Matteo Pagliazzi 3f28d16478 refactor(bs3): add fixed height modals & panels 2014-02-09 16:25:10 +01:00
Matteo Pagliazzi 1a44c3cf0c refactor(bs3): css 2014-02-09 16:16:43 +01:00
Matteo Pagliazzi 5874941b94 refactor(bs3): inventory & misc 2014-02-09 12:32:12 +01:00
Cole Gleason c5b2d28ef9 Merge pull request #2801 from lorian/beastmaster-count 
Fixes beastmaster to not count gryphons
 2014-02-08 22:32:09 -06: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