Commit graph

20 commits

Author SHA1 Message Date
Blade Barringer
c1b429c8bf Adjust spacing; remove comment 2015-06-17 19:12:49 -05:00
GihHubSphinx
071f2796db Adjusting challenges view translation
- Make "Back to all challenges" button translatable
- Allow some flexibility for the line "#_of_gems gem_icon Prize" - this
is made following the practices with linkstart/linkend implementation
- prize "string" is left as is because used as a placeholder
- code comment "prize" had to be moved 1 line up - before the p (as no
room for it is left inside the p) which however seems OK to me, because
the comments above and below has been made the same way before
2015-06-16 02:37:18 +05:00
Blade Barringer
6513527d8b Refactor challenges filter 2015-06-13 19:41:41 -05:00
Blade Barringer
ddb28c0305 Merge branch 'develop' into TheHollidayInn-challenges-owner-filter 2015-06-13 18:23:51 -05: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
TheHollidayInn
71cc5f76fe Set default ownership filter to either and fixed editing bug 2015-04-22 11:54:02 -05:00
TheHollidayInn
74ef8cd443 Added filter by owner for challenges 2015-04-22 11:54:01 -05:00
Sphinx
69e1b4f8e6 Update challenges.jade
Additional changes in translations required before merging!

https://trello.com/c/SvTsLdRF/12-translations
"0leg
It would be great if we could have "%number_of% Participants" instead of just "Participants" in the source language so that we could translate it as "участников: %number_of%" which is the only correct way to translate it into Russian without grammatical mistakes. (This example is from Challenges tab.)"
2015-04-09 07:55:44 -05: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
145f4c0fa7 Check leader._id, rather than just leader for checking challenge ownership 2015-04-06 02:32:24 -04:00
Kevin Gisi
da81241ebe Transition Challenge -> Edit to the Singleton challenge view, to address issues associated with #4814 2015-04-06 02:18:29 -04:00
Kevin Gisi
3e653c9282 Reimplemented single challenge view code from #3319 2015-04-06 02:18:29 -04:00
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
dd49b12bdb Added link to challenge creator on challenges. 2015-03-12 20:19:03 -05: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
Blade Barringer
3830a39804 Removed invite button on challenges page. Closes #4796 2015-03-09 16:39:20 -05:00
Matteo Pagliazzi
6d637e89a2 new bailey 2015-02-24 19:29:00 +01: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
Renamed from views/options/social/challenges.jade (Browse further)