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

4535 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tyler Renelle
e1240dde1d fix(missing-gems): remove ad-removal from script, since ads are part of subscription 2014-02-08 15:48:54 -07:00
Matteo Pagliazzi
1e3042a4b6 refactor(bs3): maybe fix for chat suggestions 2014-02-08 20:23:50 +01:00
Matteo Pagliazzi
46053cc520 refactor(bs3): spaces 2014-02-08 20:10:37 +01:00
Matteo Pagliazzi
f3c42f19ab refactor(bs3): hall form 2014-02-08 20:07:37 +01:00
Matteo Pagliazzi
5e98fa013d refactor(bs3): typo 2014-02-08 19:56:31 +01:00
Matteo Pagliazzi
b4be88f4e0 refactor(bs3): misc 2014-02-08 19:49:47 +01:00
Matteo Pagliazzi
9ea9ed841d refactor(bs3): buyQuest fix, add back badges colors, minor fixes 2014-02-08 19:20:10 +01:00
Matteo Pagliazzi
ee871ccb01 refactor(bs3): fixes 2014-02-08 16:58:41 +01:00
Matteo Pagliazzi
0fe0cb4f2d refactor(bs3): labels style and text, buttons classes 2014-02-08 16:27:34 +01:00
Matteo Pagliazzi
c8639c178d Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2014-02-08 15:31:43 +01:00
Tyler Renelle
313ec3d869 Merge branch 'develop' into bs3 
Conflicts:
	views/options/social/tavern.jade
 2014-02-07 23:41:14 -07:00
Tyler Renelle
982f194c85 Merge pull request #2791 from lorian/security-error 
Made incorrect username and password show the same error, for security purposes
 2014-02-07 22:29:43 -07:00
Tyler Renelle
7fbd84afd9 chore(angular): upgrade 1.2.1 => 1.2.11 2014-02-07 22:20:26 -07:00
Lorian
8d03cfc6b5 Made incorrect username and password show the same error, for security purposes. 2014-02-07 21:08:13 -08:00
Tyler Renelle
5db96ebca2 fix(bs3): port pet feeding bar 2014-02-07 21:57:26 -07:00
Tyler Renelle
37340d2318 fix(mounts): fix pets & mounts css to position the user based on 
pet/mount equip
 2014-02-07 21:48:11 -07:00
deilann
25941623b1 putting in issue ticket 
correctly putting in issue ticket for "report a bug"
 2014-02-07 17:44:56 -08:00
Tyler Renelle
3473b73452 chore(Merge): branch 'develop' into bs3 
Conflicts:
	views/options/inventory/inventory.jade
 2014-02-07 17:42:12 -07:00
Tyler Renelle
00c8a7f757 chore(cluster): max 2-core 2014-02-07 14:18:04 -07:00
Tyler Renelle
e404f35705 Revert "chore(cluster): temporarily disable cluster (revert here)" 
This reverts commit e36d3264be.
 2014-02-07 14:17:48 -07:00
Tyler Renelle
ef3e1396cb Revert "chore(bower): strange temporary fix. Can't remember where I picked this" 
This reverts commit 2d4d103ca6.
 2014-02-07 13:55:39 -07:00
Tyler Renelle
5d0ef55429 chore(bailey): update with stability info & subscriber links 2014-02-07 13:43:41 -07:00
Matteo Pagliazzi
2807b3f87d chore(logging): remove console.log 2014-02-07 21:08:46 +01:00
Tyler Renelle
677d23939d chore(bailey): add images for previous commit 2014-02-07 11:53:01 -07:00
Tyler Renelle
82241634b3 chore(bailey): bailey re: rainbow hair, critical hammer, mystery item 2014-02-07 11:42:05 -07:00