36677c0585
Merge branch 'origin-develop'
2013-03-07 13:16:54 -05:00
db805b6388
Merge pull request #592 from aaron4/patch-1
...
Added space after each line of text (privacy.html)
2013-03-06 10:11:01 -08:00
467cbfba64
Merge pull request #593 from aaron4/patch-2
...
Added space after each line of text (terms.html)
2013-03-06 10:09:42 -08:00
0dbf2257d7
New Algorithms + fixes
2013-03-06 17:02:08 +00:00
4f7cdc38e9
add help popover to difficulty
2013-03-05 18:58:15 -05:00
9c14b29a3d
rename priority multiplier to "Difficulty" -> easy, medium,
...
hard (people keep getting confused) and putting it back into
"advanced" section
2013-03-05 18:07:22 -05:00
41b1ca9f73
typo
2013-03-05 17:05:05 -05:00
6a280c57ea
re-applying #553 fix
2013-03-05 17:04:22 -05:00
a8c09110f7
reverting redisign commits. @zakkain some issues here ill follow up with you on - if i forget, "add" button in responsive layout, item store issues
2013-03-05 17:02:22 -05:00
16b9ea3b58
reverting my #553 & html cleanup fixes, merge conflicts from redesign - gotta go through and do these again
2013-03-05 17:00:44 -05:00
1cd3299388
strange fix for #553 , also #539 take note
2013-03-05 16:16:08 -05:00
9a60ed5269
some html cleanup
2013-03-05 16:06:56 -05:00
bb82bcc62a
namespacing for tasks & rewards too
2013-03-05 15:52:47 -05:00
8132dbfe05
<task:> tabbing borked
2013-03-05 15:23:16 -05:00
9ad67fa169
Added space after each line of text
...
Same for this one. Added space to each line of text if line of text is following.
Also changed "Terms Of Use" to "Terms of Use".
2013-03-05 10:42:40 -06:00
2cf267ccf5
added space after each line of text
...
With previous privacy.html, there was not a space after each line of text (if line of text following). This caused words to be combined together.
Fixed issue by adding a space after each line of text.
2013-03-05 10:26:08 -06:00
ba1a8dabc8
add in Lato as main font, lots of minor layout tweaks. Continue refactoring tasks html
2013-03-04 20:36:11 -05:00
b7d46b1e20
start new task column css, add classes
2013-03-04 19:42:48 -05:00
34651083ec
Merge pull request #570 from lefnire/priority-multiplier
...
Priority multiplier
2013-03-04 08:38:14 -08:00
9517455a79
migrate "multiplier" setup to "priority" setup, with ! !! !!! instead
...
of 1 2 3. multipliers are now 1x 1.5x 2x
2013-03-04 11:37:46 -05:00
233f8ea595
data-target on modal instead of hrefd
2013-03-04 00:41:59 -05:00
1bd067f32f
add multiplier "new feature" alert
2013-03-03 22:06:34 -05:00
7f03a30fd5
remove "advanced" section, clean up the task-edit form a bit
2013-03-03 21:38:21 -05:00
2e26df743f
Merge branch 'develop' into priority-multiplier
2013-03-03 21:25:13 -05:00
35cea7fcbb
notification on "onlies" mechanic
2013-03-03 20:59:14 -05:00
c33c6c3480
add multiplier functionality to task scoring
2013-03-03 18:18:49 -05:00
1a335cc68a
add priority-multiplier to html & tasks.coffee (note, requires merge
...
of @IvanGaravito /derby#hotfix-model_at_for_each_blocks
2013-03-03 17:54:14 -05:00
6189fee74e
algorightms notification (to warn people to restore their exp)
2013-03-03 16:14:16 -05:00
34f5f2dc54
custom dayStart
2013-03-03 01:21:10 -05:00
e10c65dff7
merge
2013-03-02 20:12:18 +00:00
81eb070ee6
Reset button
2013-03-02 20:03:16 +00:00
08839278b3
Notification and Algorithim changes
2013-03-02 18:23:43 +00:00
7fc1de01e6
Small improvement of the error-alert styling
2013-03-02 00:27:59 +01:00
b1c770c0f9
decrease "reset" button size
2013-02-28 10:59:39 -05:00
39a98446b9
move all custom sprites to /img/sprites, and all BrowserQuest image references to /vendor/BrowserQuest (a git submodule)
2013-02-27 23:27:01 -05:00
76d84a392e
Merge remote-tracking branch 'ruddfawcett/master' into develop
2013-02-27 22:36:13 -05:00
bc46b9159a
add change password
2013-02-27 22:23:08 -05:00
e7ddfb8892
move all custom sprites to /img/sprites, and all BrowserQuest image references to /vendor/BrowserQuest (a git submodule)
2013-02-27 20:24:57 -05:00
811d6de107
fix to previous - don't do it dynamically, do it on save
2013-02-27 09:15:06 -05:00
01182b377d
add a self-serve restore modal for users who want to restore their stats
2013-02-27 09:07:51 -05:00
a644b572c4
add link to addons / extensions
2013-02-19 21:58:10 -05:00
eee1983769
remove kickstarter notification stuff
2013-02-19 21:57:33 -05:00
c8c6050f59
remove celebration alert
2013-02-18 01:35:17 -05:00
22ac8e1d16
add faux achievements, fix error page
2013-02-17 15:07:56 -05:00
dc3f708e0d
comment out gcal link for now
2013-02-17 14:37:17 -05:00
fc1ccfa953
hacked datepicker into working
2013-02-17 13:58:16 -05:00
eb56efb0dc
for now remove badges section of profile
2013-02-17 01:55:17 -05:00
a3ef2e1977
temporary method for active profile username - {#if} on private paths
...
in derby seems iffy
2013-02-17 01:51:40 -05:00
6dafefc45a
show profile for the individual you clicked
2013-02-17 01:31:10 -05:00
4602e0bf5b
more separation
2013-02-17 00:55:52 -05:00
Tyler Renelle