3ab27f32d2
Refactored editTask into TaskService
2015-06-16 23:11:04 -05:00
3dc3891ec6
Fixed habit tests to create habits and check scoring
2015-06-16 20:19:02 -05:00
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
1801ad0bce
Add authors to bailey and correct refresh text
2015-06-16 17:59:59 -05:00
205f700c7e
Fix links
2015-06-16 18:04:12 -04:00
7152bea4fe
chore(news): 6/16 misc Bailey
2015-06-16 16:59:27 -05:00
73f87213e9
Added _README_FIRST.md files to directories that were missing them
2015-06-16 17:51:54 -04:00
0b40237b91
Updated README.md link in all _README_FIRST.md files
2015-06-16 17:46:21 -04:00
b12ee725f4
incrementally enable weekly recap emails
2015-06-16 20:26:58 +02:00
95b481b31d
use discriminator field to distinguish users with weekly recap emails enabled
2015-06-16 17:51:24 +02:00
0cd1ffb794
Fixing button caption for selling Eggs and Potions in the Market
2015-06-16 19:06:53 +05:00
a82270fbaa
feat(weekly-recap): enable for new users who sign in
2015-06-16 11:15:03 +02:00
18fe4b6166
Fix task advanced settings display setting ( fixes #5408 )
2015-06-16 00:52:48 -04:00
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
071f2796db
Adjusting challenges view translation
...
- Make "Back to all challenges" button translatable
- Allow some flexibility for the line "#_of_gems gem_icon Prize" - this
is made following the practices with linkstart/linkend implementation
- prize "string" is left as is because used as a placeholder
- code comment "prize" had to be moved 1 line up - before the p (as no
room for it is left inside the p) which however seems OK to me, because
the comments above and below has been made the same way before
2015-06-16 02:37:18 +05:00
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
6ed306a7e0
Merge pull request #5403 from vIiRuS/iOS-IAP
...
Enable in app purchase for iOS
2015-06-15 07:42:57 -05:00
d3353aa751
chore(i18n): update locales
2015-06-15 13:20:09 +02:00
39adff0e2c
improve error reporting for iOS IAP
2015-06-15 13:09:22 +02:00
e4a10d70ee
Add human readable text to response
2015-06-15 12:57:08 +02:00
6467dd8fc0
Merge pull request #1 from crookedneighbor/vIiRuS-iOS-IAP
...
Viirus iOS iap - add tests
2015-06-15 12:54:35 +02:00
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
05effefef1
Merge pull request #7 from crookedneighbor/hairlessbear-quest_invite_modal_on_user_sync
...
Make party page sync the party automatically (includes hacky fix for #4816 )
2015-06-14 22:27:32 -04:00
00c50f1212
Fixes #4816
2015-06-14 21:17:18 -05:00
bb73253e8e
Make party page sync the party automatically
2015-06-14 19:26:01 -05:00
6884263a55
Replaced accept/reject button actions with 'questAccept(party)' and 'questReject(party)' respectively to solve sync issues
2015-06-14 20:21:58 -04:00
fbf1d64a04
Moved accept/reject buttons to the bottom, and simplified logic for quest leader buttons
2015-06-14 20:12:50 -04:00
22ca76cf40
Added quest accept/reject to pending quest display
2015-06-14 19:46:43 -04:00
bb2f97e802
Added android tests for iap
2015-06-14 18:35:19 -05:00
1ea7193694
Add missing test
2015-06-14 18:11:07 -05:00
5b6afde475
Remove console.logs
2015-06-14 18:08:00 -05:00
cd45fc06c6
Collapse return and res.json statements
2015-06-14 18:07:23 -05:00
6318b0828f
Add test for iOS in-app purchases
2015-06-14 18:04:47 -05:00
dc8cdc1930
Merge pull request #6 from crookedneighbor/hairlessbear-quest_invite_modal_on_user_sync
...
Hairlessbear quest invite modal on user sync - bring up to date with develop
2015-06-14 18:02:10 -04:00
090ac94eec
Merge pull request #5406 from GitHubSphinx/Sphinx-entry1
...
Rewording translation string error message
2015-06-14 17:01:32 -05:00
5385471cb2
Fix push notifications test
2015-06-14 17:00:13 -05:00
14fe29dd4a
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-14 16:33:38 -05:00
92e2393114
Merge branch 'hairlessbear-pending_quest_display' into develop
2015-06-14 16:20:20 -05:00
109acb0d97
Correct ng-style syntax
2015-06-14 16:15:31 -05:00
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
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
4aa9e81d8a
Add data about armoire content to buy response
2015-06-14 18:08:58 +02:00
795710ce63
Rename boss folder to quests
2015-06-14 11:05:53 -05:00
35f2a36215
Split out pieces of boss jade files
2015-06-14 10:48:46 -05:00
178e7b1c8c
Move participants to partial
2015-06-14 10:14:05 -05:00
44a556f4fe
Refactor to use tabset
2015-06-14 09:01:28 -05:00
6997783037
Check that iOS IAP is of correct type
2015-06-14 15:59:43 +02:00
a6e0d5f2de
Merge branch 'develop' into hairlessbear-pending_quest_display
2015-06-14 08:44:25 -05:00
7ccf246119
Enable authentication for iOS IAP route
2015-06-14 15:28:30 +02:00
b4f4db9c1d
Create jade variabel for ultimate gear check
2015-06-14 01:56:32 -05:00
Blade Barringer