Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,176 Commits 64 Branches 1,256 Tags
69fdff615a333e7b2baefdeeb2b19922b852a4e9
Commit Graph

559 Commits

Author SHA1 Message Date
Blade Barringer 955c163544 Merge branch 'develop' into refactor-content 2015-09-23 07:52:36 -05:00
Sabe Jones 6a6b67b9c1 Merge pull request #5909 from HabitRPG/sabrecat/social-buttons 
Front page Tweet button
 2015-09-22 17:38:47 -05:00
Blade Barringer 8881dbc034 Remove uneeded blank spaces 2015-09-16 20:01:42 -05:00
Sabe Jones eb0dd636c1 feat(hourglass): Confirm before buy 2015-09-16 17:40:25 -04:00
Sabe Jones fb50f27fa7 fix(hourglass): Use method on $scope 2015-09-16 16:46:12 -04:00
Sabe Jones 98cd8364c6 feat(hourglass): Individual filter functions 2015-09-16 16:35:04 -04:00
Blade Barringer 78fe1073d4 Add user sync to sendAction 2015-09-15 16:39:08 -05:00
Blade Barringer 0fe6054b76 Add missing client code 2015-09-15 10:53:56 -05:00
Blade Barringer b32e521c56 Pull in client side changes for quest routes 2015-09-15 09:35:17 -05:00
Blade Barringer 5553d74334 Create method to calculate whether or not user has attained all mystery equipment 2015-09-13 16:26:29 -05:00
Blade Barringer b6f02d388f Correct method to correctly add an hourglass in debug menu 2015-09-13 16:25:57 -05:00
Blade Barringer cd4ec5bd12 Adjust formatting in footer controller 2015-09-13 02:19:34 -05:00
Blade Barringer 14fabfbe40 Remove excess white space 2015-09-12 22:34:58 -05:00
Sabe Jones 9d5f9328da WIP(social): Twitter widget script 2015-09-10 17:44:52 -04:00
melarish 05cf144630 Pulled and merged 2015-09-09 23:23:45 +01:00
Sabe Jones f8ce7c2292 fix(analytics): Track modals correctly 
Fixes #5879.
 2015-09-07 22:23:42 -04:00
Sabe Jones f044f83772 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2015-09-07 21:55:28 -04:00
Blade Barringer bb06e95c4e Add emoji class to list of classes that should not use pixelated rendering 2015-09-07 15:29:24 -05:00
Sabe Jones d6f416b6d3 feat(analytics): Track party buttons 2015-09-07 12:02:01 -04:00
Blade Barringer 6a1d4adcda Merge branch 'develop' into HabitRPG-sabrecat/faq 2015-09-06 17:10:45 -05:00
Blade Barringer 4177202cee Merge pull request #5855 from HabitRPG/sabrecat/party-page 
Party Page Revamp
 2015-09-06 13:28:14 -05:00
Blade Barringer f1224bc6be Use select instead of an input for cds 2015-09-06 09:36:29 -05:00
Blade Barringer 085a785e4d Convert input to select box 2015-09-06 09:22:40 -05:00
Blade Barringer 9ce6144fa4 Adjustments to custom day start 2015-09-05 15:32:49 -05:00
Blade Barringer d45602c340 Adjust spacing 2015-09-05 09:45:08 -05:00
Blade Barringer 9bcaea6fa2 Merge branch 'develop' into carolstone-chron-run-early-issue-4488 2015-09-05 09:32:24 -05:00
Blade Barringer 6fc8e0b5a5 Merge branch 'develop' into sabrecat/party-page 2015-09-05 09:20:06 -05:00
Blade Barringer f65ca3cf48 Fix bug where non-party members could not send invitations 2015-09-05 08:02:00 -05:00
Alys e0b57fa2c5 remove Show Classes Tour button from Settings page, and associated code 2015-09-05 17:29:27 +10:00
Blade Barringer 807e6eb7cf Merge branch 'develop' into sabrecat/party-page 2015-09-04 19:00:48 -05:00
Sabe Jones 7637b55195 fix(style): Move accordion tweaks to static.styl 2015-09-04 17:50:01 -04:00
Blade Barringer 1eac011d0e Remove padding rule 2015-09-04 16:46:16 -05:00
Blade Barringer 047a88cef5 Merge branch 'zedutchgandalf-develop' into gulp_build 2015-09-04 16:35:45 -05:00
Blade Barringer f7df464ebd Remove unneeded class 2015-09-04 16:24:10 -05:00
Sabe Jones 0a71037095 fix(accordion): Move jQuery to static.js 2015-09-04 17:19:23 -04:00
Sabe Jones 869651f5a2 feat(FAQ): Static FAQ page 
Introduces a new static page for Frequently Asked Questions, linked from the Help menu. Fixes #5773.
 2015-09-04 15:05:15 -04:00
Robin Arys e6a0f405e3 Fix Bailey's news modal 2015-09-04 15:56:32 +02:00
Robin Arys 39df743693 Change headers to use the proper ones 2015-09-04 15:52:34 +02:00
Robin Arys c5d1f37499 Add small margin to images so text doesn't stick to them 2015-09-04 10:42:05 +02:00
Robin Arys a497724d18 Fix Bailey's modal 2015-09-04 10:41:40 +02:00
Robin Arys c7dc8d551b Remove small_news_header and big_news_header CSS classes 2015-09-04 10:41:22 +02:00
Robin Arys 39c85b9938 Make CSS statement more precise to make sure I'm not changing stuff I don't want to change. 2015-09-04 00:42:55 +02:00
Robin Arys 74dc455183 fix spacing 2015-09-04 00:22:51 +02:00
Robin Arys d03acee4bc Redesign static old news page per #5836 2015-09-04 00:22:41 +02:00
Sabe Jones b5124e6cd8 fix(warnings): Show modal only once 
Also removes a random extra newline.
 2015-09-03 11:12:54 -04:00
Sabe Jones e6068b23a7 feat(analytics): Track low health modal 2015-09-02 17:03:32 -04:00
Sabe Jones 1a675b8461 feat(warning): Revised low health modal 2015-09-02 16:31:56 -04:00
Sabe Jones e82f73c712 Merge branch 'develop' into sabrecat/modal-warnings 2015-09-02 15:17:33 -04:00
melarish b2bb6016fa Added +1 Hourglass to debug menu 2015-09-02 18:12:48 +01:00
Sabe Jones 6f85fcfde2 Merge branch 'develop' into sabrecat/party-page 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
 2015-09-01 13:40:20 -05:00