Tyler Renelle
c9907f9558
move some external script loading into app.on('render') to see if that
...
solves https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/x8FwdTLEuXo
2013-03-30 18:45:57 -07:00
Tyler Renelle
9b42eb825b
small ads & static-bindings cleanup (doesn't fix the ads issue)
2013-03-29 21:48:08 -07:00
Tyler Renelle
a862e21e8e
Merge branch 'develop' into pets
2013-03-22 19:06:48 -06:00
Tyler Renelle
b286b95153
add charts back in, temporary style
2013-03-21 16:31:23 -06:00
Tyler Renelle
3ce2686662
Merge branch 'develop' into switz-inventory
...
Conflicts:
src/app/helpers.coffee
styles/app/avatar.styl
styles/app/index.styl
views/app/avatar.html
views/app/tasks.html
Merge branch 'develop' into switz-inventory
Conflicts:
src/app/helpers.coffee
styles/app/avatar.styl
styles/app/index.styl
views/app/avatar.html
views/app/tasks.html
2013-03-21 13:51:38 -06:00
Tyler Renelle
fa89b20dd5
Merge branch 'develop' into zakkain-ui-tweaks
...
Conflicts:
styles/app/index.styl
styles/app/tasks.styl
views/app/alerts.html
views/app/avatar.html
views/app/header.html
views/app/index.html
Merge branch 'develop' into zakkain-ui-tweaks
Conflicts:
styles/app/index.styl
styles/app/tasks.styl
views/app/alerts.html
views/app/avatar.html
views/app/header.html
views/app/index.html
by popular demand, we're dropping the crosshatched square and going blank
Conflicts:
styles/app/tasks.styl
2013-03-21 12:36:05 -06:00
Tyler Renelle
d737bd0714
remove a ton of public/vendor git submodules, using CDN instead. The
...
reason we're removing the submodules (intead of keeping them around
for offline development) is that derby does some watchfile magic on the
public directory, and it causes a "max file limit" operating system
error (mitigated by `ulimit -u 2048`). For offline developers, you may
want to have some symlinks and a git stash handy
2013-03-21 11:11:15 -06:00
Tyler Renelle
7529601dcc
add general "new stuff" notification, linking to changelog
2013-03-21 10:31:23 -06:00
Zachary Kain
411c614408
fix the 1px gap
2013-03-18 19:33:30 -04:00
Zachary Kain
13673c3ec7
flattenize header, change to <header>, even margins
2013-03-18 16:46:58 -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
9501e67661
add missing namespaces for rewards & tasks for consistency & organization
2013-03-16 19:22:53 -04:00
Daniel Saewitz
7083e7a103
yarr, fix all teh bugs
2013-03-16 16:30:45 -04:00
Daniel Saewitz
f9ab61178b
Cleanup
2013-03-16 15:17:55 -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
Daniel Saewitz
510bcda47c
wip
2013-03-08 12:44:21 -05: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
