Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,511 Commits 64 Branches 1,256 Tags
a4627be3ea917da7e3a2db743fc24bef508564fe
Commit Graph

10511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer a4627be3ea Merge branch '3onyc-fix-hash-leak' into develop 2015-08-22 17:54:42 -05:00
Blade Barringer b2c4d5c012 Add test for items that are deleted when getting the user 2015-08-22 17:53:49 -05:00
Blade Barringer 8fc69102aa Merge branch 'develop' into 3onyc-fix-hash-leak 2015-08-22 17:45:47 -05:00
Blade Barringer 87c04e885d Merge pull request #5818 from lacrimae/patch-6 
Wording: Proper English it was not
 2015-08-22 17:44:35 -05:00
Blade Barringer 9ddf5353d1 Clean up directive tests 2015-08-22 17:21:30 -05:00
Blade Barringer b41b629e93 Remove test variable 2015-08-22 17:08:28 -05:00
Blade Barringer 01d122ad67 Remove unneded declaration 2015-08-22 17:04:46 -05:00
Blade Barringer 9643b6e650 Merge branch 'develop' into TheHollidayInn-menu-hide-when-navigate-away 2015-08-22 17:03:26 -05:00
Blade Barringer 6b7ca3e823 Use $scope instead of scope in directives 2015-08-22 17:02:32 -05:00
TheHollidayInn 5e510aade0 Added tests for new menu directives 2015-08-22 15:25:51 -05:00
Alys f9a0e494a7 changed "The Dreadful Cheetah" to "Such a Cheetah" 2015-08-21 20:49:58 +10:00
lacrimae b8bd87eeb8 Wording: Proper English it was not 2015-08-20 16:55:05 +02:00
Alys 28e360d7f4 change Janet Janet Mongilio to janetmango 2015-08-20 11:23:29 +10:00
Blade Barringer 0f5f80f910 Unpend preening test 2015-08-19 19:23:23 -05:00
Sabe Jones f306ee6d1d fix(test): Skip preen test 2015-08-19 20:08:39 -04:00
Sabe Jones 99c8f941e6 chore(news): August pet Bailey 2015-08-19 17:39:11 -04:00
Sabe Jones 190fdd5bb9 feat(pets): August cheetah quest 2015-08-19 16:55:14 -04:00
Sabe Jones 3e848ce67e chore(pets): Compile sprites 2015-08-19 14:59:26 -05:00
Sabe Jones 2a09eb8911 feat(pets): August sprites 2015-08-19 14:50:09 -05:00
Blade Barringer 59068c17a2 Add watch task for karma test 2015-08-19 08:56:20 -05:00
TheHollidayInn e762a51e4c Moved menu expand directive and created menu close directive 2015-08-19 08:53:51 -05:00
Blade Barringer 45b7e9a7d2 Remove .DS_Store files 2015-08-19 08:07:06 -05:00
Blade Barringer 5b02c2776e Fix habitica in privacy policy 2015-08-19 08:06:02 -05:00
Blade Barringer fa7f957ccc Update habitrpg.com to habitica.com where applicable 2015-08-19 08:00:34 -05:00
Blade Barringer 1fecc7dc89 Change wiki links to habitica 2015-08-19 07:46:25 -05:00
Blade Barringer 00ec16877b Merge pull request #5799 from Alys/challenges-editable-by-admins-2015-08-16 
allow Challenges to be edited, closed, and deleted by staff and moderators
 2015-08-18 17:20:19 -05:00
Blade Barringer be87f69cd4 Actually save copy message modal spec 2015-08-18 08:10:38 -05:00
Blade Barringer fe22f76e30 Move copy message modal controller spec to own file 2015-08-18 08:06:46 -05:00
Blade Barringer 3f48364a4a Move autocomplete controller to own file 2015-08-18 08:05:56 -05:00
Blade Barringer a032c80aaf Move chat controller to own spec file 2015-08-18 08:05:35 -05:00
Blade Barringer a749e2d9f7 Move party controller to own spec 2015-08-18 08:04:17 -05:00
Alys aea8c3e5f6 Merge pull request #5806 from Gbear605/develop 
Update information about max levels for buffs.
 2015-08-18 09:02:03 +10:00
Garrison Taylor 94a31985b7 Update information about max levels for buffs. 2015-08-17 11:34:30 -05:00
Alys 0fec63a2a7 Merge pull request #4 from crookedneighbor/add_test_to_admin_editable_pr 
Add tests to PR that lets admins edit challenges
 2015-08-17 07:29:20 +10:00
3onyc 1c13c48bee Fix removing user salt+hash from API response 2015-08-16 17:04:24 +02:00
Blade Barringer 9b73c5eab8 Add tests for non-owner permissions 2015-08-16 09:45:01 -05:00
Blade Barringer ab9aab9262 Rework challenge integration test to be more autonomous 2015-08-16 09:44:38 -05:00
Blade Barringer f9e337ed40 Merge pull request #5796 from GitHubSphinx/Sphinx-i18n-db1 
Change 2 locale strings to exclude html character codes not shown on the front page
 2015-08-16 07:31:09 -05:00
GihHubSphinx a1f8035515 Change 2 strings to exclude html character codes 
exclude mldr and rsquo character codes not shown correctly on the front
page
 2015-08-16 14:17:26 +05:00
GihHubSphinx 0a0d41510e Revert "Enable html rendering for 2 locale strings" 
This reverts commit a2108bbb51.
 2015-08-16 14:08:58 +05:00
Alys 71a9f7caf4 make challenge permission error messages translatable 2015-08-16 17:30:51 +10:00
Alys 53f861f3c0 allow challenges to be edited, deleted, closed by admin users (moderators and staff) through the web UI (not by API calls) 2015-08-16 16:51:53 +10:00
Alys 8e667b1019 delete an outdated favicon.ico file - partial fix for https://github.com/HabitRPG/habitrpg/issues/5464 2015-08-16 14:35:38 +10:00
GihHubSphinx a2108bbb51 Enable html rendering for 2 locale strings 
Strings dreimQuote and teamSample3 on the front page contain symbol
codes `…` and `’` which are not shown correctly

Closes #5571
 2015-08-16 00:50:43 +05:00
Matteo Pagliazzi 7d59e1e039 start server using just node, not nodemon 2015-08-15 18:23:29 +02:00
Alys 8c186f3068 add close button audio menu on mobile web view - fixes https://github.com/HabitRPG/habitrpg/issues/5359 2015-08-15 15:21:17 +10:00
Blade Barringer 25d52bccc5 Use new newUser specHelper syntax 2015-08-15 00:08:41 -05:00
Blade Barringer 53133c6439 Adjust newUser spec helper 2015-08-14 23:55:36 -05:00
Blade Barringer 426acf44c8 Wrap task analytics in if statement 2015-08-14 23:43:47 -05:00
Blade Barringer c10a0ad31a Add habits 2015-08-14 23:43:32 -05:00