 Zachary Kain
|
e5a893a710
|
revamp rewards and pets UI. Obv pets is temporary pending new pet system
|
2013-03-09 01:34:15 -05:00 |
|
|
Zachary Kain
|
f89037da53
|
new drag animation, tiny outline & shadow tweaks
|
2013-03-08 22:26:01 -05:00 |
|
|
Zachary Kain
|
17dcb70e04
|
Merge remote-tracking branch 'upstream/develop' into ui-tweaks
|
2013-03-08 19:01:25 -05:00 |
|
|
Philip How
|
0dbf2257d7
|
New Algorithms + fixes
|
2013-03-06 17:02:08 +00:00 |
|
|
Zachary Kain
|
81a527e5d6
|
android mobile bugfixes
|
2013-03-06 01:29:13 -05:00 |
|
|
Zachary Kain
|
f0462d022f
|
style Todo tabs, misc stuff
|
2013-03-06 01:15:45 -05:00 |
|
|
Zachary Kain
|
456580e352
|
gut & re-style Task Options, only Rewards tasks & options left to go through
|
2013-03-06 00:50:39 -05:00 |
|
|
Zachary Kain
|
84e07a0317
|
better a11y than display:none
|
2013-03-06 00:50:39 -05:00 |
|
|
Zachary Kain
|
174c7a8b9f
|
tweaks, most notably DISABLE CHART BUTAN
|
2013-03-06 00:50:39 -05:00 |
|
|
Zachary Kain
|
a002932210
|
re-add Lato webfont
|
2013-03-05 20:29:20 -05:00 |
|
|
Tyler Renelle
|
4f6a78c0ae
|
add help popover to difficulty
|
2013-03-05 20:12:09 -05:00 |
|
|
Tyler Renelle
|
4bb0207564
|
rename priority multiplier to "Difficulty" -> easy, medium,
hard (people keep getting confused) and putting it back into
"advanced" section
|
2013-03-05 20:12:05 -05:00 |
|
|
Tyler Renelle
|
48dc49e1c4
|
re-enstate double-rewards bug fix
|
2013-03-05 20:10:03 -05:00 |
|
|
Tyler Renelle
|
3f33261792
|
proper derby tabbing
|
2013-03-05 20:08:31 -05:00 |
|
|
Tyler Renelle
|
67c42f5e1a
|
Merge branch 'develop' into zakkain-ui-tweaks
Conflicts:
styles/app/tasks.styl
views/app/tasks.html
|
2013-03-05 20:04:37 -05:00 |
|
|
Tyler Renelle
|
4f7cdc38e9
|
add help popover to difficulty
|
2013-03-05 18:58:15 -05:00 |
|
|
Tyler Renelle
|
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 |
|
|
Tyler Renelle
|
41b1ca9f73
|
typo
|
2013-03-05 17:05:05 -05:00 |
|
|
Tyler Renelle
|
6a280c57ea
|
re-applying #553 fix
|
2013-03-05 17:04:22 -05:00 |
|
|
Tyler Renelle
|
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 |
|
|
Tyler Renelle
|
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 |
|
|
Tyler Renelle
|
1cd3299388
|
strange fix for #553, also #539 take note
|
2013-03-05 16:16:08 -05:00 |
|
|
Tyler Renelle
|
9a60ed5269
|
some html cleanup
|
2013-03-05 16:06:56 -05:00 |
|
|
Tyler Renelle
|
bb82bcc62a
|
namespacing for tasks & rewards too
|
2013-03-05 15:52:47 -05:00 |
|
|
Tyler Renelle
|
8132dbfe05
|
<task:> tabbing borked
|
2013-03-05 15:23:16 -05:00 |
|
|
Zachary Kain
|
1a308da495
|
better responsive breakpoints, more robust custom grid
|
2013-03-05 15:01:52 -05:00 |
|
|
Zachary Kain
|
efe1c9267e
|
WIP: new 'Task Actions' UI (buttons, checkboxes, etc)
|
2013-03-05 14:16:10 -05:00 |
|
|
Zachary Kain
|
9d312ce184
|
clean up nbsp, replace old gcal markup with new markup, still commented out
|
2013-03-05 09:18:21 -05:00 |
|
|
Zachary Kain
|
2d2e7bbf54
|
reposition Todo options, use proper icon
|
2013-03-05 09:13:14 -05:00 |
|
|
Zachary Kain
|
ba1a8dabc8
|
add in Lato as main font, lots of minor layout tweaks. Continue refactoring tasks html
|
2013-03-04 20:36:11 -05:00 |
|
|
Zachary Kain
|
b7d46b1e20
|
start new task column css, add classes
|
2013-03-04 19:42:48 -05:00 |
|
|
Tyler Renelle
|
34651083ec
|
Merge pull request #570 from lefnire/priority-multiplier
Priority multiplier
|
2013-03-04 08:38:14 -08:00 |
|
|
Tyler Renelle
|
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 |
|
|
Tyler Renelle
|
233f8ea595
|
data-target on modal instead of hrefd
|
2013-03-04 00:41:59 -05:00 |
|
|
Tyler Renelle
|
1bd067f32f
|
add multiplier "new feature" alert
|
2013-03-03 22:06:34 -05:00 |
|
|
Tyler Renelle
|
7f03a30fd5
|
remove "advanced" section, clean up the task-edit form a bit
|
2013-03-03 21:38:21 -05:00 |
|
|
Tyler Renelle
|
2e26df743f
|
Merge branch 'develop' into priority-multiplier
|
2013-03-03 21:25:13 -05:00 |
|
|
Tyler Renelle
|
35cea7fcbb
|
notification on "onlies" mechanic
|
2013-03-03 20:59:14 -05:00 |
|
|
Tyler Renelle
|
c33c6c3480
|
add multiplier functionality to task scoring
|
2013-03-03 18:18:49 -05:00 |
|
|
Tyler Renelle
|
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 |
|
|
Tyler Renelle
|
6189fee74e
|
algorightms notification (to warn people to restore their exp)
|
2013-03-03 16:14:16 -05:00 |
|
|
Tyler Renelle
|
34f5f2dc54
|
custom dayStart
|
2013-03-03 01:21:10 -05:00 |
|
|
Philip How
|
e10c65dff7
|
merge
|
2013-03-02 20:12:18 +00:00 |
|
|
Philip How
|
81eb070ee6
|
Reset button
|
2013-03-02 20:03:16 +00:00 |
|
|
Philip How
|
08839278b3
|
Notification and Algorithim changes
|
2013-03-02 18:23:43 +00:00 |
|
|
Tobias Leugger
|
7fc1de01e6
|
Small improvement of the error-alert styling
|
2013-03-02 00:27:59 +01:00 |
|
|
Tyler Renelle
|
b1c770c0f9
|
decrease "reset" button size
|
2013-02-28 10:59:39 -05:00 |
|
|
Tyler Renelle
|
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 |
|
|
Tyler Renelle
|
76d84a392e
|
Merge remote-tracking branch 'ruddfawcett/master' into develop
|
2013-02-27 22:36:13 -05:00 |
|
|
Tyler Renelle
|
bc46b9159a
|
add change password
|
2013-02-27 22:23:08 -05:00 |
|