e8f4a94abb
make sure user owns the taskb efore scoring
2013-08-08 13:59:08 -04:00
af8b764a68
apiv2 make sure to handle empty object
2013-08-06 18:23:32 -04:00
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
3ec7ba1a5a
Merge branch 'apiv2' into develop
2013-08-04 16:33:29 -04:00
63ab1b1975
apiv2 more of previous (task xform)
2013-08-04 16:24:30 -04:00
746153f417
apiv2: fix transform form user.tasks => user.habits/dailies/etc,
...
maintain sort order
2013-08-04 16:16:58 -04:00
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
a8e0015cbb
apiv2: unshift to tasks, rather than push
2013-08-04 15:53:20 -04:00
38d57cbc87
possible better handling of empty POST, yan's weird User.log({}) thing.
2013-08-04 11:53:37 -04:00
1a08c7b084
change derby-ui-boot url to point to our fork, for #741
2013-08-04 09:57:31 -04:00
8760d07215
apiv2 fix to pending op (@litenull)
2013-08-03 14:06:57 -04:00
1096ae041a
Merge pull request #1299 from lefnire/sabe_fixes
...
Update to 500 error message
2013-08-01 11:47:17 -07:00
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
1279b6ecb2
Merge pull request #1297 from SabreCat/master
...
Answer cron FAQ in settings text
2013-08-01 06:36:41 -07:00
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
e9163f17da
Merge pull request #1296 from SabreCat/develop
...
Typo fixes
2013-07-31 15:36:45 -07:00
a471b629c3
Update app.json
...
Add'l English syntax fixes to Tavern description
2013-07-31 12:09:16 -05:00
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
9e2ef95d84
apiv2: bugfix in handling doneCount (we really should move to Q instead)
2013-07-26 16:35:28 -04:00
0ae0c57858
apiv2: reapplying cleanup fix of b88c2ad
2013-07-26 15:37:15 -04:00
41ff34d1d6
Merge branch 'develop' into apiv2
2013-07-26 14:35:08 -04:00
a6f5821852
Merge branch 'apiv2' of https://github.com/lefnire/habitrpg into apiv2
2013-07-26 13:23:03 +02:00
42e32dfb21
reverting the api since its not ok
2013-07-26 13:22:57 +02:00
e180eb2b39
fix to delete paths['stats.hp'], hopefully fix #1279
2013-07-24 15:29:24 -04:00
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
60c726ee76
Fix #1273 for scrollbars showing on every message in tavern/party/guild chats.
2013-07-24 07:39:04 -07:00
078f13ea72
Merge branch 'apiv2' of github.com:lefnire/habitrpg into apiv2
2013-07-23 14:29:07 -04:00
01120a2b23
no message
2013-07-23 14:33:58 +02:00
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
c9807fd0c6
Extended short option box and removed labels on inventory items
2013-07-22 20:00:01 -04:00
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
0c4efa3f8c
fixes
2013-07-20 03:23:41 +02:00
592b890137
add in missing require('misc')
2013-07-19 17:27:29 -04:00
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
4655b2fbc2
apiv2: remove some duplcation from api to apiv2
2013-07-19 15:19:50 -04:00
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
c4140f476f
Moar fixes to my own code, for consistency
2013-07-02 02:25:00 -07:00
0e40b996b7
Merge branch 'develop' of https://github.com/onduhray/habitrpg into develop
...
* 'develop' of https://github.com/onduhray/habitrpg :
Revert "Fix for Tavern Chat and extremely long posts"
2013-07-02 02:21:40 -07:00
ae0ee8e03d
Fixed my own inconsistency with spacing of eggs and potions. oops.
2013-07-02 02:21:14 -07:00
c6da393e71
Revert "Fix for Tavern Chat and extremely long posts"
...
This reverts commit 03a73bab72
2013-07-02 02:06:24 -07:00
03a73bab72
Fix for Tavern Chat and extremely long posts
...
TL;DR
- made tavern chat posts word-wrap, with a max-height to prevent long posts from disrupting scrolling of site
Explanation:
Don't know if anyone noticed that random post by an unnamed person (blank name) with the text of "HELLOOOOO…[repeat a bazillion times].
Well this "broke" chat, meaning there was all of a sudden this side scroll action (which is particularly annoying with multitouch mouse pads). This adjustment prevents such a thing from happening again. Think of "code view" in forums, where text is in it's own little scrolly window.
2013-07-02 01:56:44 -07:00
Tyler Renelle