3f5d5929c5
Reverting erroneous language changes
2015-04-25 14:42:01 -04:00
3c366e9ad3
Changed tavern text to Lemoness's specifications
2015-04-25 13:09:16 -04:00
78dd949f20
copy chat messages as todo
2015-04-25 18:30:11 +02:00
ba1f2b692c
Merge branch 'cron_dailies_fix' of https://github.com/hairlessbear/habitrpg into cron_dailies_fix
2015-04-25 12:19:46 -04:00
b87950d948
Updated tavern text to reflect modified dailies functionality
2015-04-25 12:15:15 -04:00
93c69aa573
move extra  
2015-04-25 11:08:48 -05:00
29ebe68461
Fixes #5083
2015-04-25 10:49:00 -05:00
94c5da32d6
a proposed solution to issue #1866 Redefined the filter function to match based on prefix
2015-04-25 16:23:57 +02:00
1ee5bbae72
Added a missing dot
2015-04-24 18:38:15 -04:00
f9eef5c497
Greyed-out challenges achievement
2015-04-24 18:36:49 -04:00
0aff0b0f22
mounts are wider than pets and the empty paw prints in the mount view are smaller than the mounts that have been found. This makes the grid view uneven. Adjusted the css so that the mounts and paw prints are aligned.
2015-04-24 19:57:15 +02:00
bbc9a75d49
Merge pull request #5079 from gisikw/party-join-leave-buttons
...
Ensure correct join/leave button for parties
2015-04-24 18:36:25 +02:00
f9cf860ae8
Merge pull request #5058 from SabreCat/busy-bee
...
April 2015 Subscriber Items
2015-04-24 11:05:03 -05:00
65e42345f2
Ensure correct join/leave button for parties
2015-04-24 11:54:00 -04:00
e9e0ff52e4
Update index.coffee
2015-04-24 04:32:47 -04:00
de8facd58e
Dailies reset without causing damage when resting at Inn
2015-04-24 04:07:51 -04:00
77a07c1e53
add official name of each skill as a comment
2015-04-24 16:29:16 +10:00
523582f870
Add clear:both after task-column to fix floating issue
2015-04-23 17:58:33 -05:00
f1c8941724
Merge pull request #5065 from crookedneighbor/social-number-placement
...
Added button for jumping to inbox
2015-04-23 17:41:03 -05:00
ca3ac96d6d
chore(i18n): update locales
2015-04-23 20:49:53 +02:00
54e82a14a2
fix(invite-friends): text should be valid for both parties and guilds
2015-04-23 20:48:44 +02:00
e16c1c2ec3
Fixed challenge achievement always displaying
...
Challenge achievement will now only display if the user has won 1 or more challenges.
2015-04-22 22:06:50 -04:00
93fcc8e71b
Fixed challenges achievement always displaying
2015-04-22 21:54:08 -04:00
8cec2da905
Added button for jumping to inbox
2015-04-22 19:29:24 -05:00
d872682846
Merge pull request #5063 from gisikw/dated-tasks-correct-impl
...
Use minification-friendly syntax
2015-04-22 18:22:05 +02:00
705f9016c5
Use minification-friendly syntax
2015-04-22 12:04:04 -04:00
37f7db3c4e
feat(emails): add support for weekly recap emails
2015-04-22 16:30:53 +02:00
c699fcde49
chore(i18n): update locales
2015-04-22 16:22:11 +02:00
7c36e49243
Merge pull request #5022 from gisikw/dated-tasks-correct-impl
...
Dated tasks correct impl
2015-04-22 16:56:03 +10:00
56592d144d
Merge pull request #5048 from Rbrinkley/patch-1
...
Update front.jade
2015-04-22 15:34:22 +10:00
28e49f99f5
Merge pull request #5055 from gisikw/contributor-profile-fix
...
Inject RootCtrl into MemberModalCtrl to expose shared methods
2015-04-22 15:34:10 +10:00
5b1f9d4f5e
Merge pull request #5049 from Rbrinkley/patch-2
...
Increased Carousel Sliding Time on Static.Front
2015-04-22 15:33:49 +10:00
286eed95a2
chore(grunt): compile sprites
2015-04-21 21:34:39 -05:00
00252f2004
fix(mystery): It's 2015 now, Sabe
2015-04-21 21:30:34 -05:00
7a7fc96818
feat(mystery): April Subscribee Items
2015-04-21 21:14:19 -05:00
a05714405a
Inject RootCtrl into MemberModalCtrl to expose shared methods
2015-04-21 05:17:15 -04:00
340c484547
Increased Carousel Sliding Time on Static.Front
...
Increased carousel sliding time for front page in the "Players use HabitRPG to Manage" section. Increased time from 4 seconds to 10 seconds. Not too slow and not too fast. fixes https://github.com/HabitRPG/habitrpg/issues/5047
2015-04-19 10:52:34 -05:00
ee7ba19ed1
feat(i18n): upload japanese, serbian and chinese (taiwan)
2015-04-19 13:34:20 +02:00
662c8cd529
chore(i18n): update locales
2015-04-19 13:28:21 +02:00
175ec9bb46
Merge pull request #5007 from stillsnowedin/develop
...
Updated the custom day start information in settings. (#5006 )
2015-04-19 15:02:37 +10:00
26c1003f4a
Update front.jade
...
Increased time for carousel sliding from 4 seconds to 10 seconds. 4 seconds too fast for user to full read all the information, 10 seconds is not too slow but not too fast.
2015-04-18 22:29:36 -05:00
9292a46b6f
Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
2015-04-18 18:39:19 +10:00
cfc8ff96e6
feat(tour): tmp set variant=2 to (counter + finish button) until we can
...
get google experiment working
2015-04-16 20:17:13 -06:00
1d95784dde
refactor isMemberOfGroup and tests
2015-04-16 07:58:35 -05:00
68486f7c42
Fixed display of Pet Hydra in Tavern (Tier 6)
...
In the Tier 6 contributor description, the Pet Hydra wasn't displaying. Changed `div` tag to `span` to fix the issue.
2015-04-16 07:48:15 -05:00
4853c0814d
Corrected function
2015-04-16 07:39:55 -05:00
999e0188f2
Merge branch 'gisikw-guild-detail-join-leave_plus_blade' into develop
...
Conflicts:
website/public/js/controllers/groupsCtrl.js
2015-04-16 07:33:51 -05:00
5ef4b7b395
Add tests for isMemberOf
2015-04-16 07:32:56 -05:00
e1a623d3e0
Merge pull request #5031 from gisikw/guild-detail-join-leave
...
Join/Leave buttons on guild detail page. Addresses #4427
2015-04-15 22:46:33 -05:00
160982df33
Simplify group detection logic for guilds
2015-04-15 23:10:12 -04:00
hairlessbear