Blade Barringer
c44ca785aa
Merge branch 'develop' into SabreCat-develop
2015-06-14 01:50:16 -05:00
Blade Barringer
831f5b89bd
Merge branch 'develop' into nthomsn-develop
2015-06-14 01:27:35 -05:00
Blade Barringer
41b1abba3a
Checkout help button changes
2015-06-13 23:16:12 -05:00
Blade Barringer
0eb8caec23
Various task ui improvements
...
* Use bootstrap form-control class for text and notes
* Can't edit start date or days of the week in challenge dailies from website
* Refactor dailies
2015-06-13 22:29:06 -05:00
Blade Barringer
9d4713bdf3
Merge pull request #5392 from GitHubSphinx/Sphinx-entry1
...
Still addressing #5202 - making Click for help button translatable
2015-06-13 18:01:57 -05:00
Blade Barringer
8faf96f5b9
Refactored filters
2015-06-13 12:39:11 -05:00
Blade Barringer
5d56bd02ef
Merge branch 'develop' into blade-feature/search
2015-06-13 00:10:44 -05:00
Sabe Jones
e2ba8fb859
fix(achievement): Ultimate Gear logic
...
Fixes #5387 .
2015-06-12 15:35:34 -05:00
GihHubSphinx
fc5cb5d228
Still addressing #5202
...
The last thing left as it seems is Click for help toolbar
2015-06-12 17:42:40 +05:00
Blade Barringer
54681e36b5
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-11 19:47:46 -05:00
Sabe Jones
4da4777ddd
chore(news): Every X Bailey
2015-06-11 14:22:39 -05:00
Jiri Chara
2c52829256
Implement filter tasks by text & notes
...
In order to be able to filter tasks by it's text or notes - we need an
extra filter to be implemented, because angular does not support OR
condition for it's default filter directive.
2015-06-11 20:39:29 +02:00
Nicholas Thomson
867308975f
Merge https://github.com/HabitRPG/habitrpg into develop
2015-06-11 08:40:36 -07:00
Jiri Chara
df7d36923c
Enable filtering for tasks and custom rewards
...
Add search input box next to the tags. When user changes the value of
the input box then it's propagated to the user service as filterQuery
string. filterQuery string is then used in the tasks template to filter
tasks by text.
2015-06-11 09:10:31 +02:00
Blade Barringer
1bf38578bf
Merge branch 'develop' into hairlessbear-show_group_leader
2015-06-10 17:51:45 -05:00
Blade Barringer
f72ed18a77
Merge pull request #5350 from hairlessbear/task_links_fix
...
Added links to multiple task help phrases (fixes #5349 )
2015-06-10 17:46:15 -05:00
Blade Barringer
097e1ff70b
Put popover in containing span
2015-06-10 08:18:08 -05:00
Blade Barringer
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
Blade Barringer
78bf96b104
Remove extraneous div
2015-06-09 17:52:17 -05:00
Blade Barringer
885820c753
Merge branch 'develop' into GitHubSphinx-Sphinx-entry1
2015-06-09 17:49:50 -05:00
Sabe Jones
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
hairlessbear
b1b8dc18af
Made links translatable
2015-06-07 13:17:57 -04:00
Blade Barringer
c8ed73f685
Added help text for startDate
2015-06-07 00:06:31 -05:00
Blade Barringer
e6ed0c961d
Simplify datepickers
2015-06-06 23:27:03 -05:00
Blade Barringer
91390138bb
Make reward price required
2015-06-06 23:17:10 -05:00
Blade Barringer
41d0f505f3
Simplify datepicker
2015-06-06 22:34:02 -05:00
Blade Barringer
047902ac62
Use input type date for datepicker
2015-06-06 17:55:36 -05:00
Blade Barringer
bf48671c7a
Add validation to everyX
2015-06-06 17:55:21 -05:00
Blade Barringer
ae1d10ed30
Merge branch 'blade-Finish_weeklies_pr' into refactor-tasks-jade
2015-06-05 17:37:46 -05:00
Blade Barringer
164a26616e
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-05 17:35:16 -05:00
Sabe Jones
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
hairlessbear
16f0ece2f8
Removed ! from 'env.t' that don't have html characters
2015-06-05 09:44:19 -04:00
hairlessbear
d26e4780fd
Added links to multiple task help phrases
2015-06-05 09:26:33 -04:00
Blade Barringer
dc9bb35244
Add ng-form
2015-06-05 07:40:48 -05:00
Blade Barringer
403075262d
Remove bindonce symbol from ng-repeat
2015-06-05 07:26:03 -05:00
Blade Barringer
099e0abeed
Restore restore streaks functionality
2015-06-05 07:20:59 -05:00
Blade Barringer
701fa2455f
Refactor task views
2015-06-04 21:37:01 -05:00
Blade Barringer
b132b3c4fa
Make advanced options a button
2015-06-04 17:48:59 -05:00
hairlessbear
60ecdb2dca
Removed colons from JSON and 'formatting-help' class to 'slight-vertical-padding'
2015-06-04 17:48:31 -04:00
Sabe Jones
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
Sabe Jones
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
Blade Barringer
db38663f94
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-04 12:45:23 -05:00
Sabe Jones
6074774e14
feat(backgrounds): June BGs
2015-06-04 11:30:25 -05:00
Blade Barringer
865f7651a9
Merge branch 'TheHollidayInn-invite-friends-in-header' into develop
2015-06-04 08:54:04 -05:00
Blade Barringer
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
Blade Barringer
076f7f0db9
Create translatable strings for dailies
2015-06-03 21:48:38 -05:00
Sabe Jones
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
Blade Barringer
7adde1d1dd
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-03 07:41:09 -05:00
Sabe Jones
c90f7e2c34
feat(Armoire): WIP
2015-06-02 17:42:14 -05:00
TheHollidayInn
d1df5d740d
Changed button to invite friends text
2015-06-01 21:10:49 -05:00
