Commit graph

2604 commits

Author SHA1 Message Date
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
Tyler Renelle
4f948d401b Move exp progress button to right of numbers, css rollover was
covering it before
2013-06-15 13:28:24 -04:00
Tyler Renelle
cc0206e54e preen-cron: some history-preening cleanup & coments 2013-06-15 13:13:48 -04:00
Tyler Renelle
5d05c815bd Merge branch 'preen-history' into develop
Conflicts:
	migrations/preen_cron.js
2013-06-15 12:44:42 -04:00
Tyler Renelle
c797ea5999 charts: fix exp & todos charts 2013-06-15 12:41:12 -04:00
Tyler Renelle
d5d8a9ef69 charts: fix exp & todos charts 2013-06-15 12:35:55 -04:00
Tyler Renelle
22d4bb27ac preen-cron: fix up history cron, should be fully functional now 2013-06-15 12:01:03 -04:00
Tyler Renelle
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
Tyler Renelle
42be939b12 preen-script: start implementing history-preening 2013-06-14 19:05:26 -04:00
Tyler Renelle
9361b015f6 preen-script: also remove empty parties 2013-06-14 17:01:50 -04:00
Tyler Renelle
67b2174c3d finish metrics script. current total: unregistered: 180931 registered:
52101 active: 4182 (@Slappybag)
2013-06-14 16:56:42 -04:00
Tyler Renelle
6d05651b66 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-06-14 16:17:50 -04:00
Tyler Renelle
8c27f96d08 start with metrics mongo script - still need to add "active users" 2013-06-14 16:17:41 -04:00
Tyler Renelle
20196a9383 preen-cron: remove the date, it's not a migration but a cron script 2013-06-14 16:17:25 -04:00
Tyler Renelle
38b4e3322e preen-script: some cleanup and better checking of lastCron 2013-06-14 16:09:26 -04:00
Tyler Renelle
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
Tyler Renelle
cfe1b6eccb Merge pull request #1173 from MoofinSeeker/master
Terms.html Proofread
2013-06-14 12:41:39 -07:00
Tyler Renelle
360a8f7d9e apiv2: same as before - user.get('tasks'), not model.get('tasks') 2013-06-14 13:03:37 -04:00
Tyler Renelle
69ca37d3b0 user.set('tasks...'), not model.set('tasks...') @yangit 2013-06-14 13:01:33 -04:00
yangit
236a81d392 add some api 2013-06-14 23:44:13 +08:00
Tyler Renelle
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
yangit
afb13c3113 APIv2 init 2013-06-13 23:25:10 +08:00
MoofinSeeker
8855766829 Update terms.html
Added spaces before line breaks in text body.
2013-06-13 00:53:14 +02:00
Tyler Renelle
dfff22c52b Merge pull request #1172 from MoofinSeeker/master
Privacy.html Proofread
2013-06-12 15:43:00 -07:00
MoofinSeeker
3a8f6086ad Update privacy.html
Added spacing before line breaks in body of text.
2013-06-13 00:34:59 +02:00
Tyler Renelle
dfc0556965 survey rewards: add individual migration for missing users 2013-06-12 14:22:43 -04:00
Tyler Renelle
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
Andre Casey
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
46ff7287c2 Merge branch 'develop' 2013-06-11 17:41:47 -04:00