31e7b052a1
Removed 'freeRebirth' modal and its associated strings
2015-06-13 14:18:03 -04:00
4bf1b94c1d
Removed 'freeRebirth' from user model and all uses in codebase
2015-06-13 14:18:03 -04:00
8fe4d9a5a8
Merge branch 'blade-feature/search' into develop
2015-06-13 12:40:08 -05:00
3e32d4244f
Adjust formatting of task ordering filter
2015-06-13 12:39:20 -05:00
8faf96f5b9
Refactored filters
2015-06-13 12:39:11 -05:00
71407478b7
Merge pull request #5389 from JiriChara/feature/search
...
Enable filtering for tasks and custom rewards
2015-06-13 12:01:00 -05:00
719907189f
Organized spec folder
2015-06-13 09:58:08 -05:00
653d601d04
Merge pull request #1 from crookedneighbor/blade-feature/search
...
Blade feature/search
2015-06-13 09:53:16 +02:00
5d56bd02ef
Merge branch 'develop' into blade-feature/search
2015-06-13 00:10:44 -05:00
2504b06026
Removed user.achievements.ultimateGear checks from orb of rebirth logic ( fixes #5352 )
2015-06-12 17:17:50 -04:00
e2ba8fb859
fix(achievement): Ultimate Gear logic
...
Fixes #5387 .
2015-06-12 15:35:34 -05:00
2f1111522c
Adjust PR #5389
...
* Convert $watch to ng-change and re-wrote test
* Removed unnecessary styles
* Use .form-control instead of class='form-control'
2015-06-12 09:05:06 -05:00
fc5cb5d228
Still addressing #5202
...
The last thing left as it seems is Click for help toolbar
2015-06-12 17:42:40 +05:00
8d20168b6b
Added up and down test to complete and uncomplete a todo respectively.
2015-06-11 23:38:44 -05:00
3f8066eee5
Compile sprites
2015-06-11 20:24:52 -05:00
8d450aefb8
Replace head sprites with dark outline versions
...
Closes #5171
2015-06-11 20:24:19 -05:00
54681e36b5
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-11 19:47:46 -05:00
5d84ead3f8
add image for bulk email
2015-06-11 22:17:34 +02:00
b413e38682
Put tasks filter field to the right
2015-06-11 22:16:40 +02:00
4da4777ddd
chore(news): Every X Bailey
2015-06-11 14:22:39 -05:00
72a3419327
Change the styling of filter box to bootstrap
2015-06-11 20:41:08 +02:00
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
867308975f
Merge https://github.com/HabitRPG/habitrpg into develop
2015-06-11 08:40:36 -07:00
2625b57f2d
Make sure search filter has same margin as tags
2015-06-11 15:32:01 +02:00
0b74736cf2
Remove unused dependency
2015-06-11 09:18:20 +02:00
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
8dde41d18a
Wrie and refactor guild tests
2015-06-10 23:39:46 -05:00
31f61c05f4
Added tests for using directional tasks endpoints
2015-06-10 23:10:37 -05:00
1bf38578bf
Merge branch 'develop' into hairlessbear-show_group_leader
2015-06-10 17:51:45 -05:00
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
3a3d5b3731
Merge pull request #5353 from gisikw/only-mixpanel-prod
...
Server-side mixpanel should only load in a production env
2015-06-10 08:52:08 -05:00
ed43bec8cd
Allow default tasks to not have notes
2015-06-10 08:49:26 -05:00
097e1ff70b
Put popover in containing span
2015-06-10 08:18:08 -05:00
d187125c46
Merge branch 'agentx999-text-issues' into develop
2015-06-10 08:13:45 -05:00
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
40f9ff93de
Adjusted guilds test
2015-06-09 22:52:38 -05:00
553538f7ba
Adjust party tests
2015-06-09 22:36:37 -05:00
c2614c0447
Moved if statement to assign task completion before saving task to user
2015-06-09 18:48:03 -05:00
39c75d5b07
Adjustments to chat tests
2015-06-09 18:24:56 -05:00
b53ff67c1f
Merge branch 'develop' into TheHollidayInn-groups-api-tests
2015-06-09 18:19:35 -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
42d49a9236
Merge pull request #4734 from ghswa/thuldir/donateText3
...
Fix a grammatical error in donateText3
2015-06-09 17:44:13 -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
738b78393c
added a space to defaultHabit1Notes
2015-06-09 10:59:09 -07:00
87462043b6
changed comma to semicolon
2015-06-09 10:57:22 -07:00
ef6fa13943
removed mention of "options" menu
2015-06-09 10:55:30 -07:00
0990594622
removed unused text (untilNoFace)
2015-06-09 10:53:54 -07:00
ca72b9a9e1
Merge branch 'chimericdream-issues/4838' into develop
2015-06-09 12:45:22 -05:00
hairlessbear