Commit Graph

9012 Commits

Author SHA1 Message Date
Negue de71db310a revert popover click trigger 2015-05-03 16:34:57 +02:00
Negue c3b09d8cce test 2nd argument for openModal 2015-05-01 13:55:33 +02:00
Blade Barringer fbc1a9ae86 Add two unit tests for copyToDo PR 2015-04-30 08:53:14 -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 0d18738ceb Correct phrasing of test 2015-04-29 08:47:47 -05:00
Blade Barringer 78249122f7 Ignore casing when searching for user name in autocomplete 2015-04-29 08:21:13 -05:00
Blade Barringer 41763d3b78 Add missing semi-colons 2015-04-29 08:05:08 -05:00
Blade Barringer 39930ecc29 Add mocha to .jshintrc 2015-04-29 08:04:53 -05:00
Blade Barringer 3a12b5644c Remove out of date comments 2015-04-29 07:57:54 -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
Joy Clark df91592438 fixing unit tests 2015-04-27 22:55:22 +02:00
Joy Clark 61c9d35215 Merge branch 'chat_match_users' into autocomplete_unit_tests 2015-04-27 22:50:30 +02:00
Matteo Pagliazzi 8dcbf75300 chore(i18n): update locales 2015-04-27 21:05:45 +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 f181787e8b added some unit tests to test the autocomplete controller 2015-04-26 21:38:46 +02: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 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
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
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