Commit Graph

441 Commits

Author SHA1 Message Date
NotGonnaGitUs 02e7b52fbf Adding environment variables to the static front page for translation. - Halfway done. 2015-05-01 20:14:19 +05:30
sablecliff e3570e609b Fixes Issue #5103
Altered the error messages that are part of the login and forgotten password processes.
These messages now remind the the user that they may have created an account through facebook.
2015-05-01 13:01:29 +10:00
Sabe Jones 43936da8ef Merge pull request #5113 from SabreCat/develop
Spring Fling warning
2015-04-30 17:41:23 -05:00
Sabe Jones b6955db39c chore(news): Spring Fling warning 2015-04-30 17:23:26 -05:00
Blade Barringer e4b21ac325 Merge branch 'develop' of github.com:HabitRPG/habitrpg into negue-copyMessageTodo 2015-04-29 17:19:24 -05:00
Blade Barringer 78249122f7 Ignore casing when searching for user name in autocomplete 2015-04-29 08:21:13 -05:00
Blade Barringer 6e35c45d5f Merge branch 'develop' of github.com:HabitRPG/habitrpg into joyclark-autocomplete_unit_tests 2015-04-29 07:50:33 -05:00
Joy Clark df1c349ea7 Fixing #5706 filtering system messages results in errors. 2015-04-27 23:01:15 +02:00
Negue 189423b0db markdown preview - code "inherit white-space" / hide links for 'system' 2015-04-27 19:47:42 +02:00
Negue 75579a7c36 add previewMarkdown / click as popover-trigger / misc changes 2015-04-27 19:23:56 +02:00
Blade Barringer e8da13b9be Merge branch 'joyclark-chat_match_users' into develop 2015-04-26 20:43:55 -05:00
Blade Barringer a94aad7a22 Fix comment 2015-04-26 20:43:32 -05:00
Blade Barringer dcd4be71ba Merge pull request #5095 from hairlessbear/settings_button_name_change
Changed button title to match dropdown settings menu titles
2015-04-26 19:32:58 -05:00
hairlessbear 2f33fe6e38 Changed button title to match menu titles 2015-04-26 19:53:35 -04:00
Joy Clark f214428411 Improved filter function as described in #5085 and added unit tests. 2015-04-26 17:50:53 +02:00
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
Negue 78dd949f20 copy chat messages as todo 2015-04-25 18:30:11 +02:00
Blade Barringer 93c69aa573 move extra &nbsp 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
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