1d18f53a67
Merge branch 'develop' into blade-Finish_weeklies_pr
...
Added Sabe's novalidate change to adding a new task
2015-06-10 07:53:37 -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
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
c8ed73f685
Added help text for startDate
2015-06-07 00:06:31 -05:00
e6ed0c961d
Simplify datepickers
2015-06-06 23:27:03 -05:00
91390138bb
Make reward price required
2015-06-06 23:17:10 -05:00
41d0f505f3
Simplify datepicker
2015-06-06 22:34:02 -05:00
047902ac62
Use input type date for datepicker
2015-06-06 17:55:36 -05:00
bf48671c7a
Add validation to everyX
2015-06-06 17:55:21 -05:00
ae1d10ed30
Merge branch 'blade-Finish_weeklies_pr' into refactor-tasks-jade
2015-06-05 17:37:46 -05:00
164a26616e
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-05 17:35:16 -05: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
dc9bb35244
Add ng-form
2015-06-05 07:40:48 -05:00
403075262d
Remove bindonce symbol from ng-repeat
2015-06-05 07:26:03 -05:00
099e0abeed
Restore restore streaks functionality
2015-06-05 07:20:59 -05:00
701fa2455f
Refactor task views
2015-06-04 21:37:01 -05:00
b132b3c4fa
Make advanced options a button
2015-06-04 17:48:59 -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
db38663f94
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-04 12:45:23 -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
076f7f0db9
Create translatable strings for dailies
2015-06-03 21:48:38 -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
7adde1d1dd
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-03 07:41:09 -05:00
c90f7e2c34
feat(Armoire): WIP
2015-06-02 17:42:14 -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
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
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
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
6af7342693
feat(tour): Revised intro tutorial
2015-05-29 14:03:42 -05:00
dc4359ab6f
Remove monthly option
2015-05-27 12:32:14 -05:00
39cb9bfb99
downcase beffymaroo
2015-05-26 22:42:17 -05:00
9793df87d1
Merge branch 'reyrodrigez-develop' into develop
2015-05-26 22:26:48 -05:00
0e2f0596f6
Remove explicit divs
2015-05-26 22:26:24 -05:00
85993d25cf
Merge branch 'hairlessbear-move_flower_to_accessories' into develop
2015-05-26 22:20:21 -05:00
Blade Barringer
