4c08fa4e15
Merge pull request #808 from switz/rest
...
@lefnire => Initial 'Rest' support
2013-04-11 15:48:37 -07:00
9917173429
Rest
2013-04-11 18:22:06 -04:00
fa4da2a9e8
depend on lefnire/derby#habitrpg, which makes sure to use
...
lefnire/racer#habitrpg in turn
2013-04-11 13:03:30 -04:00
3b3d4d243a
better wasCorrupted test
2013-04-11 11:49:55 -04:00
81eb2afd9d
some more comments on corrupt tasks
2013-04-11 11:39:54 -04:00
9a8f0d799f
Merge branch 'develop'
2013-04-11 11:34:04 -04:00
8ed72ae2aa
back to transction for corruptTasks
2013-04-11 11:33:50 -04:00
0680822c19
remoeve character.coffee self-reference
2013-04-11 11:30:40 -04:00
62fe2de5c5
Merge branch 'develop'
2013-04-10 19:31:21 -04:00
83649c6734
fix clear-completed
2013-04-10 19:24:33 -04:00
570f376421
more fixes to task corruption
2013-04-10 19:24:27 -04:00
b736713624
alright, i give up. put the full restore/cleanup function back in.
...
refLists...
2013-04-10 18:32:38 -04:00
761aeef8cf
move task corruption cleanup back to server to solve #803 . This might
...
pose a problem for #769 , but it seems that websockets / nginx version
was the real culprit there.
2013-04-10 17:30:50 -04:00
4af8a91793
move external script-loading back down to app.on('render')
2013-04-10 11:49:00 -04:00
f9db24354f
Merge branch 'develop'
2013-04-09 23:02:19 -04:00
e9a164d2ad
enable websockets!
2013-04-09 22:15:04 -04:00
d2f6597e9f
remove jquery-ui as git submodule, add it into public/vendor manually due to large direcotry size with build files
2013-04-09 13:45:09 -04:00
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
9103e6957a
Merge branch 'develop'
2013-04-08 11:25:01 -04:00
f6e53a377f
some bug-fixes & cleanup on removal of _view.*
2013-04-08 11:24:45 -04:00
046b075faf
Merge branch 'develop'
2013-04-07 20:43:29 -04:00
ba750141cf
fix to previous commit
2013-04-07 20:43:16 -04:00
cd477364e2
Merge branch 'develop'
2013-04-07 20:39:47 -04:00
9222b56777
move task-corruption cleanup to cron, restore missing tasks to list -
...
let's see if this fixes #777
2013-04-07 20:38:28 -04:00
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
0191510370
Merge branch 'develop'
2013-04-07 20:23:30 -04:00
c55118a5bc
don't deduct GP unless purchase successful (see #233 )
2013-04-07 20:23:19 -04:00
3918eb6731
Merge branch 'develop'
2013-04-06 13:17:07 -04:00
fd86757aa9
Merge pull request #784 from Shaners/develop
...
Fix to some pixel grid alignment issues
2013-04-06 10:16:22 -07:00
35da5c2a1e
Fix to some pixel grid alignment issues
2013-04-06 10:06:37 -07:00
69d8d478da
Merge branch 'develop'
2013-04-06 12:56:28 -04:00
1beb50c1fc
Merge pull request #779 from Shaners/develop
...
Rename the Sprinkle Button to Pour
2013-04-06 08:28:29 -07:00
4742e4236e
Update pets.html
...
Changing the sprinkle button to say pour.
2013-04-05 22:55:34 -07:00
70e75b6515
Merge pull request #11 from lefnire/develop
...
Update my develop branch
2013-04-05 22:04:17 -07:00
db4ebe3813
add bs-docs-masthead
2013-04-05 14:16:26 -04:00
4260361a65
Merge branch 'develop'
2013-04-05 13:50:39 -04:00
9808b9a9f7
Merge pull request #770 from arscan/valuefix
...
Fixes bug when user attempts to create task with no value field through the API
2013-04-04 17:31:43 -07:00
4958690bcb
update a test to check for undefined value when making new habit
2013-04-04 18:09:06 -04:00
234d3725be
nix the "remove if empty auth & no more session" cron task
2013-04-04 18:01:53 -04:00
85432cabdc
cap minimum %chance of drop to 1% so users still rewarded for
...
championed habits. Will remove once we have streaks / combos. Also
factor in task difficulty
2013-04-04 18:01:46 -04:00
02a1a0d3b4
cap minimum %chance of drop to 1% so users still rewarded for
...
championed habits. Will remove once we have streaks / combos. Also
factor in task difficulty
2013-04-04 18:01:06 -04:00
aba7a67457
Merge branch 'master' into develop
2013-04-04 17:44:28 -04:00
dd736923ca
Merge pull request #757 from ThibG/master
...
Fix rewards moving / item unlocking
2013-04-04 14:43:34 -07:00
a07dbaf9fd
nix the "remove if empty auth & no more session" cron task
2013-04-04 17:38:31 -04:00
3139e51535
fix problem when updating task
2013-04-04 17:11:27 -04:00
584759bd25
shift some require() statements around, attempt to get things out of
...
app.coffee top-level scope - working towards mem leak fix
2013-04-04 16:44:54 -04:00
1c2cc06a6e
BREAKING CHANGE! this removes list cleanup / re-establishment. In the past, id-lists in refLists were being completely emptied (see #85 & #86 ). I'm still not sure why (see https://github.com/codeparty/racer/issues/101 or https://github.com/codeparty/derby/issues/237 possibly?). This commit reverts working around that issue, but potentially fixes #769 . Going to test this on heroku a bit before merging in
2013-04-04 16:24:13 -04:00
0abbc98b1c
move all view helpers out of their respective files and into
...
helpers.coffee. we need viewHelpers at top-level scope, but nothing
else per se - this is preparation for memory leak fixing
2013-04-04 16:17:30 -04:00
4113eefaf1
Fixes bug when user attempts to create task with no value field
2013-04-03 22:51:41 -04:00
ee281cf352
Merge branch 'develop'
...
Conflicts:
src/server/static.coffee
2013-04-03 17:18:27 -04:00
Tyler Renelle