Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,718 Commits 64 Branches 1,256 Tags
1202c624f1dd2af08fcaf007c19b8adf73ffb06e
Commit Graph

45 Commits

Author SHA1 Message Date
Alys 1202c624f1 Revert "Added hide and error message when a user tries to create a challenge for..." 2015-03-27 20:11:12 +10:00
Alys f16ef869a3 Merge pull request #4836 from TheHollidayInn/fix-max-value-0-challenges 
Added hide and error message when a user tries to create a challenge for...
 2015-03-27 19:21:51 +10:00
kholliday a7873a41a1 Added icons to Notification for the item that is dropped. 2015-03-24 16:28:24 -05:00
Tyler Renelle 5de42b03c9 fix(analytics): remove testing code 2015-03-20 17:03:01 -06:00
Sabe Jones fbcf8e9a6f Merge pull request #4895 from SabreCat/spring2015 
Spring Fling 2015
 2015-03-20 17:29:02 -05:00
Tyler Renelle 009b582f25 feat(analytics): add A/B testing on play button using GA's Experiments 
API. Revert this after the experiment
 2015-03-20 14:44:47 -06:00
Sabe Jones ae25af7c02 fix(shop): Enable head accessories 2015-03-20 15:27:56 -05:00
Sabe Jones f3f5669ab2 feat(spring): Fling 2015-03-20 14:56:00 -05:00
Alys 5198050cd2 Merge pull request #4863 from rdhammond/InstantPartySource 
Instant party source
 2015-03-20 06:46:38 +10:00
Tyler Renelle 84a77695ea feat(ads): remove ads completely 2015-03-19 11:39:17 -06:00
Matteo Pagliazzi 9e540e86af add email with optional message when kicking user from group 2015-03-18 19:12:53 +01:00
Matteo Pagliazzi 0722a17897 start working on kick from group email & message 2015-03-18 17:31:07 +01:00
Alice Harris 44259925e4 re-add the dequip option for removing backgrounds with proper bug fix (ref https://github.com/HabitRPG/habitrpg/commit/9199c6c7e2d0891eca2bc6a58532366501265c4b); make whitespace consistent 2015-03-16 19:27:44 +10:00
R. Daniel Hammond 5ac73aca9e Adding a couple of watch statements should make the party order auto-update on changes. 2015-03-15 20:49:13 -04:00
Alice Harris 9199c6c7e2 remove unequip background feature temporarily - fixes https://github.com/HabitRPG/habitrpg/issues/4857#issuecomment-80722868 2015-03-15 07:44:36 +10:00
Alice Harris f82469eba7 remove trailing whitespace 2015-03-14 22:40:26 +10:00
Alys 94f9cff279 Merge pull request #4850 from stillsnowedin/develop 
Added confirmation before deleting messages and moved buttons to top of ...
 2015-03-14 22:32:46 +10:00
Alys 59f64830b1 Merge pull request #4799 from TheHollidayInn/add-dequip-button 
Added dequip ability per ticket: 3730
 2015-03-14 21:36:57 +10:00
Kathryn Norris 47a05338e5 Added confirmation before deleting messages and moved buttons to top of Inbox. (fixes #4848) 2015-03-13 04:11:35 -07:00
Alys 881f70997b Merge pull request #4815 from Alys/debug-options-2015-03-07 
new local install Debug options in footer: +2 Missed days, +MP
 2015-03-13 14:06:12 +10:00
Alice Harris cd8c0956f8 add debug button to footer for increasing mana points (MP) 2015-03-13 13:53:21 +10:00
kholliday 8a121a5dc3 Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems 2015-03-10 22:15:24 -05:00
Tyler Renelle a7232b5abe fix(interactive-tour): cleanup steps when navigating chapters, don't use tour.restart() 2015-03-10 15:40:19 -06:00
Tyler Renelle 812493fec5 feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides 2015-03-10 15:40:18 -06:00
kholliday fc3e1c6c9b Added ability to remove pet, mount, and background. Also, changed text for all dequip buttons. 2015-03-08 15:35:37 -05:00
Matteo Pagliazzi 1b53aeaee8 increase timeout when usubscribing from email 2015-03-08 16:25:19 +01:00
Alice Harris 044930b7d3 add +2 Missed Days to debug menu in footer, adjust addMissedDay function and all calls to it 2015-03-07 18:39:43 +10:00
kholliday 11f61c2732 Add functionality to dequip all Battle Gear or Cosutme. 2015-03-05 09:40:37 -06:00
kholliday f28bc31a2c Added dequip ability per ticket: 3730 2015-03-04 21:43:17 -06:00
Blade Barringer e9b72ad40d Merge pull request #4721 from crookedneighbor/fix-challenge-select-ios 
Fixes #4719. Guild select for challenges pre-populates with first group
 2015-02-23 22:09:17 -06:00
Matteo Pagliazzi 4da8eb1d58 fix(typo) 2015-02-23 21:51:15 +01:00
Matteo Pagliazzi 4151b0733f add ability to unsubscribe from a single event using a dedicated link 2015-02-23 21:25:01 +01:00
Blade Barringer 98ecd4b457 Fixes #4719. Guild select for challenges pre-populates with first group 2015-02-19 16:53:15 -06:00
Bill Parrott 98c6526cf7 add auto-focus when single/multiple is toggled 2015-02-19 08:46:45 -06:00
Bill Parrott 3599eaefaf Merge branch 'develop' into bulk-add-tasks 2015-02-17 22:32:28 -06:00
Blade Barringer 44b9ac7215 Fixed path to audio files. Closes #4704 2015-02-17 13:53:32 -06:00
Blade Barringer 48e688d815 Merge branch 'bulk-add-tasks' of https://github.com/chimericdream/habitrpg into bulk-add 2015-02-17 08:05:36 -06:00
Bill Parrott 2de3a5dd55 first draft of bulk add 2015-02-17 00:25:56 -06:00
Sabe Jones 130261dacf feat(event): End Valentine's 2015-02-16 18:15:09 -06:00
Blade Barringer 477d3d6085 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 2015-02-12 13:32:23 -06:00
Blade Barringer 8ac9dc3ced Merge branch 'develop' into common-convert 2015-02-10 16:27:46 -06:00
Blade Barringer 75c9b5a978 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	src/controllers/groups.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/models/user.js
 2015-02-09 22:21:27 -06:00
Blade Barringer dca2f13dda Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	bower.json
	public/manifest.json
	src/controllers/auth.js
 2015-02-05 11:20:40 -06:00
Blade Barringer cc767efa20 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert 
Conflicts:
	src/controllers/auth.js
	src/controllers/challenges.js
	src/controllers/groups.js
	src/controllers/members.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/middleware.js
	src/models/user.js
 2015-02-03 21:13:55 -06:00
Blade Barringer d2eafdd021 Started moving public folder stuff back to website 2015-02-03 14:02:34 -06:00