2be827f484
Merge branch 'cdn-scripts' into develop
2013-03-17 09:33:19 -04:00
6182a474c7
remoe bootstrap import from .styl, start pulling in from
...
CDN (500.html, static, & dynamic pages)
2013-03-17 09:33:14 -04:00
8e845d6586
add bootstrap-responsive into master. remove when develop is merged in
2013-03-17 09:19:55 -04:00
dc3af9aa49
better "reroll" comment
2013-03-17 09:16:33 -04:00
2ca7c65abc
don't add bootstrap css files in when instantiating derby-ui-boostrap,
...
instead compile in with the css. index.coffee directives are run
against static pages too, which overwrites our bootstrap
responsive (which we need) with the app's custom responsive styles. We
may change this, but for now this commit allows us to keep the
marketing site and main site styles separate
Conflicts:
src/app/index.coffee
2013-03-17 09:16:31 -04:00
83b29177bc
add responsive to static pages
2013-03-17 09:15:56 -04:00
76064be3d8
clegsome static-page cleanup
2013-03-17 09:15:50 -04:00
b030fb60ec
add a ton of static page, beef up the footer, make this website look
...
official! @zakkain, I hope I didn't break anything!
2013-03-17 09:15:44 -04:00
4e9fc85193
start static-pages redesign
2013-03-17 09:15:34 -04:00
0bcea534ae
better "reroll" comment
2013-03-17 09:13:25 -04:00
0c1151b123
don't add bootstrap css files in when instantiating derby-ui-boostrap,
...
instead compile in with the css. index.coffee directives are run
against static pages too, which overwrites our bootstrap
responsive (which we need) with the app's custom responsive styles. We
may change this, but for now this commit allows us to keep the
marketing site and main site styles separate
2013-03-17 09:11:19 -04:00
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
49dedf8f2f
add responsive to static pages
2013-03-17 00:29:32 -04:00
63cda4c5c7
clegsome static-page cleanup
2013-03-16 23:35:20 -04:00
ee9e6064b2
add a ton of static page, beef up the footer, make this website look
...
official! @zakkain, I hope I didn't break anything!
2013-03-16 23:03:59 -04:00
b1fe9b64a9
Merge branch 'develop' into static-pages
2013-03-16 20:29:22 -04:00
dbc3906eb3
possible fix to dom losing functions after model.resetDom()
2013-03-16 20:02:01 -04:00
00db85dff6
protocol agnostic ads
2013-03-16 19:48:15 -04:00
78bc27439a
Remove trailing spaces
2013-03-16 19:36:07 -04:00
9f7b653a25
Merge branch 'develop' into ads
...
Conflicts:
views/app/tasks.html
2013-03-16 19:27:29 -04:00
9501e67661
add missing namespaces for rewards & tasks for consistency & organization
2013-03-16 19:22:53 -04:00
9c0a640f9f
add ads back in
2013-03-16 19:18:17 -04:00
903479af5a
add view functions and(), or(), notEqual()
2013-03-16 19:10:40 -04:00
7083e7a103
yarr, fix all teh bugs
2013-03-16 16:30:45 -04:00
53682205de
another strange derby truthy issue
2013-03-16 16:03:07 -04:00
081c5c656f
another strange derby truthy issue
2013-03-16 16:02:15 -04:00
099008d557
whitespace
2013-03-16 15:36:56 -04:00
f9ab61178b
Cleanup
2013-03-16 15:17:55 -04:00
1a1144b3cc
If the user selects an already selected pet, deselect it
2013-03-16 15:10:50 -04:00
6d34fa8953
Highlight active pet
2013-03-16 15:09:16 -04:00
419351494c
Clean up helpers + choose Pet
2013-03-16 14:58:09 -04:00
14a892043a
add some api comments (just so i can visually separate the functions
...
for now)
2013-03-16 11:50:02 -04:00
2ffe0aecf9
FeedEgg
2013-03-16 11:18:27 -04:00
48cbe7c383
Merge branch 'master' into develop
...
Conflicts:
views/app/settings.html
2013-03-15 18:40:21 -04:00
545e5fc2a4
allow manually unlocking party system
2013-03-15 18:39:39 -04:00
14babdbf24
remove snark
2013-03-15 18:26:56 -04:00
4ec94e4ed8
remove snark
2013-03-15 18:26:40 -04:00
368748b67a
add delete account functionality (*sigh*, y'all asked for it)
2013-03-15 17:59:15 -04:00
7a7c96ca57
add change for mutlipel subdomain GA tracking
2013-03-15 17:59:10 -04:00
6c61c0f7db
add delete account functionality (*sigh*, y'all asked for it)
2013-03-15 17:58:37 -04:00
566f1aa230
add change for mutlipel subdomain GA tracking
2013-03-15 17:47:42 -04:00
37901ef4f4
move settings and API into tabs
2013-03-15 17:31:07 -04:00
281502499b
add toggle header to settings dialog
2013-03-15 17:31:03 -04:00
325d906708
begin adding toggle-header
2013-03-15 17:30:59 -04:00
054cf03614
update comment
2013-03-15 17:30:55 -04:00
b7425f4964
move party stats to a modal
2013-03-15 17:30:50 -04:00
174a0d2362
cleaner view.fn "tnl"
2013-03-15 17:30:46 -04:00
7f93b525c0
move tnl to a view function instead of model function, beging adding
...
party stats visuals (hp & exp presently)
2013-03-15 17:30:42 -04:00
3fa6aaceed
add 'show helm' option
2013-03-15 17:20:15 -04:00
f2faf8c968
add 'show helm' option
2013-03-15 17:20:01 -04:00
Tyler Renelle