f6f397dcb0
Use user's current day for completed/uncompleted.
...
References #587 .
2013-04-12 23:20:30 +02:00
299eaa8a14
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-04-12 16:38:41 -04:00
88d2eee519
start adding tests for user.put
2013-04-12 16:38:07 -04:00
cb34cb22b7
begin refactoring PUT /user & POST /user/tasks
2013-04-12 12:49:15 -04:00
5fe344edc6
mass update-user function (PUT /user) which piggy-backs on PUT /tasks to mass-update tasks, including task.del (see mobile 961b86a)
2013-04-12 12:49:07 -04:00
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
51f60a1e71
some exclusions from index.css
2013-04-10 16:18:40 -04:00
8391c01992
add equipped to helpers
2013-04-10 15:40:35 -04:00
ad3d4fad05
modify css to work with mobile img directory
2013-04-10 15:06:44 -04:00
4a112bb180
add in temp compiled stylus css, full index.css from the website (we
...
need to come up with something better)
2013-04-10 15:00:40 -04:00
58f6689a33
hack fix for window.exports
2013-04-10 15:00:18 -04:00
3bc77dad6e
update images
2013-04-10 14:59:58 -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
6ae8504be0
Adds Dutch Translations.
...
These are a ridumentary first pass, as according to
https://github.com/lefnire/habitrpg/wiki/Translations the localization
implementation is still in a state of flux. Hopefully these can serve
a temporary use in the meanwhile.
2013-04-09 02:04:41 +02: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
Kevin Kaland