b052f803e4
Initialize user.filterQuery as undefined
2015-06-13 14:09: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
5d56bd02ef
Merge branch 'develop' into blade-feature/search
2015-06-13 00:10:44 -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
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
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
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
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
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
b1b8dc18af
Made links translatable
2015-06-07 13:17:57 -04:00
9fa39d99ae
perf(i18n): load only the language preference, not the whole user
2015-06-07 14:27:07 +02: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
58a816d584
Server-side mixpanel should only load in a production env
2015-06-05 20:54:47 -04: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
16f0ece2f8
Removed ! from 'env.t' that don't have html characters
2015-06-05 09:44:19 -04:00
d26e4780fd
Added links to multiple task help phrases
2015-06-05 09:26:33 -04: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
Blade Barringer