Blade Barringer
c324ea3e03
Merge branch 'hairlessbear-hide_challenge_achievement' into develop
2015-04-25 22:15:37 -05:00
Blade Barringer
5cde0495a8
Add parenthesis back in so boolean will render correctly
2015-04-25 22:15:04 -05:00
Blade Barringer
7494cb1438
Make gem popover consistent with gold and silver. Closes #5088
2015-04-25 21:53:00 -05:00
hairlessbear
831af01db6
Made fixes suggested by crookedneighbor
2015-04-25 22:38:16 -04:00
hairlessbear
4d8310296b
Added another one-time binding
2015-04-25 22:14:16 -04:00
hairlessbear
2d748e22e6
Removed unnecessary one-time bindings
2015-04-25 22:05:19 -04:00
hairlessbear
4f340940ed
Added another one time binding
2015-04-25 21:10:14 -04:00
hairlessbear
732ad1ef07
Fixed broken indentation
2015-04-25 20:24:50 -04:00
hairlessbear
0b71c16966
Changed a bunch of ng-show to ng-if and added one-time bindings
2015-04-25 20:17:23 -04:00
hairlessbear
afdfa9e58e
Changed a bunch of ng-show to ng-if and added one-time bindings
2015-04-25 20:07:09 -04:00
Blade Barringer
ba2bdf6094
Merge pull request #5066 from hairlessbear/hide_challenge_achievement
...
Fixed challenges achievement always displaying
2015-04-25 18:57:53 -05:00
hairlessbear
708ef0882b
Changed ng-show to ng-if and added one-time bindings
2015-04-25 19:32:41 -04:00
Blade Barringer
1da1160e10
Merge branch 'develop' into joyclark-chat_match_users
2015-04-25 17:33:06 -05:00
Joy Clark
0a2890d1eb
#1866 changed parameter name for function so that it is no longer "item"
2015-04-25 21:24:56 +02:00
Blade Barringer
93c69aa573
move extra  
2015-04-25 11:08:48 -05:00
Blade Barringer
29ebe68461
Fixes #5083
2015-04-25 10:49:00 -05:00
Joy Clark
94c5da32d6
a proposed solution to issue #1866 Redefined the filter function to match based on prefix
2015-04-25 16:23:57 +02:00
hairlessbear
1ee5bbae72
Added a missing dot
2015-04-24 18:38:15 -04:00
hairlessbear
f9eef5c497
Greyed-out challenges achievement
2015-04-24 18:36:49 -04:00
Matteo Pagliazzi
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
Sabe Jones
f9cf860ae8
Merge pull request #5058 from SabreCat/busy-bee
...
April 2015 Subscriber Items
2015-04-24 11:05:03 -05:00
Kevin Gisi
65e42345f2
Ensure correct join/leave button for parties
2015-04-24 11:54:00 -04:00
Blade Barringer
523582f870
Add clear:both after task-column to fix floating issue
2015-04-23 17:58:33 -05:00
Blade Barringer
f1c8941724
Merge pull request #5065 from crookedneighbor/social-number-placement
...
Added button for jumping to inbox
2015-04-23 17:41:03 -05:00
Matteo Pagliazzi
54e82a14a2
fix(invite-friends): text should be valid for both parties and guilds
2015-04-23 20:48:44 +02:00
hairlessbear
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
hairlessbear
93fcc8e71b
Fixed challenges achievement always displaying
2015-04-22 21:54:08 -04:00
Blade Barringer
8cec2da905
Added button for jumping to inbox
2015-04-22 19:29:24 -05:00
Kevin Gisi
705f9016c5
Use minification-friendly syntax
2015-04-22 12:04:04 -04:00
Matteo Pagliazzi
37f7db3c4e
feat(emails): add support for weekly recap emails
2015-04-22 16:30:53 +02:00
Alys
7c36e49243
Merge pull request #5022 from gisikw/dated-tasks-correct-impl
...
Dated tasks correct impl
2015-04-22 16:56:03 +10:00
Alys
56592d144d
Merge pull request #5048 from Rbrinkley/patch-1
...
Update front.jade
2015-04-22 15:34:22 +10:00
Alys
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
Sabe Jones
7a7fc96818
feat(mystery): April Subscribee Items
2015-04-21 21:14:19 -05:00
Kevin Gisi
a05714405a
Inject RootCtrl into MemberModalCtrl to expose shared methods
2015-04-21 05:17:15 -04:00
Rbrinkley
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
Alys
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
Rbrinkley
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
Tyler Renelle
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
Blade Barringer
1d95784dde
refactor isMemberOfGroup and tests
2015-04-16 07:58:35 -05:00
hairlessbear
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
Blade Barringer
4853c0814d
Corrected function
2015-04-16 07:39:55 -05:00
Blade Barringer
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
Kevin Gisi
160982df33
Simplify group detection logic for guilds
2015-04-15 23:10:12 -04:00
Sabe Jones
7d1a58ca00
fix(slimes): Tweaks and missing sprite
...
Slimes don't have skeletons anyway, right?
2015-04-15 18:48:57 -05:00
Sabe Jones
f13c6cba00
feat(pets): Slime Quest
2015-04-15 18:08:43 -05:00
Kevin Gisi
d455666650
Join/Leave buttons on guild detail page. Addresses #4427
2015-04-15 06:15:11 -04:00
Blade Barringer
c7cc6f0ae8
Merge pull request #5027 from crookedneighbor/send_test_data_to_test_db
...
Send test data to test db
2015-04-14 19:59:02 -05:00
Kathryn Norris
2fc01ee776
Simplified custom day start info in settings. ( #5006 )
2015-04-14 16:47:37 -07:00
Blade Barringer
fc979dfdaa
create new string for quest participants to correct processing error
...
closes #5025 , closes #5029
2015-04-14 17:52:08 -05:00
