 Blade Barringer
|
3f8066eee5
|
Compile sprites
|
2015-06-11 20:24:52 -05:00 |
|
|
Blade Barringer
|
8d450aefb8
|
Replace head sprites with dark outline versions
Closes #5171
|
2015-06-11 20:24:19 -05:00 |
|
|
Blade Barringer
|
54681e36b5
|
Merge branch 'develop' into blade-Finish_weeklies_pr
v1.0.1
|
2015-06-11 19:47:46 -05:00 |
|
|
Matteo Pagliazzi
|
5d84ead3f8
|
add image for bulk email
|
2015-06-11 22:17:34 +02:00 |
|
|
Sabe Jones
|
4da4777ddd
|
chore(news): Every X Bailey
|
2015-06-11 14:22:39 -05:00 |
|
|
Blade Barringer
|
8dde41d18a
|
Wrie and refactor guild tests
|
2015-06-10 23:39:46 -05: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
|
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 |
|
|
Blade Barringer
|
ed43bec8cd
|
Allow default tasks to not have notes
|
2015-06-10 08:49:26 -05:00 |
|
|
Blade Barringer
|
097e1ff70b
|
Put popover in containing span
|
2015-06-10 08:18:08 -05:00 |
|
|
Blade Barringer
|
d187125c46
|
Merge branch 'agentx999-text-issues' into develop
|
2015-06-10 08:13:45 -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
|
40f9ff93de
|
Adjusted guilds test
|
2015-06-09 22:52:38 -05:00 |
|
|
Blade Barringer
|
553538f7ba
|
Adjust party tests
|
2015-06-09 22:36:37 -05:00 |
|
|
Blade Barringer
|
39c75d5b07
|
Adjustments to chat tests
|
2015-06-09 18:24:56 -05:00 |
|
|
Blade Barringer
|
b53ff67c1f
|
Merge branch 'develop' into TheHollidayInn-groups-api-tests
|
2015-06-09 18:19:35 -05:00 |
|
|
Blade Barringer
|
75fdf84533
|
move display blurb next to blurb
|
2015-06-09 17:53:11 -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 |
|
|
Blade Barringer
|
42d49a9236
|
Merge pull request #4734 from ghswa/thuldir/donateText3
Fix a grammatical error in donateText3
|
2015-06-09 17:44:13 -05:00 |
|
|
Blade Barringer
|
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 |
|
|
agentx999
|
738b78393c
|
added a space to defaultHabit1Notes
|
2015-06-09 10:59:09 -07:00 |
|
|
agentx999
|
87462043b6
|
changed comma to semicolon
|
2015-06-09 10:57:22 -07:00 |
|
|
agentx999
|
ef6fa13943
|
removed mention of "options" menu
|
2015-06-09 10:55:30 -07:00 |
|
|
agentx999
|
0990594622
|
removed unused text (untilNoFace)
|
2015-06-09 10:53:54 -07:00 |
|
|
Blade Barringer
|
ca72b9a9e1
|
Merge branch 'chimericdream-issues/4838' into develop
|
2015-06-09 12:45:22 -05:00 |
|
|
Blade Barringer
|
ec3b32fccb
|
Add test for preventing task with id that already exists
|
2015-06-09 12:44:49 -05:00 |
|
|
Kevin Gisi
|
b5d5800f57
|
Merge pull request #5382 from gisikw/ensure-tests-fail
Ensure tests fail
|
2015-06-09 13:14:08 -04:00 |
|
|
Sabe Jones
|
a125d26eee
|
Merge pull request #5381 from SabreCat/develop
Never strip Ultimate Gear
|
2015-06-09 09:52:40 -07:00 |
|
|
Kevin Gisi
|
d4ef750358
|
Repair deliberately broken test
|
2015-06-09 12:51:12 -04:00 |
|
|
Kevin Gisi
|
5f218680bc
|
Fix test callbacks; deliberately break a test for Travis
|
2015-06-09 12:39:23 -04:00 |
|
|
Sabe Jones
|
413b01348d
|
fix(test): Ultimate Gear passing
|
2015-06-09 11:22:45 -05:00 |
|
|
Sabe Jones
|
62eea3d928
|
fix(test): Group Ultimate Gear tests
|
2015-06-09 11:05:25 -05:00 |
|
|
Sabe Jones
|
8a6aa0ed6c
|
test(achievements): Ultimate Gear persistence
|
2015-06-09 11:01:11 -05:00 |
|
|
Sabe Jones
|
fe9666d5ee
|
fix(achievements): Never strip Ultimate Gear
Fixes #5369.
|
2015-06-09 10:47:59 -05:00 |
|
|
Bill Parrott
|
05286d1e8f
|
use correct http status code
|
2015-06-09 08:55:06 -05:00 |
|
|
Bill Parrott
|
9cbc21d798
|
check for duplicate task ID when adding a new task
|
2015-06-09 08:55:06 -05:00 |
|
|
Blade Barringer
|
b1e8f16639
|
Merge pull request #5008 from gisikw/fix-singleton-challenge-edit
Singleton challenge edit -> detail on save -- Fixes #5001
|
2015-06-09 08:41:00 -05:00 |
|
|
Kevin Gisi
|
ad6443c5b8
|
Ensure reload on transition from challeng edit -> detail
|
2015-06-09 09:28:38 -04:00 |
|
|
Kevin Gisi
|
50bbe5b2f5
|
Fixes #5001
Singleton challenge edit -> detail on save
|
2015-06-09 09:28:38 -04:00 |
|
|
Kevin Gisi
|
d61d09de40
|
Merge pull request #5379 from gisikw/fix-readme
Fix readme
|
2015-06-09 08:57:44 -04:00 |
|
|
Kevin Gisi
|
96d2d51aab
|
Actually fix coverage badge
|
2015-06-09 08:57:12 -04:00 |
|
|
Kevin Gisi
|
b503de15a8
|
Revert "Case-sensitivity"
This reverts commit 31a8b63507.
|
2015-06-09 08:56:28 -04:00 |
|
|
Kevin Gisi
|
31a8b63507
|
Case-sensitivity
|
2015-06-09 08:53:59 -04:00 |
|
|
Kevin Gisi
|
35de4b1412
|
Merge pull request #5378 from gisikw/fix-readme
Fix Coveralls README
|
2015-06-09 08:52:25 -04:00 |
|
|
Kevin Gisi
|
1b0c9464cc
|
Fix Coveralls README
|
2015-06-09 08:51:55 -04:00 |
|
|
Blade Barringer
|
dabb6244e7
|
Merge pull request #5370 from gisikw/split-out-directives
Split out Angular directives
|
2015-06-09 07:42:12 -05:00 |
|
|
Kevin Gisi
|
5c603bbb32
|
Merge pull request #5377 from gisikw/setup-coverage-reporting
Setup coverage reporting
|
2015-06-09 08:37:31 -04:00 |
|
|
Blade Barringer
|
1b03d70d57
|
Merge pull request #5374 from gisikw/60m-idle-refresh
Refresh if idle > 6 hours
|
2015-06-09 07:36:32 -05:00 |
|