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
53682205de
another strange derby truthy issue
2013-03-16 16:03:07 -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
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
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
1e5ec6f176
Merge pull request #660 from Shaners/master
...
Pet Egg Sprite Sheet and CSS
2013-03-15 07:40:22 -07:00
644a23cc57
Pet Egg Sprite Sheet and CSS
2013-03-14 21:57:08 -07:00
b3a031bee5
Merge pull request #3 from lefnire/master
...
Update this branch
2013-03-14 18:14:38 -07:00
905719725e
use Unroll-Me/derby#master
2013-03-14 14:17:10 -04:00
e51cf0089e
typo test/api.mocha.coffee
2013-03-12 17:52:44 -07:00
bb57eddec1
divide exp gain by 2, temporary hack since people are leveling way too
...
fast.
2013-03-12 10:05:18 -04:00
a534eec548
[documentation] level 2 unlocks items
2013-03-10 12:21:30 -04:00
c0c4ef141b
Merge pull request #613 from kyokutei/master
...
Splash page rewritten
2013-03-10 09:18:22 -07:00
4d5110c9d3
Merge pull request #627 from toebu/high-level-algo-fix
...
Changing expModifier and hpModifier algo to be less influenced by level....
2013-03-10 08:46:42 -07:00
72e81b8891
#315 fixes: newValue not accessible at scope, only remove duff history
...
entries, not all
2013-03-10 11:40:58 -04:00
0332ee7b48
Merge pull request #616 from MrConcept/fix
...
Fixed Daily History graphs
2013-03-10 08:22:43 -07:00
cbbfdaa542
Changing expModifier and hpModifier algo to be less influenced by level. For high lvls (~50), you actually get HP instead of losing them with the current formula. This now doesn't happen anymore (at least for levels up to 100, which is the current max).
2013-03-09 20:14:42 +01:00
9aac271b60
Improving readability of the statements for setting the colour of a task
2013-03-09 20:06:53 +01:00
795aac8fcb
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-09 11:03:57 -05:00
7904cd17b6
Merge branch 'master' into develop
2013-03-09 11:03:35 -05:00
155747bfd0
fix to 401 user not found (can't use @byId)
2013-03-09 10:26:08 -05:00
9bd4f30375
Merge pull request #623 from arscan/develop
...
Add Task Delete to API
2013-03-09 06:28:18 -08:00
188e4ff271
Remove one id from array of typeIds instead of rewriting whole array
2013-03-09 09:14:07 -05:00
2111cca09a
Delete task for the API tests
2013-03-09 02:08:50 -05:00
2b8f2f48c1
Delete task for the API
2013-03-09 02:08:20 -05:00
3407565d37
remove console.log(req.headers.origin)
2013-03-08 18:10:26 -05:00
1ef32c771b
remove console.log(req.headers.origin)
2013-03-08 18:10:12 -05:00
023f8aeaad
Merge branch 'origin-develop'
2013-03-08 18:05:06 -05:00
399e4b9dda
strange fix to CORS issue - move CORS middleware to top, respond with
...
200 if OPTIONS request
2013-03-08 18:04:57 -05:00
1ddd06ce38
remove webkit-agent (thought i already did?)
2013-03-08 15:39:03 -05:00
8cbf777232
allow OPTIONS, req.headers.origin || *
2013-03-08 15:34:37 -05:00
5c7fdc7ff5
Merge branch 'origin-develop'
2013-03-08 14:33:40 -05:00
75c1a38beb
add x-api-user and x-api-key to accpeted headers
2013-03-08 14:33:19 -05:00
b6a7d63c21
changed migration comment
2013-03-08 00:23:08 +00:00
24c7677764
Migration script for removing old dailies histories
2013-03-08 00:20:46 +00:00
50c5069224
notifications tweak and history fix
2013-03-08 00:10:11 +00:00
84f046024e
Updated public/splash.html
2013-03-07 13:08:36 -08:00
Tyler Renelle