Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,664 Commits 64 Branches 1,256 Tags
4042c1ce7ae07c84da927501d7915cd828a10be3
Commit Graph

9664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer 4042c1ce7a Merge branch 'GitHubSphinx-Sphinx-entry1' into develop 2015-06-17 19:06:56 -05:00
Blade Barringer 03c1476840 Change location of sellFor strings 2015-06-17 19:06:28 -05:00
Blade Barringer 3ff310294b Hide row if not part of reward; add one-time bindings 2015-06-17 18:57:15 -05:00
Blade Barringer e150a4d4f6 Merge branch 'develop' into hairlessbear-add_quest_rewards_to_pending_quest 2015-06-17 18:51:30 -05:00
Blade Barringer 685c09aa0d Merge branch 'task_service_refactoring_v2' into develop 2015-06-17 18:46:13 -05:00
Sabe Jones ad7e5a6dc9 feat(pets): Cuttlefishies v1.1.0 2015-06-17 17:26:36 -05:00
Alys c404e5ca5e Merge pull request #5420 from HabitRPG/revert-5407-GSalvadi-audio-NOMINDTR-2015-06-15 
Temporarily revert "new GSalvadi audio theme, created by NomindTR"
 2015-06-18 08:04:35 +10:00
Alys 30a091e14e Revert "new GSalvadi audio theme, created by NomindTR" 2015-06-18 07:39:38 +10:00
hairlessbear 3046bbb0d7 Added quest rewards to pending quest display 2015-06-17 13:21:17 -04:00
Blade Barringer 4da3018ad9 Simplify editTask 2015-06-17 07:51:07 -05:00
Alys 910fc2f213 Merge pull request #5407 from Alys/GSalvadi-audio-NOMINDTR-2015-06-15 
new GSalvadi audio theme, created by NomindTR
 2015-06-17 21:39:39 +10:00
Blade Barringer e422ea065f Reword tests 2015-06-16 23:16:11 -05:00
Blade Barringer 3ab27f32d2 Refactored editTask into TaskService 2015-06-16 23:11:04 -05:00
Blade Barringer 63e1bdf5fd Merge pull request #5415 from hairlessbear/update_locales_link 
Update README.md link in _README_FIRST.md files and add missing _README_FIRST.md files
 2015-06-16 19:27:26 -05:00
Blade Barringer 1801ad0bce Add authors to bailey and correct refresh text v1.0.3 2015-06-16 17:59:59 -05:00
hairlessbear 205f700c7e Fix links 2015-06-16 18:04:12 -04:00
Sabe Jones 7152bea4fe chore(news): 6/16 misc Bailey 2015-06-16 16:59:27 -05:00
hairlessbear 73f87213e9 Added _README_FIRST.md files to directories that were missing them 2015-06-16 17:51:54 -04:00
hairlessbear 0b40237b91 Updated README.md link in all _README_FIRST.md files 2015-06-16 17:46:21 -04:00
Matteo Pagliazzi b12ee725f4 incrementally enable weekly recap emails v1.0.2 2015-06-16 20:26:58 +02:00
Matteo Pagliazzi 95b481b31d use discriminator field to distinguish users with weekly recap emails enabled 2015-06-16 17:51:24 +02:00
GihHubSphinx 0cd1ffb794 Fixing button caption for selling Eggs and Potions in the Market 2015-06-16 19:06:53 +05:00
Matteo Pagliazzi a82270fbaa feat(weekly-recap): enable for new users who sign in 2015-06-16 11:15:03 +02:00
hairlessbear 18fe4b6166 Fix task advanced settings display setting (fixes #5408) 2015-06-16 00:52:48 -04:00
Alys 14983cb996 replace minus Habit and To-Do sounds, rename NomindTR's theme, rename keys for theme since they aren't live yet 2015-06-16 13:10:49 +10:00
Blade Barringer ecb2544cdc Merge pull request #5396 from hairlessbear/remove_freeRebirth 
Removed 'freeRebirth' from user model and everywhere else in codebase
 2015-06-15 08:00:18 -05:00
Blade Barringer 6ed306a7e0 Merge pull request #5403 from vIiRuS/iOS-IAP 
Enable in app purchase for iOS
 2015-06-15 07:42:57 -05:00
Matteo Pagliazzi d3353aa751 chore(i18n): update locales 2015-06-15 13:20:09 +02:00
Phillip Thelen 39adff0e2c improve error reporting for iOS IAP 2015-06-15 13:09:22 +02:00
Phillip Thelen 6467dd8fc0 Merge pull request #1 from crookedneighbor/vIiRuS-iOS-IAP 
Viirus iOS iap - add tests
 2015-06-15 12:54:35 +02:00
Alys b6b2873faf add new GSalvadi audio theme, created by NomindTR 70d88957-673a-4edd-b97e-f1ecb018dd89 https://trello.com/c/tljx8gKC/18-music-sound-effects-v3 13 June 2015 2015-06-15 20:33:14 +10:00
Blade Barringer bb2f97e802 Added android tests for iap 2015-06-14 18:35:19 -05:00
Blade Barringer 1ea7193694 Add missing test 2015-06-14 18:11:07 -05:00
Blade Barringer 5b6afde475 Remove console.logs 2015-06-14 18:08:00 -05:00
Blade Barringer cd45fc06c6 Collapse return and res.json statements 2015-06-14 18:07:23 -05:00
Blade Barringer 6318b0828f Add test for iOS in-app purchases 2015-06-14 18:04:47 -05:00
Blade Barringer 090ac94eec Merge pull request #5406 from GitHubSphinx/Sphinx-entry1 
Rewording translation string error message
 2015-06-14 17:01:32 -05:00
Blade Barringer 92e2393114 Merge branch 'hairlessbear-pending_quest_display' into develop 2015-06-14 16:20:20 -05:00
Blade Barringer 109acb0d97 Correct ng-style syntax 2015-06-14 16:15:31 -05:00
GihHubSphinx 232888212a Rewording translation string error message 
Making error message about inaccurate translation match the UI link to
Report a Bug.

Addressing https://github.com/HabitRPG/habitrpg/issues/5405 to m
 2015-06-15 01:42:47 +05:00
Blade Barringer 4b3d82613e Allow leader to be shown in member list; do not allow leader to kick out self from group 2015-06-14 12:54:21 -05:00
Blade Barringer 795710ce63 Rename boss folder to quests 2015-06-14 11:05:53 -05:00
Blade Barringer 35f2a36215 Split out pieces of boss jade files 2015-06-14 10:48:46 -05:00
Blade Barringer 178e7b1c8c Move participants to partial 2015-06-14 10:14:05 -05:00
Blade Barringer 44a556f4fe Refactor to use tabset 2015-06-14 09:01:28 -05:00
Phillip Thelen 6997783037 Check that iOS IAP is of correct type 2015-06-14 15:59:43 +02:00
Blade Barringer a6e0d5f2de Merge branch 'develop' into hairlessbear-pending_quest_display 2015-06-14 08:44:25 -05:00
Phillip Thelen 7ccf246119 Enable authentication for iOS IAP route 2015-06-14 15:28:30 +02:00
Blade Barringer b4f4db9c1d Create jade variabel for ultimate gear check 2015-06-14 01:56:32 -05:00
Blade Barringer c44ca785aa Merge branch 'develop' into SabreCat-develop 2015-06-14 01:50:16 -05:00