sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9233 commits 3 branches 0 tags 1.6 GiB
Commit graph

9233 commits

This branch
This branch
All branches
Author SHA1 Message Date
Negue
b23e901780 Merge branch 'develop' into pushNotifications2 2015-04-27 17:20:25 +02:00
hairlessbear
7ac2c0c0c4 Made test name more descriptive and added HP expects 2015-04-27 10:49:57 -04:00
hairlessbear
5693386b12 Fixed tests 2015-04-27 00:42:55 -04:00
hairlessbear
4b980c78a1 Made tests more descriptive 2015-04-26 22:49:05 -04: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
hairlessbear
53ff109680 Added tests for Inn functionality 2015-04-26 19:07:11 -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
Alys
ffcb765b7f change skill descriptions to new ones provided by Lemoness at https://github.com/HabitRPG/habitrpg/issues/3029#issuecomment-96103553 2015-04-26 16:58:09 +10:00
Alys
983d2eb2be Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03 2015-04-26 16:38:17 +10: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
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 &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