Tyler Renelle
836787906d
bstart building challenges
2013-05-17 14:06:26 +01:00
Tyler Renelle
92e8e5b597
done trying to futz with user-menu css for maintaining visibility when
...
header hidden. Instead, just put it elsewhere in html if header
hidden. fixes #981
2013-05-17 12:09:43 +01:00
Tyler Renelle
af8dbb9f1a
Use @Shaners new NPCs sprites instead of images
2013-05-16 12:00:04 +01:00
Tyler Renelle
bb1ea755f1
tasks / rewards.html - pass in the actual list, and whether booleans
...
@editable and @main, which will allow for challenges lists & mngr
accounts / public lists
2013-05-12 13:12:13 +01:00
Tyler Renelle
4347ba52ba
overhaul tasks.html so we can start generalizing task-lists,
...
ground-work for challenges
2013-05-12 11:33:05 +01:00
Tyler Renelle
88c0db47f1
tags: only show filters when in tasks view
2013-05-06 21:27:10 +01:00
Tyler Renelle
82682e1af1
tags: cleanup, prevent bug for multiple tag-creation
2013-05-06 16:41:35 +01:00
Tyler Renelle
a3003a758d
Merge branch 'tags' into develop
...
Conflicts:
src/app/index.coffee
src/app/tasks.coffee
styles/app/index.styl
views/app/index.html
views/app/settings.html
views/app/tasks.html
2013-05-06 14:01:43 +01:00
Tyler Renelle
c3eadab4dc
notify of new chat messages
2013-05-02 20:23:50 +01:00
Tyler Renelle
77bd61c244
Add bailey the crier for alerts. move CHANGELOG.md into the modal
2013-05-02 16:56:43 +01:00
Tyler Renelle
60b5783689
add separate game-pane from tasks-pane, make layout smoother #828
2013-05-02 14:16:57 +01:00
Tyler Renelle
584eb3e936
let's try moving external script loading back to app.on('render') so
...
ew don't cause blocking on failed amazon affiliate load
2013-05-01 13:07:42 +01:00
Tyler Renelle
72ee444608
back to our roots: store vendor files in public/vendor instead of
...
using CDN, hoping to fix #773 (hoping! will follow up). We can close #755 as a result. We use
require() to min/concat for performance. Note, previously we had "too
many files open" error because we had /vendor tracking git submodules,
which includes all files for those projects - now we're downloading
manually, which gives us minimum required files from each project's
build steps
2013-04-09 13:21:20 -04:00
Tyler Renelle
6522badaa6
rename _view.* to _* - don't know why I did that whole _view.* thing
...
in the first place, but whatevs
2013-04-07 20:29:13 -04:00
Tyler Renelle
41449d349a
protocol-agnostic amazon images & hover-script at the end
2013-03-31 00:27:47 -07:00
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
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
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
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
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
