Commit graph

2462 commits

Author SHA1 Message Date
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
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
Tyler Renelle
f080745f9a Merge pull request #1089 from zeroos/develop
Visual fixes
2013-06-11 14:41:02 -07:00
Tyler Renelle
ab57243315 Merge branch 'master' of github.com:lefnire/habitrpg 2013-06-11 17:18:10 -04:00
Tyler Renelle
1d2f62be2b Merge pull request #1150 from onduhray/develop
Fixes #1028: weird inventory item spacing for eggs and potions.
2013-06-11 14:16:32 -07:00
Tyler Renelle
c5acd0a83d Merge pull request #1161 from tullrich/master
Fixes #1041: HP in health bar different than in Stats
2013-06-11 14:12:09 -07:00
Tim Ullrich
3af13e69af fix rounding discrepancy between header hp meter and profile hp 2013-06-10 23:37:09 -05:00
Tyler Renelle
d8fe775f8e task-deletion: confirm deletion no matterion what, don't dock HP if
it's a red task they're deleting (http://community.habitrpg.com/node/350)
2013-06-08 12:43:10 -04:00
Andre Casey
7c680af368 Fixes #1028: weird inventory item spacing for eggs and potions.
My test instance would only generate 1 dropped potion (after so much clicking!), so perfect alignment of dropped potions is not guaranteed with this commit.
2013-06-07 08:04:25 -07:00
Stan Lindsey
8aee73c79a Slight rewording 2013-06-07 13:13:11 +02:00
Slappybag
903587b776 Reworded 500.html to better represent the most likely cause of display - (server restart) 2013-06-07 11:50:24 +01:00
Michał Barciś
0b9a6bfaeb Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-06-05 23:38:35 +02:00
Stan Lindsey
205bf24e02 fixes 1116 2013-06-05 23:31:56 +02:00
Tyler Renelle
6cc412313c pets: only remove hatching potion & egg on successful user.push('pets') 2013-06-05 16:28:43 -04:00
Tyler Renelle
a4de2e5ec5 don't show drop notification unless it went through to the database.
oohhh this is glorious!! @Shaners @Slappybag @lemoness , you're gonna
love this one.
2013-06-05 16:20:03 -04:00
Tyler Renelle
ef39dd8a0f groups: can assign new leader 2013-06-05 14:45:05 -04:00
Tyler Renelle
6480be63eb groups: highlight leader in member list 2013-06-05 14:44:59 -04:00
Tyler Renelle
d944dc1687 groups: can't ban self. rename to "boot" (since i ahven't implemented full-ban) 2013-06-05 14:18:09 -04:00
Tyler Renelle
a7c8c843cd groups: balance deduction cleanup 2013-06-05 14:14:00 -04:00
Tyler Renelle
fcf02d33d9 groups: add "ban" feature for group leaders. unfortunately not
updating dom, so require a refresh for now
2013-06-05 11:55:09 -04:00
Tyler Renelle
385704aad7 add optional confirm dialog to removeAt() 2013-06-05 11:50:30 -04:00
Tyler Renelle
6f1ac0c79e groups: confirm dialog for leaving group, only delete group on
0-members if party (since they paid for guild)
2013-06-05 08:25:11 -04:00
Tyler Renelle
ac83126772 grammar 2013-06-04 13:10:55 -04:00
Tyler Renelle
0e7ca304a4 Merge branch 'develop' of github.com:lefnire/habitrpg 2013-06-04 12:18:15 -04:00
Tyler Renelle
fe5e0f1464 Merge pull request #1061 from MagicMicky/develop
Adding a QRCode with the user's information
2013-06-04 09:18:03 -07:00
Tyler Renelle
a5a57a244b fix survey migration 2013-06-04 10:32:33 -04:00
Tyler Renelle
7fe86ac924 fixes #1130 2013-06-03 22:38:03 -04:00
Tyler Renelle
59f4c88940 groups: guild bank is in gems, not balance 2013-06-03 21:28:03 -04:00
Tyler Renelle
985b7676d8 groups: subscriptions setup as callback after public members
information fetched. otherwise we hit client/server snapshots
different, and we get the field permissions error
2013-06-03 20:52:56 -04:00
Tyler Renelle
9ec6455f2a groups: some ridiculous workarounds on the model.push/unshift bug 2013-06-03 20:46:56 -04:00
Tyler Renelle
d13db1623f fix survey gem inc 2013-06-03 20:22:51 -04:00
Tyler Renelle
35e0e404c7 groups: don't show gems for tavern 2013-06-03 20:18:11 -04:00
Tyler Renelle
c5bdf1bbe6 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-06-03 19:16:21 -04:00
Tyler Renelle
892115fe30 Merge pull request #1128 from SlappyBag/develop
CSV Update + Guild Gem Explanation
2013-06-03 16:16:15 -07:00
Tyler Renelle
c1cda30582 achievements: add migration for survey achievements 2013-06-03 19:15:48 -04:00
Tyler Renelle
bba008bd61 guild: add guild bank popover 2013-06-03 19:15:05 -04:00
Slappybag
81297823da Added gem explanation text 2013-06-03 23:08:58 +01:00
Slappybag
501e016e09 CSV Export supports null values 2013-06-03 23:08:42 +01:00
Tyler Renelle
b52888f491 fix bailey date 2013-06-03 16:58:19 -04:00
Tyler Renelle
42b7848a60 guilds: now costs 4G to create a guild, as per http://community.habitrpg.com/content/charge-gems-guild-creation 2013-06-03 16:55:57 -04:00
Tyler Renelle
658b4aa2a4 groups: bug fix to can't invite new user for users who haven't already
been migrated
2013-06-03 16:09:37 -04:00
Tyler Renelle
7c829afb09 guilds: bug fix for inconsistently invisible public guilds 2013-06-03 15:45:49 -04:00
Tyler Renelle
d6069e7174 guilds: bailey. 2013-06-03 14:51:58 -04:00