 Blade Barringer
|
1da1160e10
|
Merge branch 'develop' into joyclark-chat_match_users
|
2015-04-25 17:33:06 -05:00 |
|
|
Blade Barringer
|
2f4fc8fb88
|
Put isMemberOfGroup in its own describe block
|
2015-04-25 17:32:46 -05:00 |
|
|
Blade Barringer
|
ce4535594c
|
refactor joyclark's test
|
2015-04-25 17:31:40 -05:00 |
|
|
Joy Clark
|
913afc8f39
|
#5085 restructured unit tests for AutocompleteCtrl
|
2015-04-25 23:22:39 +02:00 |
|
|
Joy Clark
|
3458815f28
|
#5085 added some unit tests.
|
2015-04-25 23:08:28 +02: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 |
|
|
hairlessbear
|
f5f5753ea5
|
removed added EOF newlines
|
2015-04-25 14:53:44 -04:00 |
|
|
hairlessbear
|
d892314603
|
Update npc.json
|
2015-04-25 14:47:47 -04:00 |
|
|
hairlessbear
|
5a8b5be115
|
Update npc.json
|
2015-04-25 14:47:24 -04:00 |
|
|
hairlessbear
|
441d9b2a33
|
Reverting erroneous language changes
|
2015-04-25 14:46:35 -04:00 |
|
|
hairlessbear
|
9fe6b21523
|
Reverting erroneous language changes
|
2015-04-25 14:44:46 -04:00 |
|
|
hairlessbear
|
7661ce4aba
|
Update npc.json
|
2015-04-25 14:42:57 -04:00 |
|
|
hairlessbear
|
da1730d75e
|
Update npc.json
|
2015-04-25 14:42:44 -04:00 |
|
|
hairlessbear
|
3f5d5929c5
|
Reverting erroneous language changes
|
2015-04-25 14:42:01 -04:00 |
|
|
hairlessbear
|
3c366e9ad3
|
Changed tavern text to Lemoness's specifications
|
2015-04-25 13:09:16 -04:00 |
|
|
Negue
|
78dd949f20
|
copy chat messages as todo
|
2015-04-25 18:30:11 +02:00 |
|
|
hairlessbear
|
ba1f2b692c
|
Merge branch 'cron_dailies_fix' of https://github.com/hairlessbear/habitrpg into cron_dailies_fix
|
2015-04-25 12:19:46 -04:00 |
|
|
hairlessbear
|
b87950d948
|
Updated tavern text to reflect modified dailies functionality
|
2015-04-25 12:15:15 -04: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 |
|
|
Joy Clark
|
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 |
|
|
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 |
|
|
hairlessbear
|
e9e0ff52e4
|
Update index.coffee
|
2015-04-24 04:32:47 -04:00 |
|
|
hairlessbear
|
de8facd58e
|
Dailies reset without causing damage when resting at Inn
|
2015-04-24 04:07:51 -04:00 |
|
|
Alys
|
77a07c1e53
|
add official name of each skill as a comment
|
2015-04-24 16:29:16 +10: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 |
|
|
TheHollidayInn
|
6f8d80dcac
|
Split challenge filter test into multiple tests
|
2015-04-23 14:27:41 -05:00 |
|
|
Matteo Pagliazzi
|
ca3ac96d6d
|
chore(i18n): update locales
|
2015-04-23 20:49:53 +02:00 |
|
|
Matteo Pagliazzi
|
54e82a14a2
|
fix(invite-friends): text should be valid for both parties and guilds
|
2015-04-23 20:48:44 +02:00 |
|
|
TheHollidayInn
|
ad2ad70421
|
Updated comments and removed extra console.log
|
2015-04-23 08:58:40 -05:00 |
|
|
TheHollidayInn
|
f3f1bd4d8e
|
Andded together filters and created tests for challenge filtering
|
2015-04-23 00:33:31 -05: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 |
|
|
TheHollidayInn
|
71cc5f76fe
|
Set default ownership filter to either and fixed editing bug
|
2015-04-22 11:54:02 -05:00 |
|
|
TheHollidayInn
|
74ef8cd443
|
Added filter by owner for challenges
|
2015-04-22 11:54:01 -05:00 |
|
|
Matteo Pagliazzi
|
d872682846
|
Merge pull request #5063 from gisikw/dated-tasks-correct-impl
Use minification-friendly syntax
|
2015-04-22 18:22:05 +02: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 |
|
|
Matteo Pagliazzi
|
c699fcde49
|
chore(i18n): update locales
|
2015-04-22 16:22:11 +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 |
|
|
Alys
|
5b1f9d4f5e
|
Merge pull request #5049 from Rbrinkley/patch-2
Increased Carousel Sliding Time on Static.Front
|
2015-04-22 15:33:49 +10:00 |
|