Tyler Renelle
|
20ee3ffb62
|
remove cron taskObj? workaround since we're cleaning null tasks on load
|
2013-02-17 14:37:04 -05:00 |
|
Tyler Renelle
|
4bdbbfe764
|
fix to corrupted tasks - remove them when cleaning the user
|
2013-02-17 14:16:58 -05:00 |
|
Tyler Renelle
|
fc1ccfa953
|
hacked datepicker into working
|
2013-02-17 13:58:16 -05:00 |
|
Tyler Renelle
|
77f49f9bd8
|
todo comment
|
2013-02-17 13:18:55 -05:00 |
|
Tyler Renelle
|
57b8f2920f
|
use derby & racer #habitrpg
|
2013-02-17 13:10:00 -05:00 |
|
Tyler Renelle
|
12a452a571
|
cron fix for borked tasks
|
2013-02-17 12:55:10 -05:00 |
|
Tyler Renelle
|
3aef9f1ac0
|
Merge branch 'master' into develop
|
2013-02-17 12:32:15 -05:00 |
|
Tyler Renelle
|
626745bb66
|
Merge branch 'master' of github.com:lefnire/habitrpg
|
2013-02-17 12:21:16 -05:00 |
|
Tyler Renelle
|
8a606b627a
|
handle _.where bug for corrupt tasks
|
2013-02-17 12:21:07 -05:00 |
|
Tyler Renelle
|
6e307e0f6d
|
handle _.where bug for corrupt tasks
|
2013-02-17 12:20:18 -05:00 |
|
Tyler Renelle
|
c14bc8ef76
|
Merge pull request #410 from Shaners/master
75 New Pet Sprites, 1 New Mount
|
2013-02-17 09:12:08 -08:00 |
|
Tyler Renelle
|
a4c508e905
|
Merge pull request #412 from toebu/casper-tests
Fixing the dailies casper tests (almost). Found out that the main problem...
|
2013-02-17 09:11:58 -08:00 |
|
Tobias Leugger
|
48656ed8fa
|
Fixing the dailies casper tests (almost). Found out that the main problem why most tests aren't working: the derby app seems to need some time after a click/action before the model is updated. This means sometime the user object was completely empty. I've introduced a short wait before retrieving the model that fixes this problem.
|
2013-02-17 17:55:30 +01:00 |
|
Shane Lister
|
ca41e1dab6
|
75 New Pets, 1 New Mount
Mainly just colour variations for the previously made pets. 1 New pet
and 1 new Mount.
|
2013-02-17 02:57:08 -08:00 |
|
Tyler Renelle
|
0669511ebe
|
Merge branch 'master' into develop
|
2013-02-17 02:46:36 -05:00 |
|
Tyler Renelle
|
cc6b6775fc
|
fix assets on splash
|
2013-02-17 02:46:34 -05:00 |
|
Tyler Renelle
|
eb56efb0dc
|
for now remove badges section of profile
|
2013-02-17 01:55:17 -05:00 |
|
Tyler Renelle
|
a3ef2e1977
|
temporary method for active profile username - {#if} on private paths
in derby seems iffy
|
2013-02-17 01:51:40 -05:00 |
|
Tyler Renelle
|
6dafefc45a
|
show profile for the individual you clicked
|
2013-02-17 01:31:10 -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
|
99e459e05f
|
with last commit
|
2013-02-17 00:25:42 -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
|
3d76f11644
|
new logo
|
2013-02-16 23:44:49 -05:00 |
|
Tyler Renelle
|
31489f0869
|
logos by Joanna
|
2013-02-16 23:25:41 -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
|
5c111bdd2a
|
don't need dome reset on cron
|
2013-02-16 20:22:46 -05:00 |
|
Tyler Renelle
|
82a18cacb8
|
remove old jquery & jquery ui
|
2013-02-16 20:09:26 -05:00 |
|
Tyler Renelle
|
5728bf4731
|
reload javascript files on dom reset
|
2013-02-16 20:08:43 -05:00 |
|
Tyler Renelle
|
f25a53c3b6
|
more submodules, including only using sortablef or jquery-ui
|
2013-02-16 20:01:59 -05:00 |
|
Tyler Renelle
|
f0602b69fc
|
jquery fix
|
2013-02-16 19:48:41 -05:00 |
|
Tyler Renelle
|
8726056820
|
remove old bootstrap css
|
2013-02-16 19:48:02 -05:00 |
|
Tyler Renelle
|
23c94c0aee
|
remove vestige bootstrap-datepicker, move github-buttons to submodule
|
2013-02-16 19:46:31 -05:00 |
|
Tyler Renelle
|
d03352c323
|
move all public/js to public/vendor, move bootstrap & bootstrap-growl to git submodule
|
2013-02-16 19:42:35 -05:00 |
|
Tyler Renelle
|
8ca41e2b99
|
move bootstrap responsive inclusion into lib/app/index.js - will also
allow us to cut down on components included
|
2013-02-16 19:27:00 -05:00 |
|
Tyler Renelle
|
3392074fdd
|
import date-picker from stylus
|
2013-02-16 19:09:54 -05:00 |
|
Tyler Renelle
|
197065b8e8
|
use lefnire/derby#master so we can import standard css files
|
2013-02-16 19:09:39 -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
|
63ffa9a292
|
package for last commit
|
2013-02-16 18:05:49 -05:00 |
|
Tyler Renelle
|
5d372dbe75
|
add name property to cal, use forked node-icalendar
|
2013-02-16 18:05:04 -05:00 |
|
Tyler Renelle
|
39babb4bb5
|
ensure DTSTART;VALUE=DATE: for ical format
|
2013-02-16 17:41:18 -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
|
9f26cb6c57
|
strange hack on google apps where http:// gets us around this issue:
http://goo.gl/CWGeD (will document soon)
|
2013-02-16 16:14:55 -05:00 |
|
Tyler Renelle
|
92a6b44c82
|
check @session.req?
|
2013-02-16 16:03:28 -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 |
|
Tyler Renelle
|
78d0519b95
|
Merge pull request #406 from drhinehart/master
Fixes #390
|
2013-02-16 09:49:18 -08:00 |
|
Tyler Renelle
|
0935f0cd2c
|
Merge pull request #407 from steamruler/master
'Fixed' a missing image in the 500 page. Replaced it with the male sprite.
|
2013-02-16 09:48:39 -08:00 |
|