 Tyler Renelle
|
3fdd43aeee
|
back to original mongo_store style
|
2013-01-28 22:05:17 -05:00 |
|
|
Tyler Renelle
|
59b80a62f6
|
disable cron for now, back up to 1mo.
|
2013-01-28 22:03:34 -05:00 |
|
|
Tyler Renelle
|
c6ede3b5f8
|
Merge branch 'master' into preen-users
Conflicts:
src/app/index.coffee
src/app/scoring.coffee
|
2013-01-28 21:50:50 -05:00 |
|
|
Tyler Renelle
|
c147d4775a
|
taskObj tweaks
|
2013-01-28 21:44:26 -05:00 |
|
|
Tyler Renelle
|
0512aacbbf
|
another attempt at cron set optimizations
|
2013-01-28 21:28:45 -05:00 |
|
|
Tyler Renelle
|
77ac68ecc0
|
Merge branch 'master' into preen-users
|
2013-01-28 20:14:39 -05:00 |
|
|
Tyler Renelle
|
d7e28ea07f
|
some tweaks to last merge
|
2013-01-28 20:09:57 -05:00 |
|
|
Tyler Renelle
|
c2cd3d8498
|
Merge pull request #227 from SlappyBag/master
Static Header & Popups
|
2013-01-28 17:06:50 -08:00 |
|
|
Stan Lindsey
|
29387b9c03
|
Update styles/app/index.styl
|
2013-01-29 00:22:43 +00:00 |
|
|
Stan Lindsey
|
9ef4236bb7
|
Removed edits
|
2013-01-29 00:22:22 +00:00 |
|
|
Stan Lindsey
|
6e4d14d64f
|
Update styles/bootstrap-responsive.styl
|
2013-01-28 23:39:10 +00:00 |
|
|
Stan Lindsey
|
858c2dded7
|
Update styles/bootstrap-responsive.styl
|
2013-01-28 23:36:25 +00:00 |
|
|
Tyler Renelle
|
278cd04fd1
|
rewards tests
|
2013-01-28 18:22:19 -05:00 |
|
|
Tyler Renelle
|
26462be457
|
more todos/dailies test cleanup
|
2013-01-28 18:10:59 -05:00 |
|
|
Stan Lindsey
|
ad3221a846
|
Update styles/app/index.styl
|
2013-01-28 22:56:14 +00:00 |
|
|
Tyler Renelle
|
d5f36a291c
|
todos tests (stub)
|
2013-01-28 17:43:50 -05:00 |
|
|
Tyler Renelle
|
4a7b5183f8
|
dailies tests
|
2013-01-28 17:42:48 -05:00 |
|
|
Tyler Renelle
|
24979d35df
|
habits tests
|
2013-01-28 17:37:36 -05:00 |
|
|
Tyler Renelle
|
c3810cf7ea
|
registration tests
|
2013-01-28 17:31:10 -05:00 |
|
|
Tyler Renelle
|
0e8d4b4f1f
|
don't delete on invalid cron, but undefined cron. still thinking on this
|
2013-01-28 16:45:14 -05:00 |
|
|
Tyler Renelle
|
c625458ce3
|
two weeks should be long enough, rather than 1mo.
|
2013-01-28 15:58:48 -05:00 |
|
|
Tyler Renelle
|
912c0860fe
|
include cron on server load
|
2013-01-28 15:53:32 -05:00 |
|
|
Tyler Renelle
|
2db92d72a5
|
cleanup cron
|
2013-01-28 15:53:26 -05:00 |
|
|
Tyler Renelle
|
63c6420b87
|
Merge branch 'master' into preen-users
|
2013-01-28 15:21:01 -05:00 |
|
|
Tyler Renelle
|
e747e8f2b9
|
add remove_dummy_acounts migration
|
2013-01-28 15:12:28 -05:00 |
|
|
Tyler Renelle
|
832ae5f249
|
Merge branch 'master' of github.com:lefnire/habitrpg
|
2013-01-28 15:09:42 -05:00 |
|
|
Tyler Renelle
|
1009a87954
|
Merge pull request #226 from toebu/completed-todos-fix
Getting rid of the completedList and completedIds
|
2013-01-28 12:09:12 -08:00 |
|
|
Tyler Renelle
|
9337414224
|
add completed/todo merge migration a la @toebu
|
2013-01-28 15:09:10 -05:00 |
|
|
Tyler Renelle
|
eb5b63fb6f
|
Merge pull request #241 from nt3rp/unusual-escaping-behaviour
HTML entities & and < are not handled correctly
|
2013-01-28 11:56:16 -08:00 |
|
|
Tyler Renelle
|
359e979252
|
Merge pull request #242 from nt3rp/make-day-more-obvious
Changed button colors
|
2013-01-28 11:53:00 -08:00 |
|
|
Tyler Renelle
|
c4f0ec7ce0
|
remove console.log on undefined lastCron (still gotta figure out what
to do with them)
|
2013-01-28 14:44:14 -05:00 |
|
|
Tyler Renelle
|
b4e8d1e69a
|
user.setNull for lastCron right away, to avoid missing lastCrons
|
2013-01-28 14:04:10 -05:00 |
|
|
Tyler Renelle
|
d888d879d8
|
use +new Date on cron
|
2013-01-28 13:52:46 -05:00 |
|
|
Tyler Renelle
|
52fe9b77ff
|
add server cron for preening stale accounts
|
2013-01-28 13:48:43 -05:00 |
|
|
Tyler Renelle
|
c2fddaab49
|
Merge branch 'master' of github.com:lefnire/habitrpg
|
2013-01-28 12:19:54 -05:00 |
|
|
Stan Lindsey
|
4b87888b49
|
Replace relative with margin top
|
2013-01-28 07:22:56 +00:00 |
|
|
Nicholas Terwoord
|
50692c371d
|
Changed button colors
- By default, unpressed buttons are now a gray color
|
2013-01-27 22:21:03 -05:00 |
|
|
Nicholas Terwoord
|
bfe85ad6a8
|
HTML entities & and < are not handled correctly
- Instead of using `view.escapeHTML`, just check if todo is blank via RegEx
|
2013-01-27 21:36:34 -05:00 |
|
|
Tobias Leugger
|
61b848bf4f
|
Updating the task list cleanup to not restore the completedIds list.
Fixing the mocha test to not check for the completedIds.
|
2013-01-27 18:55:46 +01:00 |
|
|
Tyler Renelle
|
3f07fe9c8a
|
comment out balance
|
2013-01-27 10:05:15 -05:00 |
|
|
Tyler Renelle
|
4fea719100
|
Merge pull request #229 from teekirol/master
Text now breaks on word
|
2013-01-26 15:58:56 -08:00 |
|
|
Lori Lee
|
a21792ba25
|
Text wrapping issue in Titles and Descriptions
|
2013-01-26 18:53:56 -05:00 |
|
|
Tyler Renelle
|
fea1e0efdc
|
itemsEnabled bug
|
2013-01-26 15:06:31 -05:00 |
|
|
Tyler Renelle
|
05b5caa99f
|
itemsEnabled bug
|
2013-01-26 14:58:29 -05:00 |
|
|
Tyler Renelle
|
2c7ac2afa5
|
moving tests around
|
2013-01-26 14:57:47 -05:00 |
|
|
Stan Lindsey
|
da3c0f1a2d
|
All popups on left
|
2013-01-26 13:15:57 +00:00 |
|
|
Stan Lindsey
|
0a4fbe80cd
|
Connection follows browswer
|
2013-01-26 12:23:24 +00:00 |
|
|
Stan Lindsey
|
24bde808eb
|
Static Header
.head = position fixed
.wrap = relative, top 130px, z-index -1
|
2013-01-26 12:22:15 +00:00 |
|
|
Tobias Leugger
|
b697e7bdf1
|
Getting rid of the completedList and completedIds, instead only
using the 'completed' attribute of the todo task. This fixes some
issues were a task was at the same time in the todoIds and
completedIds.
|
2013-01-26 11:33:51 +01:00 |
|
|
Tyler Renelle
|
cf81339f7a
|
user.on for itemstore popup, as per switz's suggestion
|
2013-01-25 16:16:28 -05:00 |
|