0afd56e8ad
Refine anonymous user test
2015-05-24 22:03:40 -05:00
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
fac855898f
Swap faq and overview in the top menu
...
Addressing request by lemoness
https://github.com/HabitRPG/habitrpg/issues/5261
2015-05-25 02:25:51 +05:00
120872ffd2
Merge in develop
2015-05-24 15:46:57 -05:00
165dd3a4a6
Fixes for minor visual inconsistencies with popovers and toolbars
...
Closes #5274 , closes #5272 , closes #5271
2015-05-24 15:34:12 -05:00
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
047ce0141f
chore(i18n): update locales
2015-05-24 11:27:17 +02:00
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
a15506e951
Set daillys startDate in the past
2015-05-23 23:57:57 -07:00
0dcd388925
Made sure to use api.startOfDay in dailies.coffee unit test when calculating day of the week.
2015-05-23 23:57:46 -07:00
4bc3ea0cdb
Removed commented out code
2015-05-23 22:59:17 -04:00
337a727390
Added hidable markdown help menu and adding to private messages
2015-05-23 22:51:40 -04:00
0c9576733e
Use moment to set startDate
2015-05-23 15:39:18 -05:00
3a8715f0a9
Set default startDate to today if task does not already have them
2015-05-23 15:29:36 -05:00
d3ecb885d4
Set daillys startDate in the past
2015-05-23 08:54:01 -05:00
cfd2f7003b
Merge branch 'develop' into fallenpanda1-improved_dailies
2015-05-23 08:44:56 -05:00
68c4547c0a
change $push to $addToSet for monthly mystery items so that we can't get duplicates being added. Ref: https://gist.github.com/lefnire/a0a93c52211f44a2c087 and http://stackoverflow.com/questions/27248556/mongodb-difference-between-push-addtoset
2015-05-23 20:03:36 +10:00
90dd078a6a
Fixed bug where we were using moment.startOf instead of api.startOfDay in shouldDo.
2015-05-23 02:29:06 -07:00
b25fa06019
Fixed algos test to pass in task instead of task.repeat to shouldDo (API changed a few commits ago, but missed updating this test).
2015-05-22 23:42:05 -07:00
56f0e3ae4a
Removed unnecessary TODOs.
2015-05-22 22:18:17 -07:00
664bf491d2
Adjust fallenPanda's PR
...
* Use enum for frequency in task model
* Adjust ui of task selection
* Correct check for hasStarted
* Remove semicolons
* Set default start day to today
* Correct perfect day and resting in inn tests to have dailies with start dates of a week ago
* Add tests for dailies/weeklies functionality
2015-05-22 22:14:58 -07:00
a07f8572b0
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-05-22 23:35:19 -05:00
ed56f51611
Merge branch 'hairlessbear-avatar_indicate_equipped' into develop
2015-05-22 23:35:01 -05:00
1f0dbef3c7
Merge pull request #5234 from hairlessbear/ethereal_surge_split_fix
...
Fixed Ethereal Surge notification split
2015-05-22 23:23:34 -05:00
9ec14c1ac6
Merge pull request #5251 from GitHubSphinx/Sphinx-i18n-db1
...
Made two lines translatable
2015-05-22 23:20:13 -05:00
1e757cc087
Adjust disabled button look
2015-05-22 23:12:09 -05:00
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
eab2dbfa86
Disable chat textarea and buttons while sending
2015-05-22 12:14:10 -07:00
4e8918818a
fix(pushNotifications): user null check
...
#5252
2015-05-21 23:24:10 +02:00
cdceb7d6c8
Put br hiding code in the right place
...
The previous commit put it in the `quest.active == false` block, but it was supposed to be in the `quest.active == true` block. This commit fixes the error
2015-05-21 14:08:47 -04:00
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
ee4df15b71
Merge pull request #5247 from hairlessbear/tavern_guidline_button_fix
...
Fixed sync button display before community guildlines are accepted
2015-05-21 20:57:00 +10:00
f436852535
Merge pull request #5249 from HabitRPG/may-pet
...
Sheep Quest
2015-05-20 21:00:21 -07:00
13faf8d0c7
feat(pets): Sheep Quest
2015-05-20 20:45:18 -07:00
2b72050827
fix(accessories): Buyback for ears
...
Fixes #5236 .
2015-05-20 13:10:05 -07:00
4ee8a6867d
Fixed sync button before community guildlines are accepted
2015-05-20 10:20:32 -04:00
2900c53b84
Fix and unpend dailies test
2015-05-19 20:22:43 -05:00
7b700bd320
Tiny formatting change for world boss
...
Remove `br` when 'tavern' is true.
2015-05-18 15:43:07 -04:00
bd76b762e6
Merge pull request #5212 from HabitRPG/negue-WIP-Push-notifications
...
Negue wip push notifications
2015-05-18 11:14:53 -05:00
a270b6d931
Compile shared when changes are made to coffee files
2015-05-18 08:52:28 -05:00
fd8fabad43
Fixed Ethereal Surge notification split
2015-05-18 00:45:44 -04:00
4f1036af9b
Fixed world boss logic
2015-05-17 23:21:00 -04:00
6d2fa4a940
Added 'hr' to active quest display for consistency
2015-05-17 22:44:56 -04:00
05f9167b3f
Changed 'invites' to 'invitations'
2015-05-17 22:32:06 -04:00
b912dcaf6a
Added selectableInventory logic to animal ears
2015-05-17 22:01:54 -04:00
9c205e600a
Merge branch 'avatar_indicate_equipped' of https://github.com/hairlessbear/habitrpg into develop
2015-05-17 17:19:17 -04:00
456dd37f41
Added selectableInventory to two buttons I missed the first time
2015-05-17 16:51:59 -04:00
c47c555a21
Added indication of currently equipped preferences to avatar customization page
2015-05-17 16:30:22 -04:00
54f8f6d387
Merge pull request #5227 from hairlessbear/move_battle_gear_popover
...
Moved battle gear popover from top to right
2015-05-17 10:19:45 -05:00
46c426856d
Correct text
2015-05-17 10:06:40 -05:00
Blade Barringer
