Commit graph

545 commits

Author SHA1 Message Date
Negue
5612b4be6b Only send "Quest Started" Notifications to users which accepted the quest 2015-06-02 20:02:14 +02:00
Negue
264a1e4b16 FIX: Quest Invitation Notification
ADD: Quest Started Notification
2015-06-02 17:40:19 +02:00
Blade Barringer
24c299783a Merge branch 'TheHollidayInn-markdown-for-spells' into develop 2015-06-02 07:58:29 -05:00
Blade Barringer
b375c068de Refactor notification service and add tests 2015-06-02 07:51:54 -05:00
Sabe Jones
80da3a2dcd chore(news): Bailey on mounts 2015-06-01 19:17:30 -05:00
Blade Barringer
3291062b31 Move markdown parsing to notification service 2015-06-01 17:49:27 -05:00
Blade Barringer
39f363ec29 Add tests for castEnd on root controller 2015-06-01 17:38:18 -05:00
Sabe Jones
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
Sabe Jones
829ed8a161 chore(news): May 31 Bailey 2015-05-31 16:04:42 -05:00
Sabe Jones
766f3b6057 Merge pull request #5307 from HabitRPG/tutorial
Tutorial overhaul
2015-05-31 13:58:12 -07:00
Sabe Jones
8074648c70 Merge branch 'develop' into tutorial
Conflicts:
	common/locales/en/npc.json
2015-05-31 15:52:12 -05:00
Sabe Jones
91f93df7cc Merge branch 'develop' into mixpanel
Conflicts:
	config.json.example
2015-05-31 15:40:21 -05:00
Blade Barringer
d28ed6badf Correct format of directive creation to work in un-minified state
Fixes #4606
2015-05-31 15:25:32 -05:00
Matteo Pagliazzi
8a6c49f002 feat(weekly-recap): track last date of weekly recap email 2015-05-31 12:10:03 +02:00
TheHollidayInn
a8ca01ba62 Added markdown filter to endCast notification 2015-05-30 22:00:29 -05:00
Sabe Jones
726a8f1acb feat(analytics): Mixpanel implementation WIP 2015-05-29 16:22:35 -05: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
Blade Barringer
39cb9bfb99 downcase beffymaroo 2015-05-26 22:42:17 -05:00
Blade Barringer
9793df87d1 Merge branch 'reyrodrigez-develop' into develop 2015-05-26 22:26:48 -05:00
Blade Barringer
0e2f0596f6 Remove explicit divs 2015-05-26 22:26:24 -05:00
Blade Barringer
85993d25cf Merge branch 'hairlessbear-move_flower_to_accessories' into develop 2015-05-26 22:20:21 -05:00
Laszlo Heves
eb3f7829cf Update date 2015-05-27 02:22:35 +02:00
Laszlo Heves
e0eab880a4 Define semantic classes with shorthand syntax 2015-05-27 02:21:48 +02:00
Laszlo Heves
72c1e9e137 Using shorthand id definitions 2015-05-27 02:07:13 +02:00
Laszlo Heves
020f7f1f5d Adding semantic ids to community guidelines 2015-05-27 01:39:40 +02:00
Laszlo Heves
17842d2103 Adding Beffymaroo to moderators 2015-05-27 01:25:40 +02:00
Blade Barringer
fce9d39f19 Added in one-time-bindings 2015-05-26 09:02:25 -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
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
a298393e04 Merge pull request #5275 from GitHubSphinx/Sphinx-entry1
Swap faq and overview in the top menu
2015-05-24 22:15:24 -05:00
Blade Barringer
30ef563534 Merge branch 'negue-anonymizedUser' into develop 2015-05-24 22:04:18 -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
GihHubSphinx
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
Blade Barringer
120872ffd2 Merge in develop 2015-05-24 15:46:57 -05:00
Blade Barringer
165dd3a4a6 Fixes for minor visual inconsistencies with popovers and toolbars
Closes #5274, closes #5272, closes #5271
2015-05-24 15:34:12 -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
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
4bc3ea0cdb Removed commented out code 2015-05-23 22:59:17 -04:00
hairlessbear
337a727390 Added hidable markdown help menu and adding to private messages 2015-05-23 22:51:40 -04:00
Blade Barringer
a07f8572b0 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-05-22 23:35:19 -05:00
Blade Barringer
ed56f51611 Merge branch 'hairlessbear-avatar_indicate_equipped' into develop 2015-05-22 23:35:01 -05:00
Blade Barringer
9ec14c1ac6 Merge pull request #5251 from GitHubSphinx/Sphinx-i18n-db1
Made two lines translatable
2015-05-22 23:20:13 -05:00
Blade Barringer
1e757cc087 Adjust disabled button look 2015-05-22 23:12:09 -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
Jaiden Mispy
eab2dbfa86 Disable chat textarea and buttons while sending 2015-05-22 12:14:10 -07:00