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

40 Commits

Author SHA1 Message Date
Alice Harris c47606c5b2 remove Show Tour button from Settings->Site; (unrelated to that) delete an outdated comment 2015-03-17 07:49:37 +10:00
Alice Harris 21a7e6193f add whitespace between delete and opt-out 2015-03-14 23:27: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 9d92bd384c Removed popover from delete messages button. (for #4848) 2015-03-13 05:05:54 -07: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
Blade Barringer 3830a39804 Removed invite button on challenges page. Closes #4796 2015-03-09 16:39:20 -05: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
kholliday cfaedb3ebd Added bootstrap styles to button. 2015-03-05 12:11:42 -06:00
kholliday 11f61c2732 Add functionality to dequip all Battle Gear or Cosutme. 2015-03-05 09:40:37 -06:00
Blade Barringer cdc8ff6000 Changed quest egg behavior closes #4792 2015-03-04 23:46:27 -06:00
Blade Barringer f44c3b84ab Revert "Changed requirement to only need to complete one quest instead of two to" 
This reverts commit f8bdaf4c99.
 2015-03-04 23:43:27 -06:00
Blade Barringer f8bdaf4c99 Changed requirement to only need to complete one quest instead of two to 
buy eggs
 2015-03-04 23:39:29 -06:00
kholliday f28bc31a2c Added dequip ability per ticket: 3730 2015-03-04 21:43:17 -06:00
Blade Barringer bee77ab34c Revereted one time binding 2015-03-04 17:30:05 -06:00
Blade Barringer 90fe516562 Join button was showing even if user was already part of the group 2015-03-04 16:24:37 -06:00
Blade Barringer 7432b6fd57 Removed test string 2015-02-26 13:24:04 -06:00
Blade Barringer d0e1f25c0b Added one time binding 2015-02-26 13:23:30 -06:00
Blade Barringer fa31023830 Changed ng-show to an ng-if so that table striping would be correct 2015-02-26 13:22:24 -06:00
Blade Barringer a905f481e8 Added join button to top. Closes #3408 2015-02-25 15:07:54 -06:00
Blade Barringer cb2af51faa Corrected ng-click to join 2015-02-25 14:45:04 -06:00
Blade Barringer 0d7b6b445e Added buttons for joining and leaving group. 2015-02-25 14:34:24 -06:00
Blade Barringer 33bd640bdb Fixes #3054 won't show pets as able to be fed if egg has noMount propery 2015-02-24 19:10:45 -06:00
Matteo Pagliazzi 6d637e89a2 new bailey 2015-02-24 19:29:00 +01:00
Blade Barringer 21ef62481d Removed step attribue from contributor input 2015-02-23 09:41:27 -06:00
Matteo Pagliazzi 397a293ca8 change text for recapture emails settings 2015-02-20 18:15:47 +01:00
Bill Parrott 3599eaefaf Merge branch 'develop' into bulk-add-tasks 2015-02-17 22:32:28 -06:00
Sabe Jones 0608ac5caa feat(quest): Pet Rocks 2015-02-17 20:02:06 -06:00
Blade Barringer 78430b1910 Collapsed 3 strings into single string 2015-02-17 15:26:42 -06:00
Bill Parrott 7042c97d5d removing export functionality to move to its own branch 2015-02-17 14:23:55 -06:00
remmz0r 2e98185c5d fixes #4670 
removed target="_blank" from archery link
 2015-02-18 00:03:37 +08:00
remmy poos cfabb12b04 fixes #4670 
Replaced archery links in index.jade and tavern.jade

Let me know if this isn't all the links

Cheers
- remmz0r
 2015-02-17 23:52:48 +08: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 b1b478bc74 add task export functionality 2015-02-16 21:21:49 -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 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 8a8ce8d80d Moved folders to website directory 2015-02-03 14:10:55 -06:00