Commit Graph

2982 Commits

Author SHA1 Message Date
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
Tyler Renelle 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
Tyler Renelle 2ec5a930a6 add beta redirect to main site until we get a new beta up 2013-07-15 21:52:00 -04:00
Tyler Renelle 8e922bb151 API: add facebook auth route 2013-07-12 17:15:11 -04:00
Tyler Renelle 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
yangit 50918ffea8 added cron update on each transaction. 2013-07-12 00:36:06 +08:00
Tyler Renelle 7af9553aef remove tour (and sortable, stickyheader, tooltips) from mobile devices #995 2013-07-06 17:18:18 -04:00
yangit a9dd42cda5 fix sort API 2013-07-06 20:03:05 +08:00
yangit 49d0214056 added sort API, removed debug code. 2013-07-06 16:03:51 +08:00
Andre Casey c4140f476f Moar fixes to my own code, for consistency 2013-07-02 02:25:00 -07:00
Andre Casey 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
Andre Casey ae0ee8e03d Fixed my own inconsistency with spacing of eggs and potions. oops. 2013-07-02 02:21:14 -07:00
Andre Casey c6da393e71 Revert "Fix for Tavern Chat and extremely long posts"
This reverts commit 03a73bab72.
2013-07-02 02:06:24 -07:00
Andre Casey 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
Andre Casey 201fb6617b moved item labels slightly closer to artwork, for better readability.
(thought some people might not agree that it is more readable, thus I am staging it in a separate commit)
2013-07-02 01:44:53 -07:00
Andre Casey 7db812b116 Inventory Layout Fixes
- fixed CSS alignment issues with long names breaking flow
- gave eggs and potions more wiggle room
- centered text beneath newly centered artworks
2013-07-02 01:44:07 -07:00
Andre Casey 6d27b898a2 Adjust CSS to show full egg and potion artwork, and center the artwork above the label 2013-07-02 01:37:35 -07:00
Tyler Renelle 3461d794a1 chat: bad fix for the duplicates messages, but safer than before 2013-06-21 12:33:14 -04:00
Tyler Renelle 1c5d61a617 fix to maxGear achievement 2013-06-18 15:14:01 -04:00
Tyler Renelle 7370331b8c fix max gear achievement for backer gear 2013-06-18 15:11:52 -04:00
Tyler Renelle 0529f26323 shorter day-period preen_cron 2013-06-18 14:52:39 -04:00
yangit da8a67e0fa transform user structure FROM user.tasks{} + user.habitIds[] TO user.habits[] + user.todos[] etc. 2013-06-17 19:41:52 +08:00
yangit a549d1d550 Add, edit, delete task\habit\reward. 2013-06-17 18:24:24 +08:00
Tyler Renelle 302721456d fix up some db indexes 2013-06-15 19:14:49 -04:00
Tyler Renelle d4d7c32fa8 simpler empty parties preen 2013-06-15 18:20:52 -04:00
Tyler Renelle 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
Tyler Renelle d25c9d24c0 groups-preennig typo 2013-06-15 17:31:31 -04:00
Tyler Renelle 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
Tyler Renelle 989d5839c4 more accurate "active users": 7417 2013-06-15 13:52:10 -04:00
Tyler Renelle 00e2841b78 history preen cleanup 2013-06-15 13:48:25 -04:00