91e686fd87
Merge branch 'develop' into apiv2
...
Conflicts:
src/server/apiv2.coffee
2013-07-19 14:59:09 -04:00
5017be0984
API: remove all private paths from server ops, they're unecessary and might be causing issues
2013-07-16 18:30:43 -04:00
861c7a1aa1
Revert "add beta redirect to main site until we get a new beta up"
...
This reverts commit 2ec5a930a6
2013-07-15 23:07:58 -04:00
2ec5a930a6
add beta redirect to main site until we get a new beta up
2013-07-15 21:52:00 -04:00
8e922bb151
API: add facebook auth route
2013-07-12 17:15:11 -04:00
704a056c47
Merge remote-tracking branch 'switz/api-authentication' into develop
...
Conflicts:
src/server/api.coffee
test/api.mocha.coffee
2013-07-12 16:36:12 -04:00
50918ffea8
added cron update on each transaction.
2013-07-12 00:36:06 +08:00
7af9553aef
remove tour (and sortable, stickyheader, tooltips) from mobile devices #995
2013-07-06 17:18:18 -04:00
a9dd42cda5
fix sort API
2013-07-06 20:03:05 +08:00
49d0214056
added sort API, removed debug code.
2013-07-06 16:03:51 +08:00
3461d794a1
chat: bad fix for the duplicates messages, but safer than before
2013-06-21 12:33:14 -04:00
1c5d61a617
fix to maxGear achievement
2013-06-18 15:14:01 -04:00
7370331b8c
fix max gear achievement for backer gear
2013-06-18 15:11:52 -04:00
0529f26323
shorter day-period preen_cron
2013-06-18 14:52:39 -04:00
da8a67e0fa
transform user structure FROM user.tasks{} + user.habitIds[] TO user.habits[] + user.todos[] etc.
2013-06-17 19:41:52 +08:00
a549d1d550
Add, edit, delete task\habit\reward.
2013-06-17 18:24:24 +08:00
302721456d
fix up some db indexes
2013-06-15 19:14:49 -04:00
d4d7c32fa8
simpler empty parties preen
2013-06-15 18:20:52 -04:00
b7d5c0808b
delete the "migrate" script for now. can dig up this commit later,
...
the mongoskin async integration wasn't working for our purposes
2013-06-15 18:17:08 -04:00
d25c9d24c0
groups-preennig typo
2013-06-15 17:31:31 -04:00
013cc7e5b7
migrations: try adding a coffeescript method, which uses mongoskin to run the migrations. Looks like it's not quite there, collection.toArray() pulls all objects into memory which is too big to run the migrations - might have to stick to mongo scripts
2013-06-15 17:31:23 -04:00
989d5839c4
more accurate "active users": 7417
2013-06-15 13:52:10 -04:00
00e2841b78
history preen cleanup
2013-06-15 13:48:25 -04:00
4f948d401b
Move exp progress button to right of numbers, css rollover was
...
covering it before
2013-06-15 13:28:24 -04:00
cc0206e54e
preen-cron: some history-preening cleanup & coments
2013-06-15 13:13:48 -04:00
5d05c815bd
Merge branch 'preen-history' into develop
...
Conflicts:
migrations/preen_cron.js
2013-06-15 12:44:42 -04:00
c797ea5999
charts: fix exp & todos charts
2013-06-15 12:41:12 -04:00
d5d8a9ef69
charts: fix exp & todos charts
2013-06-15 12:35:55 -04:00
22d4bb27ac
preen-cron: fix up history cron, should be fully functional now
2013-06-15 12:01:03 -04:00
6b307cd52c
preen-script - we can't use load() because we don't know mongo shell
...
pwd() at server run-time
2013-06-14 19:19:08 -04:00
42be939b12
preen-script: start implementing history-preening
2013-06-14 19:05:26 -04:00
9361b015f6
preen-script: also remove empty parties
2013-06-14 17:01:50 -04:00
67b2174c3d
finish metrics script. current total: unregistered: 180931 registered:
...
52101 active: 4182 (@Slappybag)
2013-06-14 16:56:42 -04:00
6d05651b66
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-06-14 16:17:50 -04:00
8c27f96d08
start with metrics mongo script - still need to add "active users"
2013-06-14 16:17:41 -04:00
20196a9383
preen-cron: remove the date, it's not a migration but a cron script
2013-06-14 16:17:25 -04:00
38b4e3322e
preen-script: some cleanup and better checking of lastCron
2013-06-14 16:09:26 -04:00
6ab64e2df1
add migration script for moving facebook auth'd users to local
...
auth (seems people hate facebook)
2013-06-14 15:56:27 -04:00
cfe1b6eccb
Merge pull request #1173 from MoofinSeeker/master
...
Terms.html Proofread
2013-06-14 12:41:39 -07:00
360a8f7d9e
apiv2: same as before - user.get('tasks'), not model.get('tasks')
2013-06-14 13:03:37 -04:00
69ca37d3b0
user.set('tasks...'), not model.set('tasks...') @yangit
2013-06-14 13:01:33 -04:00
236a81d392
add some api
2013-06-14 23:44:13 +08:00
268e377dc2
apiv2: model.ref('_user') before passing back to derby functions, much
...
of our derby code requires _user
2013-06-13 12:00:33 -04:00
afb13c3113
APIv2 init
2013-06-13 23:25:10 +08:00
8855766829
Update terms.html
...
Added spaces before line breaks in text body.
2013-06-13 00:53:14 +02:00
dfff22c52b
Merge pull request #1172 from MoofinSeeker/master
...
Privacy.html Proofread
2013-06-12 15:43:00 -07:00
3a8f6086ad
Update privacy.html
...
Added spacing before line breaks in body of text.
2013-06-13 00:34:59 +02:00
dfc0556965
survey rewards: add individual migration for missing users
2013-06-12 14:22:43 -04:00
1a3300869e
Merge pull request #1168 from onduhray/develop
...
Tweaks to #1028 : Long egg and potions names now contained
2013-06-12 08:09:57 -07:00
5117a376e9
More fixes to inventory spacing. This time for long names of eggs and potions.
...
Was able to contain the text similar to how it is done in the market. Currently, long words (i.e. skeleton) do not center due to the size of images and divs, which still needs to be fixed. More attention will be necessary, but thus should help with Panda Cub Eggs and the like.
2013-06-12 02:03:40 -07:00
Tyler Renelle