Commit Graph

254 Commits

Author SHA1 Message Date
Sabe Jones 2a375a120c feat(backgrounds): prettify news 2015-05-06 19:48:47 -05:00
Sabe Jones 00db42b6c0 feat(backgrounds): May BGs 2015-05-06 19:41:54 -05:00
Matteo Pagliazzi 8066589268 disable registration while request in progress 2015-05-06 15:43:30 +02:00
Blade Barringer 84a4c36c7e Merge branch 'NotGonnaGitUs-RestingatInnText' into develop 2015-05-05 19:45:42 -05:00
Blade Barringer d482fdcea5 Refactor tavern view 2015-05-05 19:45:05 -05:00
Matteo Pagliazzi d2198c7572 remove invite friends from settings page 2015-05-05 19:52:06 +02:00
Matteo Pagliazzi ca90de7a55 Merge pull request #5144 from NotGonnaGitUs/FrontPageLinkFix
Fixed broken business link
2015-05-05 17:34:53 +02:00
Tyler Renelle a090fed10b feat(analytics): "motivate yourself" 3 variants @lemoness 2015-05-04 15:31:00 -04:00
NotGonnaGitUs 25b63cfacd Made daniel's text in the inn based on current rest status of the user. 2015-05-04 23:37:54 +05:30
NotGonnaGitUs 076cc76e5d Fixed broken link 2015-05-04 21:26:45 +05:30
Blade Barringer b408f016fd Merge pull request #5119 from NotGonnaGitUs/develop
Made front page translatable
2015-05-03 09:43:43 -05:00
Blade Barringer 62f7eae5d5 Fixes #5132 2015-05-03 09:01:12 -05:00
Sabe Jones 6685e93554 fix(Spring): WHO IS LESLIE 2015-05-01 19:19:23 -05:00
Sabe Jones d50d4ad8bb feat(Spring): Flung 2015-05-01 19:09:28 -05:00
Blade Barringer e334ce7684 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-05-01 12:36:07 -05:00
Blade Barringer 954f9baeec chore(bailey) - skills rebalancing 2015-05-01 12:29:59 -05:00
NotGonnaGitUs 124df58644 Made front page translatable. 2015-05-01 21:18:25 +05:30
NotGonnaGitUs 02e7b52fbf Adding environment variables to the static front page for translation. - Halfway done. 2015-05-01 20:14:19 +05:30
Sabe Jones b6955db39c chore(news): Spring Fling warning 2015-04-30 17:23:26 -05:00
Blade Barringer e8da13b9be Merge branch 'joyclark-chat_match_users' into develop 2015-04-26 20:43:55 -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
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
Sabe Jones f9cf860ae8 Merge pull request #5058 from SabreCat/busy-bee
April 2015 Subscriber Items
2015-04-24 11:05:03 -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
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