Commit graph

2761 commits

Author SHA1 Message Date
Sabe Jones
fe6f478a60 Remove unneeded class reference
Finish removing image rotation
2013-08-11 11:04:51 -05:00
Tyler Renelle
7a83be70b1 woops, res.json the error 2013-08-11 10:20:27 -04:00
Tyler Renelle
23f3154764 api res.json error in batch 2013-08-11 10:06:10 -04:00
Tyler Renelle
eb28ae3dd2 api: bug fix on delete task 2013-08-11 00:58:23 -04:00
Tyler Renelle
5b71e93fb5 api: allow PUT /user to update tasks for now, will change lager 2013-08-11 00:56:47 -04:00
Tyler Renelle
96b4f57adc good-old racer unshift/push bug. gotta manually set the id list, works
like a charm :/
2013-08-11 00:50:00 -04:00
Tyler Renelle
d17bd6fe90 api: export all of api to functions, called by route. This way we can have our /batch-update route access the api functions 2013-08-11 00:47:40 -04:00
Tyler Renelle
3263708c9d apiv2: BIG update - remove apiv2, it's going to be part of apiv1. Overhaul of PUT /user to be ready for this new API update 2013-08-10 21:41:13 -04:00
Tyler Renelle
4857e44f79 apiv2 fix on adding cron to queue 2013-08-10 17:37:49 -04:00
Sabe Jones
420a8617d7 Server is respawning
Humorous wording tweak
2013-08-10 16:11:27 -05:00
Tyler Renelle
e7d200f1b0 update apiv2 to use async.series instead of the previous count
method. much better flow control
2013-08-10 16:19:59 -04:00
Sabe Jones
c7381485a3 Fix broken image on 500 error page
Replaced nonexistent male armor sprite with Grim Reaper; removed rotation
2013-08-10 15:18:56 -05:00
Tyler Renelle
e667b3a2b0 start adding v2 api tests (nothing here yet) 2013-08-08 14:04:07 -04:00
Tyler Renelle
e8f4a94abb make sure user owns the taskb efore scoring 2013-08-08 13:59:08 -04:00
Tyler Renelle
af8b764a68 apiv2 make sure to handle empty object 2013-08-06 18:23:32 -04:00
Tyler Renelle
b158e8896c apiv2: move 'revive' to habitrpg-shared so that it's available on
mobile & api. Then call it from app & api
2013-08-04 23:43:54 -04:00
Tyler Renelle
3ec7ba1a5a Merge branch 'apiv2' into develop 2013-08-04 16:33:29 -04:00
Tyler Renelle
63ab1b1975 apiv2 more of previous (task xform) 2013-08-04 16:24:30 -04:00
Tyler Renelle
746153f417 apiv2: fix transform form user.tasks => user.habits/dailies/etc,
maintain sort order
2013-08-04 16:16:58 -04:00
Tyler Renelle
b50a78f0ea add lib to gitignore for now, so we can compile. may want to remove
this ignore in the future
2013-08-04 16:08:40 -04:00
Tyler Renelle
a8e0015cbb apiv2: unshift to tasks, rather than push 2013-08-04 15:53:20 -04:00
Tyler Renelle
38d57cbc87 possible better handling of empty POST, yan's weird User.log({}) thing. 2013-08-04 11:53:37 -04:00
Tyler Renelle
1a08c7b084 change derby-ui-boot url to point to our fork, for #741 2013-08-04 09:57:31 -04:00
Tyler Renelle
8760d07215 apiv2 fix to pending op (@litenull) 2013-08-03 14:06:57 -04:00
Tyler Renelle
1096ae041a Merge pull request #1299 from lefnire/sabe_fixes
Update to 500 error message
2013-08-01 11:47:17 -07:00
Sabe Jones
1aa5ff2db2 Fix typos and update current-events notice on 500 error
Brings "Server restarting" message up to date re: Angular rewrite.
2013-08-01 13:41:39 -05:00
Tyler Renelle
1279b6ecb2 Merge pull request #1297 from SabreCat/master
Answer cron FAQ in settings text
2013-08-01 06:36:41 -07:00
Sabe Jones
f3982670fd Answer cron FAQ in settings text
Update custom day start label to mention it works off user's time zone
2013-08-01 08:17:50 -05:00
Tyler Renelle
e9163f17da Merge pull request #1296 from SabreCat/develop
Typo fixes
2013-07-31 15:36:45 -07:00
SabreCat
a471b629c3 Update app.json
Add'l English syntax fixes to Tavern description
2013-07-31 12:09:16 -05:00
SabreCat
c23a6cc8f0 Typo fixes
Corrected three typos in English app.json
"integrals" instead of "integral" in tour description of rewards
"effected" instead of "affected" in Tavern description
"Habit an open" instead of "Habit is an open" in Remove Ads
2013-07-31 11:52:17 -05:00
Tyler Renelle
9e2ef95d84 apiv2: bugfix in handling doneCount (we really should move to Q instead) 2013-07-26 16:35:28 -04:00
Tyler Renelle
0ae0c57858 apiv2: reapplying cleanup fix of b88c2ad 2013-07-26 15:37:15 -04:00
Tyler Renelle
41ff34d1d6 Merge branch 'develop' into apiv2 2013-07-26 14:35:08 -04:00
Tomaž
a6f5821852 Merge branch 'apiv2' of https://github.com/lefnire/habitrpg into apiv2 2013-07-26 13:23:03 +02:00
Tomaž
42e32dfb21 reverting the api since its not ok 2013-07-26 13:22:57 +02:00
Tyler Renelle
e180eb2b39 fix to delete paths['stats.hp'], hopefully fix #1279 2013-07-24 15:29:24 -04:00
Tyler Renelle
6ca4f4fcf0 Merge pull request #1280 from onduhray/TavernFix
Fix #1273 for scrollbars showing on every message in chats
2013-07-24 11:50:03 -07:00
Andre Casey
60c726ee76 Fix #1273 for scrollbars showing on every message in tavern/party/guild chats. 2013-07-24 07:39:04 -07:00
Tyler Renelle
078f13ea72 Merge branch 'apiv2' of github.com:lefnire/habitrpg into apiv2 2013-07-23 14:29:07 -04:00
Tomaž
01120a2b23 no message 2013-07-23 14:33:58 +02:00
Tyler Renelle
b79b38e502 Merge pull request #1274 from nafoster/develop
Extended short option box and removed labels on inventory items
2013-07-22 17:07:16 -07:00
Nicole Foster
c9807fd0c6 Extended short option box and removed labels on inventory items 2013-07-22 20:00:01 -04:00
Tyler Renelle
63866ddfc8 Merge pull request #1224 from onduhray/develop
Moar Inventory Layout Fixes in CSS & Tavern Chat Abuse Fix
2013-07-22 14:58:04 -07:00
Tomaž
0c4efa3f8c fixes 2013-07-20 03:23:41 +02:00
Tyler Renelle
592b890137 add in missing require('misc') 2013-07-19 17:27:29 -04:00
Tyler Renelle
b88c2ad1a3 apiv2 - much cleaned up, by re-using fucntions in api.coffee. misc.batchTxn takes an optional user param, in case we don't want to use private paths "_user" (which we don't want to do on the server!) 2013-07-19 17:22:22 -04:00
Tyler Renelle
4655b2fbc2 apiv2: remove some duplcation from api to apiv2 2013-07-19 15:19:50 -04:00
Tyler Renelle
91e686fd87 Merge branch 'develop' into apiv2
Conflicts:
	src/server/apiv2.coffee
2013-07-19 14:59:09 -04:00
Tyler Renelle
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