Commit Graph

18 Commits

Author SHA1 Message Date
Alys 71a9f7caf4 make challenge permission error messages translatable 2015-08-16 17:30:51 +10:00
Alys 53f861f3c0 allow challenges to be edited, deleted, closed by admin users (moderators and staff) through the web UI (not by API calls) 2015-08-16 16:51:53 +10:00
Blade Barringer abbfdaeda5 Adjust NotGonnaGitUs's PR
* move challenge test to separate file
* adjust wording of popover text
* prevent refunding gems for tavern challenges
* adjust ui of challenge creation page
* fix bug in cancel function
* adjust wording of delete confirmation message
2015-05-24 21:22:40 -05:00
Blade Barringer 120872ffd2 Merge in develop 2015-05-24 15:46:57 -05:00
NotGonnaGitUs 4085ed5b15 Comment commit to test travis-ci 2015-05-04 03:56:28 +05:30
NotGonnaGitUs c18fbb79ed Separated the deletion of the challenge to its own function in the async.waterfall 2015-05-04 03:43:30 +05:30
NotGonnaGitUs 46cb0240c3 Gems are now refunded to challenge leader on deletion. Needs better description in "broken" field. 2015-05-04 02:33:59 +05:30
Negue b23e901780 Merge branch 'develop' into pushNotifications2 2015-04-27 17:20:25 +02:00
Kevin Gisi 6cfdfc5225 Added group type to challenge API, link to guild/party on challenges 2015-04-06 02:44:43 -04:00
Kevin Gisi eef3e293e2 Populate group and challenge leader on challenge GET request 2015-04-06 02:18:29 -04:00
Kevin Gisi 79fe0b53c5 Added _isMember to APIv2 challenges/:cid endpoint (requires user auth) 2015-04-06 02:18:29 -04:00
Negue 7105bc195f add all Changes of #4565 2015-03-27 18:35:32 +01:00
Blade Barringer 17032a4f13 Reverted changes back into website/src 2015-02-10 16:06:32 -06:00
Blade Barringer bf4f2299e2 Moved src to website/src (again) 2015-02-10 16:04:17 -06:00
Blade Barringer e243887563 Deleted website/src 2015-02-10 16:03:11 -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 220942fb9d Corrected path to common files 2015-02-03 14:17:21 -06:00
Blade Barringer 8a8ce8d80d Moved folders to website directory 2015-02-03 14:10:55 -06:00