Tyler Renelle
|
f332c5d9a8
|
Merge branch 'develop' into toebu-tags-filters
Conflicts:
src/app/index.coffee
src/app/tasks.coffee
styles/app/index.styl
views/app/index.html
views/app/tasks.html
|
2013-03-18 17:09:42 -04:00 |
|
Tyler Renelle
|
2f3d0fa86a
|
start adding undo functionality
|
2013-03-17 21:30:24 -04:00 |
|
Tyler Renelle
|
2276867f6c
|
use cloudflare cdn for bootstrap too
|
2013-03-17 09:45:57 -04:00 |
|
Tyler Renelle
|
2be827f484
|
Merge branch 'cdn-scripts' into develop
|
2013-03-17 09:33:19 -04:00 |
|
Tyler Renelle
|
6182a474c7
|
remoe bootstrap import from .styl, start pulling in from
CDN (500.html, static, & dynamic pages)
|
2013-03-17 09:33:14 -04:00 |
|
Tyler Renelle
|
4614e48cdc
|
Adding first rudimentary version of tagging and filtering. New users get three tags: morning, afternoon and evening. At the moment, one can not change these tags or add new ones. There are also some problems: tagging a newly added task, also tags one of the existing tasks. Also, when having an active filter and removing the corresponding tag from a task, that task is immediately hidden, although you are still editing it.
|
2013-03-17 09:10:27 -04:00 |
|
Tyler Renelle
|
9501e67661
|
add missing namespaces for rewards & tasks for consistency & organization
|
2013-03-16 19:22:53 -04:00 |
|
Tyler Renelle
|
566f1aa230
|
add change for mutlipel subdomain GA tracking
|
2013-03-15 17:47:42 -04:00 |
|
Tyler Renelle
|
2f372124b3
|
start moving javascript loading functionality back to <Scripts:> so we
can utilize CDNs
|
2013-03-15 11:15:35 -04:00 |
|
Tyler Renelle
|
646deb2cdd
|
protocol-agnostic fonts
|
2013-03-14 15:51:29 -04:00 |
|
Zachary Kain
|
81a527e5d6
|
android mobile bugfixes
|
2013-03-06 01:29:13 -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
|
a002932210
|
re-add Lato webfont
|
2013-03-05 20:29:20 -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 |
|
Zachary Kain
|
1a308da495
|
better responsive breakpoints, more robust custom grid
|
2013-03-05 15:01:52 -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 |
|
Tyler Renelle
|
4602e0bf5b
|
more separation
|
2013-02-17 00:55:52 -05:00 |
|
Tyler Renelle
|
dd5f2f7a12
|
move more html files around
|
2013-02-17 00:45:17 -05:00 |
|
Tyler Renelle
|
e2016e1eed
|
separate everything out into individual html files
|
2013-02-17 00:25:34 -05:00 |
|
Tyler Renelle
|
b61a4bf062
|
merge in all the profile code
|
2013-02-17 00:05:22 -05:00 |
|
Tyler Renelle
|
034785d62d
|
for now remove date-picker since it doesn't seem to fire update event
|
2013-02-16 20:44:20 -05:00 |
|
Tyler Renelle
|
23c94c0aee
|
remove vestige bootstrap-datepicker, move github-buttons to submodule
|
2013-02-16 19:46:31 -05:00 |
|
Tyler Renelle
|
3392074fdd
|
import date-picker from stylus
|
2013-02-16 19:09:54 -05:00 |
|
Tyler Renelle
|
fc7a1fd7a3
|
add bootstrap-datepicker submodule, remove html5 date field (seems
poorly supported)
|
2013-02-16 18:59:42 -05:00 |
|
Tyler Renelle
|
29fecb36c8
|
Merge branch 'master' into ical
|
2013-02-16 16:20:34 -05:00 |
|
Tyler Renelle
|
6348819ba5
|
Merge branch 'master' into ical
|
2013-02-16 16:17:12 -05:00 |
|
Tyler Renelle
|
fc951b4907
|
disable due-dates from view except for myself for now, going to test live
|
2013-02-16 16:17:08 -05:00 |
|
Tyler Renelle
|
554c2750c4
|
move API mount to new serverRoutes function, express.use()'d before derby-auth
|
2013-02-16 16:02:30 -05:00 |
|
david.rhinehart
|
fb90106f7e
|
Fixes #390 added fixed notification area to top
|
2013-02-16 11:02:55 -06:00 |
|
Tyler Renelle
|
7ce6ae3eee
|
kickstarter celebration notification
|
2013-02-15 19:37:54 -05:00 |
|
Tyler Renelle
|
332080ca94
|
disable calendar for now, crazy issues
|
2013-02-15 17:29:07 -05:00 |
|
Tyler Renelle
|
50c230ba1e
|
for some reason closure-accessible db causes the multi-downlaod issue??
|
2013-02-15 16:32:00 -05:00 |
|
Tyler Renelle
|
30b52d392e
|
move routes, comment out gcal until we can get it working
|
2013-02-15 15:46:31 -05:00 |
|
Tyler Renelle
|
b38ec27d03
|
tidy up links
|
2013-02-15 14:11:45 -05:00 |
|
Tyler Renelle
|
45d07f1c38
|
add ical links
|
2013-02-15 13:05:54 -05:00 |
|
Tyler Renelle
|
10a8ad551f
|
got ical to send downloadable icsf files
|
2013-02-15 12:26:43 -05:00 |
|
Tyler Renelle
|
6cffdfd1e8
|
start adding date field & ical support
|
2013-02-15 11:37:44 -05:00 |
|
Tyler Renelle
|
e03bc48ac9
|
update KS message
|
2013-02-13 16:22:35 -05:00 |
|
Tyler Renelle
|
ec2ec3e87b
|
comment out progress.pollyfill
|
2013-02-13 15:26:23 -05:00 |
|
Tyler Renelle
|
064abc959b
|
reverting the commit-set for the progress-bars https://github.com/lefnire/habitrpg/pull/379 (@zakkain I'll follow up on GH)
Revert "move progress-pollyfill to require for performance"
This reverts commit 96b983b564.
|
2013-02-13 15:21:44 -05:00 |
|
Tyler Renelle
|
96b983b564
|
move progress-pollyfill to require for performance
|
2013-02-12 22:55:19 -05:00 |
|
Tyler Renelle
|
917f2f17aa
|
Merge pull request #379 from zakkain/master
Refactor & Update Progress Bars
|
2013-02-12 19:21:49 -08:00 |
|
Zachary Kain
|
188950c8fb
|
refactor a bit
|
2013-02-12 13:13:35 -05:00 |
|
Zachary Kain
|
8c9cd3cb67
|
start re-marking up avatars in prep for charbox module. WILL DO A FEATURE BRANCH, PROMISE
|
2013-02-12 12:36:38 -05:00 |
|
Zachary Kain
|
433329db43
|
Replace progress bar markup with <progress> element. Add polyfill & styles
|
2013-02-12 12:33:15 -05:00 |
|
Tyler Renelle
|
6ffe57eb00
|
some prettifying of party dialog
|
2013-02-11 19:38:15 -05:00 |
|
Tyler Renelle
|
44eb3f1271
|
<app:newTask/> encapsulates more
|
2013-02-11 19:28:05 -05:00 |
|
Tyler Renelle
|
03779c73ab
|
close "new party" <form> tag. #330, wah wah wah
|
2013-02-11 19:27:35 -05:00 |
|
Tyler Renelle
|
031b4029c6
|
test on empty task-text entry, for #330
|
2013-02-11 13:12:15 -05:00 |
|
Tyler Renelle
|
edee8d2719
|
cleaner avatar-level visibility
|
2013-02-11 12:24:57 -05:00 |
|