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

10521 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer b902ff63a2 Merge branch 'develop' into sabrecat/party-page 2015-08-19 08:07:34 -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 7f834429ac Add test for clickStartQuest 2015-08-18 08:19:04 -05:00
Blade Barringer 861a90a562 Use rootScope as variable 2015-08-18 08:18:53 -05:00
Blade Barringer b2e90ffb16 Merge branch 'develop' into sabrecat/party-page 2015-08-18 08:10:57 -05:00
Blade Barringer be87f69cd4 Actually save copy message modal spec 2015-08-18 08:10:38 -05:00
Blade Barringer b5a7b31fa8 Merge branch 'develop' into sabrecat/party-page 2015-08-18 08:09:33 -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
Blade Barringer ee6fe4f756 Use _.find for clickStart Quest 2015-08-18 08:02:23 -05:00
Blade Barringer 2e289777d5 Clean up groups page 2015-08-18 07:46:01 -05:00
Blade Barringer a57e19bdba Convert to private methods 2015-08-18 07:34:49 -05:00
Blade Barringer ab7a23ad00 Add quest abort function back in 2015-08-17 22:15:51 -05:00
Blade Barringer 690100b9f8 Correct common count test 2015-08-17 22:09:11 -05:00
Blade Barringer 14ae3b1046 Add one time binding 2015-08-17 22:07:09 -05:00
Blade Barringer ba2988ac98 Use new content for mixin 2015-08-17 21:51:08 -05:00
Blade Barringer f792155b45 Order quests with array 2015-08-17 21:48:58 -05:00
Blade Barringer 8ed13f1c12 Update wiki url 2015-08-17 21:34:20 -05:00
Blade Barringer 58888c8118 Add test for questOfCategory counting function 2015-08-17 19:18:21 -05:00
Blade Barringer 344eded949 Merge branch 'develop' into sabrecat/party-page 2015-08-17 19:04:25 -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
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
Blade Barringer a040acf739 Compile sprites 2015-08-14 23:26:50 -05:00
Blade Barringer f6dbea008a Merge pull request #5792 from Alys/deleteDefaultDaily 
remove unused default tasks
 2015-08-14 23:23:54 -05:00
Alys 7f0889f405 remove commented-out default task code and unused default task locale strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-130619901 (comment by GitHubSphinx) 2015-08-15 13:23:42 +10:00
Blade Barringer 9e47bc3f4c Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop 2015-08-14 20:11:37 -05:00
Blade Barringer 2821e25451 Reinstate the string interpolation 2015-08-14 18:04:04 -05:00
Blade Barringer f0e3360c35 chore(i18n): update locales 2015-08-14 17:52:37 -05:00