db38663f94
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-04 12:45:23 -05:00
865f7651a9
Merge branch 'TheHollidayInn-invite-friends-in-header' into develop
2015-06-04 08:54:04 -05:00
076f7f0db9
Create translatable strings for dailies
2015-06-03 21:48:38 -05:00
705e0dce71
Calculate days since task start with start of day
2015-06-04 08:25:06 -05:00
7adde1d1dd
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-03 07:41:09 -05:00
af94236a01
Add wiki link to reward help string.
...
Fixes #5333
2015-06-02 08:15:16 -05:00
e3f5c22fe8
Added start party option, locales, and plus button
2015-06-01 21:07:53 -05:00
5513061d80
Added invite to friends in header, added setting to hide the invite friends, and localized the invite friends string
2015-06-01 21:07:09 -05:00
5cf6127382
fix(mounts): Reposition mounts
...
Changes the remaining mounts revised by Kiwibot re: #4449 .
2015-06-01 18:37:01 -05:00
3de9aed2c4
fix(sprites): Recanvas wolf mounts
...
See #4449
2015-06-01 12:33:13 -05:00
d76ca1c04d
feat(mystery): Programmatic presents
...
Shows the appropriately colored subscription giftwrap for the user's current month. Also includes the Bailey notification for this month's upcoming subscriber item.
2015-06-01 12:06:35 -05:00
766f3b6057
Merge pull request #5307 from HabitRPG/tutorial
...
Tutorial overhaul
2015-05-31 13:58:12 -07:00
8074648c70
Merge branch 'develop' into tutorial
...
Conflicts:
common/locales/en/npc.json
2015-05-31 15:52:12 -05:00
91f93df7cc
Merge branch 'develop' into mixpanel
...
Conflicts:
config.json.example
2015-05-31 15:40:21 -05:00
995721e0da
chore(i18n): update locales
2015-05-31 15:36:54 +02:00
719ae1c89d
Add missing ?; common tests pass
2015-05-30 23:10:44 -05:00
726a8f1acb
feat(analytics): Mixpanel implementation WIP
2015-05-29 16:22:35 -05:00
5127814f9e
chore(grunt): compile sprites
2015-05-29 15:19:51 -05:00
7a8046317d
feat(tour): Iteration 5/29
2015-05-29 15:14:19 -05:00
6af7342693
feat(tour): Revised intro tutorial
2015-05-29 14:03:42 -05:00
d172d1548c
challenge task text
2015-05-27 16:14:24 -07:00
2843d1d278
boss damage text
2015-05-27 16:12:37 -07:00
5d37eb3c5f
tavern and challenge pop-ups, pet and mount pages
2015-05-27 16:09:25 -07:00
47134a7094
checklist hover text, difficulty hover text
2015-05-27 16:02:00 -07:00
85993d25cf
Merge branch 'hairlessbear-move_flower_to_accessories' into develop
2015-05-26 22:20:21 -05:00
615c3f18a5
Adjust gruntfile regex and recompile
2015-05-26 22:19:45 -05:00
8b347bca8b
Remove everyX check from weeklies; Change UI of frequency selection; Prep for monthlies in UI
2015-05-26 17:59:11 -05:00
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
958068c2b0
Rebased to resolve merge conflicts
2015-05-26 00:19:35 -04:00
ed25cffaf7
chore(grunt): compile sprites
2015-05-25 21:10:37 -05:00
3098cacf03
feat(subscriber): May Mystery Items
2015-05-25 21:03:13 -05:00
5d93f364c1
Merge branch 'blade-hairlessbear_markdown_help_table' into develop
2015-05-24 22:47:02 -05:00
9b2798ee71
Refine markdown help
2015-05-24 22:45:09 -05:00
690321baca
Merge pull request #5270 from GitHubSphinx/Sphinx-i18n-db2
...
Made text on static/contact translatable
2015-05-24 22:17:10 -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
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
337a727390
Added hidable markdown help menu and adding to private messages
2015-05-23 22:51:40 -04:00
cfd2f7003b
Merge branch 'develop' into fallenpanda1-improved_dailies
2015-05-23 08:44:56 -05:00
90dd078a6a
Fixed bug where we were using moment.startOf instead of api.startOfDay in shouldDo.
2015-05-23 02:29:06 -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
1f0dbef3c7
Merge pull request #5234 from hairlessbear/ethereal_surge_split_fix
...
Fixed Ethereal Surge notification split
2015-05-22 23:23:34 -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
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
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
bd76b762e6
Merge pull request #5212 from HabitRPG/negue-WIP-Push-notifications
...
Negue wip push notifications
2015-05-18 11:14:53 -05:00
fd8fabad43
Fixed Ethereal Surge notification split
2015-05-18 00:45:44 -04:00
Blade Barringer
