097e1ff70b
Put popover in containing span
2015-06-10 08:18:08 -05:00
75fdf84533
move display blurb next to blurb
2015-06-09 17:53:11 -05:00
78bf96b104
Remove extraneous div
2015-06-09 17:52:17 -05:00
885820c753
Merge branch 'develop' into GitHubSphinx-Sphinx-entry1
2015-06-09 17:49:50 -05:00
2a4bbe37c5
Merge pull request #5318 from GitHubSphinx/Sphinx-entry2
...
Additional translatable line for blurb placeholder (take 2)
2015-06-09 17:39:02 -05:00
ad6443c5b8
Ensure reload on transition from challeng edit -> detail
2015-06-09 09:28:38 -04:00
50bbe5b2f5
Fixes #5001
...
Singleton challenge edit -> detail on save
2015-06-09 09:28:38 -04:00
dabb6244e7
Merge pull request #5370 from gisikw/split-out-directives
...
Split out Angular directives
2015-06-09 07:42:12 -05:00
23f62a9c40
Change idle refresh to every six hours
2015-06-09 04:24:58 -04:00
ab968a4744
Refresh if idle > 60min
2015-06-09 03:09:31 -04:00
973e7cb8ef
fix(new-task): Novalidate
...
Adds the "novalidate" flag to the task-add form so browser-level form validations don't act on our field. Fixes #3705 .
2015-06-08 14:15:45 -05:00
e64d209992
Improve from-now directive (implement optimization from comments)
2015-06-08 10:02:45 -04:00
7ef98ff7e2
Split directives into separate files
2015-06-08 10:02:44 -04:00
9fa39d99ae
perf(i18n): load only the language preference, not the whole user
2015-06-07 14:27:07 +02:00
804cced3ff
chore(various): News and sprites
...
Also tweaks the drop probability of equipment from 70% to 60%.
2015-06-05 10:22:22 -05:00
95bb5be22a
Merge branch 'develop' into armoire
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith1.css
common/dist/sprites/spritesmith1.png
common/dist/sprites/spritesmith2.css
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
common/dist/sprites/spritesmith5.css
common/dist/sprites/spritesmith5.png
common/dist/sprites/spritesmith6.css
common/dist/sprites/spritesmith6.png
2015-06-04 15:49:06 -05:00
20859b83ef
feat(Armoire): Improved counter
...
The popover counter of remaining Equipment in the Armoire now counts down immediately instead of requiring a browser refresh. A modal announces when the last item has been found. Also includes several fixes to the Ultimate Gear migration.
2015-06-04 15:45:55 -05:00
6074774e14
feat(backgrounds): June BGs
2015-06-04 11:30:25 -05:00
865f7651a9
Merge branch 'TheHollidayInn-invite-friends-in-header' into develop
2015-06-04 08:54:04 -05:00
7a1c5835d0
Final adjustments to PR #5114
...
* Added test for header ctrl
* Made openModal function more readable
* Only show setting to disable invite friends if party is exactly 1 member big
* Use party.memberCount instead of party.members.length because it's more expressive
2015-06-04 08:48:05 -05:00
2234c7219e
Moved invite friends button to under the subscribe button
2015-06-03 20:33:39 -05:00
09d32390f9
feat(Armoire): Item counter
...
Implements a counter for how many pieces of equipment remain to be found in the Armoire, including tests for same.
2015-06-03 16:48:11 -05:00
97ae243c40
fix(Armoire): Fixes
...
Armoire items are now breakable on character death, and can be purchased back directly from Rewards after death or Rebirth. Corrected string token on Costume area. Images show up correctly on Armoire drop notifications.
2015-06-03 12:50:57 -05:00
af3ee8cfcd
feat(Armoire): Updates from feedback
...
Adds images to Armoire drop notifications, refreshes the Rewards column when the Armoire is enabled, adds Armoire items to Costume customization, and introduces a migration for granting the new style Ultimate Gear achievement to those who have already earned it.
2015-06-03 11:58:30 -05:00
d6f5ba0fc7
Merge pull request #5336 from negue/fixQuestNotify
...
FIX: Quest Invitation Notification
2015-06-03 07:52:09 +02:00
c90f7e2c34
feat(Armoire): WIP
2015-06-02 17:42:14 -05:00
5612b4be6b
Only send "Quest Started" Notifications to users which accepted the quest
2015-06-02 20:02:14 +02:00
ee88ed4b44
Change signature of notification service
2015-06-02 12:33:21 -05:00
264a1e4b16
FIX: Quest Invitation Notification
...
ADD: Quest Started Notification
2015-06-02 17:40:19 +02:00
24c299783a
Merge branch 'TheHollidayInn-markdown-for-spells' into develop
2015-06-02 07:58:29 -05:00
b375c068de
Refactor notification service and add tests
2015-06-02 07:51:54 -05:00
d1df5d740d
Changed button to invite friends text
2015-06-01 21:10:49 -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
80da3a2dcd
chore(news): Bailey on mounts
2015-06-01 19:17:30 -05:00
3291062b31
Move markdown parsing to notification service
2015-06-01 17:49:27 -05:00
39f363ec29
Add tests for castEnd on root controller
2015-06-01 17:38:18 -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
829ed8a161
chore(news): May 31 Bailey
2015-05-31 16:04:42 -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
d28ed6badf
Correct format of directive creation to work in un-minified state
...
Fixes #4606
2015-05-31 15:25:32 -05:00
04d5f2f59e
Additional translatable line for blurb placeholder
...
A new commit to replace https://github.com/HabitRPG/habitrpg/pull/5293
which turned messy after I rebased accidentally
New screenshot: http://i.snag.gy/m9gTA.jpg
2015-05-31 23:41:12 +05:00
f9aa2c7301
Misplaced popover walkaround
...
Popover for small sized button (btn-sm) is misplaced while no such bug
is present for normal sized button.
2015-05-31 18:18:12 +05:00
2cd3ef7bdb
Addressing https://github.com/HabitRPG/habitrpg/issues/5244
...
Changes:
1. optOutText made more accurate
2. Modal heading in single translatable line with no link to wiki -
which looks nicer
3. Links to wiki articles about classes made translatable
4. New "Learn more" link to wiki article on classes system in the modal
footer
2015-05-31 15:58:27 +05:00
8a6c49f002
feat(weekly-recap): track last date of weekly recap email
2015-05-31 12:10:03 +02:00
a8ca01ba62
Added markdown filter to endCast notification
2015-05-30 22:00:29 -05:00
726a8f1acb
feat(analytics): Mixpanel implementation WIP
2015-05-29 16:22:35 -05:00
7a8046317d
feat(tour): Iteration 5/29
2015-05-29 15:14:19 -05:00
Blade Barringer
