sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 01:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4648 commits 3 branches 0 tags 1.6 GiB
Commit graph

780 commits

Author SHA1 Message Date
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
Matteo Pagliazzi
35a997c690 Merge pull request #2917 from benmanley/stable-styles 
Move CSS for pets that have been raised into mounts from stable.jade to inventory.styl
 2014-02-22 15:25:01 +01:00
Tyler Renelle
a8e890a6df feat(premium): mystery items 2014-02-21 17:37:37 -08:00
benmanley
e050bed42c Remove obsolete comment 2014-02-21 22:25:31 +00:00
benmanley
598088df03 Delete -ms-filter value as it is automatically added when compiled 2014-02-21 21:25:46 +00:00
benmanley
8c2c940d88 Move styles from stable.jade to inventory.styl file 2014-02-21 12:49:46 +00:00
benmanley
c04caefaac Fix positioning of paw sprites 2014-02-21 12:49:46 +00:00
Tyler Renelle
02c283b628 chore(Merge): remote-tracking branch 'marcgenesis/develop' into develop 
Conflicts:
	views/options/settings.jade
 2014-02-20 16:34:28 -08:00
Tyler Renelle
55782512bf feat(valentine): remove valentine event 2014-02-18 11:22:31 -07:00
Matteo Pagliazzi
9ba3362642 fix(css): remove padding for heroboxes in modals, fix #2872 2014-02-17 22:43:09 +01:00
Matteo Pagliazzi
705d8a3b1a fix(css): fix chooseClass modal herobox padding 2014-02-16 19:58:53 +01:00
Marc-André Larivière
dc75834ec4 Changed hints style (and small quick fixes) 2014-02-16 10:13:16 -05:00
Tyler Renelle
191b789d76 fix(bower): updated jquery directory 2014-02-14 20:04:59 -07:00
Matteo Pagliazzi
00bece28d4 chore(dependencies): update jquery path 2014-02-14 18:46:32 +01:00
Matteo Pagliazzi
e0193e36c3 chore(dependencies): update jquery parh 2014-02-14 18:43:18 +01:00
Tyler Renelle
844dc93316 chore(jquery): use updated jquery directory location 2014-02-13 22:04:53 -07:00
Tyler Renelle
fd6eb8724e feat(valentine): valentine event 2014-02-13 18:40:33 -07:00
Tyler Renelle
c8faffcc72 fix(css): temp fix for bailey height 2014-02-12 22:31:32 -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
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
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
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
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
benmanley
39ec102326 Fix alignment of task meta icons (glyphicons) 2014-02-10 22:22:54 +00: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
benmanley
18f922c756 Fix food tray z-index 2014-02-10 13:30:54 +00: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
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
b4be88f4e0 refactor(bs3): misc 2014-02-08 19:49:47 +01:00