agentx999
47134a7094
checklist hover text, difficulty hover text
2015-05-27 16:02:00 -07:00
Blade Barringer
85993d25cf
Merge branch 'hairlessbear-move_flower_to_accessories' into develop
2015-05-26 22:20:21 -05:00
Blade Barringer
615c3f18a5
Adjust gruntfile regex and recompile
2015-05-26 22:19:45 -05: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
hairlessbear
958068c2b0
Rebased to resolve merge conflicts
2015-05-26 00:19:35 -04:00
Sabe Jones
ed25cffaf7
chore(grunt): compile sprites
2015-05-25 21:10:37 -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
Blade Barringer
1f0dbef3c7
Merge pull request #5234 from hairlessbear/ethereal_surge_split_fix
...
Fixed Ethereal Surge notification split
2015-05-22 23:23:34 -05: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
SabreCat
2b72050827
fix(accessories): Buyback for ears
...
Fixes #5236 .
2015-05-20 13:10:05 -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
hairlessbear
fd8fabad43
Fixed Ethereal Surge notification split
2015-05-18 00:45:44 -04: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
Sabe Jones
84b333e5c1
fix(unlocks): Handle undefined/null balance
2015-05-13 15:34:23 -05:00
Sabe Jones
6e27b7af9d
fix(purchases): Handle undefined/null balance
2015-05-13 15:15:40 -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
2b8414766b
chore(grunt): compile sprites
2015-05-13 11:19:33 -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
Negue
1cc07129f1
Merge branch 'develop' into pushNotifications2
...
Conflicts:
test/api.mocha.coffee
2015-05-10 22:01:41 +02: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
Alys
1dec4ba7a6
allow MP gained for Habits and Dailies to be increased when a critical hit occurs (crits are triggered in addPoints)
2015-05-10 18:17:17 +10: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
Negue
90edb7719f
Merge branch 'develop' into pushNotifications2
2015-05-08 23:21:18 +02: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
