Commit graph

229 commits

Author SHA1 Message Date
Blade Barringer
af94236a01 Add wiki link to reward help string.
Fixes #5333
2015-06-02 08:15:16 -05:00
Sabe Jones
8074648c70 Merge branch 'develop' into tutorial
Conflicts:
	common/locales/en/npc.json
2015-05-31 15:52:12 -05:00
Matteo Pagliazzi
995721e0da chore(i18n): update locales 2015-05-31 15:36:54 +02:00
Sabe Jones
7a8046317d feat(tour): Iteration 5/29 2015-05-29 15:14:19 -05:00
Sabe Jones
6af7342693 feat(tour): Revised intro tutorial 2015-05-29 14:03:42 -05:00
agentx999
d172d1548c challenge task text 2015-05-27 16:14:24 -07:00
agentx999
2843d1d278 boss damage text 2015-05-27 16:12:37 -07:00
agentx999
5d37eb3c5f tavern and challenge pop-ups, pet and mount pages 2015-05-27 16:09:25 -07:00
agentx999
47134a7094 checklist hover text, difficulty hover text 2015-05-27 16:02:00 -07:00
GihHubSphinx
a788d51aa5 Made gift dialog translatable
Addressing a bit beyond _#10 in the opening post of
https://github.com/HabitRPG/habitrpg/issues/4522

Screenshot of before-after-proof: http://oi57.tinypic.com/11c9ldi.jpg
2015-05-26 17:18:18 +05:00
Sabe Jones
3098cacf03 feat(subscriber): May Mystery Items 2015-05-25 21:03:13 -05:00
Blade Barringer
5d93f364c1 Merge branch 'blade-hairlessbear_markdown_help_table' into develop 2015-05-24 22:47:02 -05:00
Blade Barringer
9b2798ee71 Refine markdown help 2015-05-24 22:45:09 -05:00
Blade Barringer
690321baca Merge pull request #5270 from GitHubSphinx/Sphinx-i18n-db2
Made text on static/contact translatable
2015-05-24 22:17:10 -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
Blade Barringer
681668f131 Tweak @hairlessbear's pr
* Simplify chat button stylings
* Add formatting help to send gift modal
* Clean up formatting of table
* Add example for unordered lists
* Remove ! from `env.t` that do not have html characters
* Use https instead of http in link
* Format markdown blurb
* Use ng-if instead of ng-show
* Collapse show help link into single element
2015-05-24 09:20:12 -05:00
Matteo Pagliazzi
047ce0141f chore(i18n): update locales 2015-05-24 11:27:17 +02:00
GihHubSphinx
dc51c6e478 Made text on static/contact translatable
Addressing _#12 in the OP of
https://github.com/HabitRPG/habitrpg/issues/4522

Before/after screenshot: http://i.snag.gy/b00FV.jpg

"Report a Bug" string is used from generic.json as already translated
before
2015-05-24 13:31:29 +05:00
hairlessbear
337a727390 Added hidable markdown help menu and adding to private messages 2015-05-23 22:51:40 -04:00
GihHubSphinx
fe2e0618b8 Make Invite-friends-to-group dialog translatable
UI strings of the dialog of invitation to the group made translatable
2015-05-23 02:44:32 +05:00
GihHubSphinx
2440b312a2 Made two lines translatable
Addressing #10 and #11 in the OP of
https://github.com/HabitRPG/habitrpg/issues/4522

* "Send gift" (in the form that pops up when you click on username
label)
* "Invite Friends" button (in "Members" section in guilds and party)
2015-05-21 17:12:16 +05:00
SabreCat
13faf8d0c7 feat(pets): Sheep Quest 2015-05-20 20:45:18 -07:00
Blade Barringer
bd76b762e6 Merge pull request #5212 from HabitRPG/negue-WIP-Push-notifications
Negue wip push notifications
2015-05-18 11:14:53 -05:00
Blade Barringer
46c426856d Correct text 2015-05-17 10:06:40 -05:00
Matteo Pagliazzi
dcc48ea7f7 chore(i18n): update locales 2015-05-17 16:07:18 +02:00
Matteo Pagliazzi
d6547682be chore(i18n): update locales 2015-05-17 15:54:18 +02:00
Blade Barringer
43cb46d83d Merge pull request #5174 from agentx999/skills_clickontask
added "click on task" to necessary skill descriptions
2015-05-16 23:08:11 -05:00
Blade Barringer
da20a493c6 Merge branch 'hairlessbear-level_100_attribute_message' into develop 2015-05-16 22:50:57 -05:00
Blade Barringer
bc967dd850 Adjust wording of attribute points warning 2015-05-16 22:50:24 -05:00
hairlessbear
52d869b195 Fixed issue #5203 2015-05-16 16:52:58 -04:00
Blade Barringer
d7ce151500 Add translatable strings 2015-05-14 21:56:16 -05:00
Alys
d6e1d765da adjust Inn message when user is already Resting - https://github.com/HabitRPG/habitrpg/issues/5128#issuecomment-99233779 2015-05-14 08:13:13 +10:00
Sabe Jones
89d1d63b24 Merge pull request #5198 from SabreCat/pet-skins
Pet Skins and Ears
2015-05-13 15:44:23 -05:00
Matteo Pagliazzi
b639896ae6 chore(i18n): update locales 2015-05-13 19:47:59 +02:00
Sabe Jones
35ff90b4d3 Merge remote-tracking branch 'origin/new_inn_behavior_PR' into pet-skins 2015-05-13 12:12:57 -05:00
Sabe Jones
29109051d7 feat(customize): Animal skins and ears
Implements a base-pet-themed set of avatar skins and head accessories, the latter of which has additional handling for the user to purchase them from the Avatar Customization page.
2015-05-13 11:19:08 -05:00
Blade Barringer
dca45d7845 Enable new inn behavior 2015-05-13 08:44:08 -05:00
Alys
2ac763cc50 add message about Resting in the Inn to top of Dailies column when preferences.sleep is true 2015-05-13 16:56:52 +10:00
Blade Barringer
c123ca6a42 Correct casing of translatable string 2015-05-10 09:13:05 -05:00
GihHubSphinx
6c5d9f3a6c Tried to make line translatable
Tried to make the "Only group leader can create challenges" line in the
guild creation dialog translatable
2015-05-10 08:59:43 -05:00
Blade Barringer
71c65c7a73 change coupon route in angular router to promo 2015-05-08 21:24:57 -05:00
Blade Barringer
1bfc82c636 Merge branch 'develop' into NotGonnaGitUs-develop 2015-05-08 21:02:09 -05:00
agentx999
84979b137d Update spells.json
modified Backstab, Brutal Smash, Burst of Flames, and Pickpocket descriptions
2015-05-08 18:32:18 -07:00
NotGonnaGitUs
ef0b96e5e4 Changed promo code text. 2015-05-08 10:33:26 +05:30
negue
e628dba5e8 Merge pull request #5087 from negue/copyMessageTodo
copy chat messages as todo
2015-05-07 22:21:42 +02:00
Sabe Jones
00db42b6c0 feat(backgrounds): May BGs 2015-05-06 19:41:54 -05:00
Matteo Pagliazzi
a91b544830 typo 2015-05-06 16:18:14 +02:00
Matteo Pagliazzi
a1fb1468ba chore(i18n): update locales 2015-05-05 19:52:20 +02:00
Tyler Renelle
a090fed10b feat(analytics): "motivate yourself" 3 variants @lemoness 2015-05-04 15:31:00 -04:00
Blade Barringer
41a6818ea8 Revert inn text 2015-05-03 20:21:53 -05:00