Blade Barringer
fca0188172
Merge branch 'task_edit_fix' into develop
2016-08-20 21:23:43 -05:00
Blade Barringer
67187c1b08
fix: show markdown compiled task text while editing
2016-08-20 09:21:52 -04:00
Blade Barringer
b3b7108bd6
Merge branch 'develop' into Hus274-7688
2016-08-20 08:31:22 -04:00
Alys
dd80a2e76e
make Export Data introduction more accurate (it exports more than Habits)
2016-08-19 21:07:07 -07:00
Alys
2fea2d9565
adjust message displayed on Done To-Dos tab to reflect API v3 changes
...
The 30 most recently completed To-Dos are now shown, regardless of how long ago they were completed.
2016-08-19 21:06:45 -07:00
Luveluen
a654369075
Update faq.json - description of mechanic outdated ( #7913 )
...
* Update faq.json line - description of mechanic outdated
Changed
<---Tap on a Pet, and then select \"Feed Pet\"!
--->Click on a type of food, and then select the pet you want to feed!
because clicking on the pet first does not work anymore, clicking on the pet first selects it for use.
As described by MeikeMertsch here: https://www.transifex.com/habitrpg/habitrpg/translate/#de/faqjson/60117132
* Update faq.json
2016-08-19 15:40:51 -07:00
Blade Barringer
a69ab954f5
fix(client): Correct logic to show premium pets
...
Fixes #7888
2016-08-19 08:41:27 -04:00
Sabe Jones
106bf52915
3.33.1
2016-08-18 20:28:09 +00:00
Sabe Jones
9f0d4fbd65
fix(auth): Facebook on MS Edge
2016-08-18 20:07:14 +00:00
Sabe Jones
3ac5617e57
chore(news): Bailey 20160818
2016-08-18 18:58:37 +00:00
Sabe Jones
f5224282d9
3.33.0
2016-08-18 17:58:49 +00:00
Sabe Jones
53a7f7ba5f
chore(sprites): compile
2016-08-18 17:51:51 +00:00
Sabe Jones
0c11d8fb6d
feat(content): Pets 201608 ( #7903 )
2016-08-18 12:40:29 -05:00
Phillip Thelen
7ef2c34177
add route for QR codes ( #7902 )
...
* add route for QR codes
* check that passed ID is a UUID
* add test for qr code redirect
* fix qr code test
2016-08-18 19:37:14 +02:00
Blade Barringer
e68c75c802
chore(i18n): update locales
2016-08-17 10:24:04 -05:00
Blade Barringer
fd70efcb60
Merge pull request #7900 from crookedneighbor/analytics_fix
...
Analytics fix
2016-08-15 22:39:03 -05:00
Jaka Kranjc
408d988341
api: expose user's inbox.optOut for api/v3/members/:memberId #7798 ( #7893 )
...
* api: expose user's inbox.optOut for `api/v3/members/:memberId` #7798
* test: fixed chai exist vs exists typos
* _getMembersForItem: fixed typo in api docs
2016-08-15 22:21:14 -05:00
Blade Barringer
bd8b1b0ece
chore(tests): Rewrite analytics tests to remove dependency on nock
2016-08-15 22:20:39 -05:00
Travis
1a409848a8
allow flagging the post of a deleted user ( #7897 )
...
* Allowing the flagging of messages that were written by user accounts that have since been deleted
* replacing ternary operator with else if, else paradigm
* formatting fixes
* fixing message in tests
2016-08-15 22:14:52 -05:00
Blade Barringer
9223aecfbe
fix(api): Pass in headers to payments analytics
2016-08-15 08:07:59 -05:00
Blade Barringer
977bafd2d1
fix(api): Set platform and agent to Unknown if headers are not passed in
2016-08-15 08:07:59 -05:00
Camellia Peng
12f1aae2dd
Update email check exist ( #7899 )
...
* throw a 401 error if user tries to update his/her email to an email that exists already
* Make error message generic so we don't violate users' privacy. Added test case.
* Syntax fixes
* select only the _id field when searching for users with the same email. Return found document as javascript object.
2016-08-15 07:52:53 -05:00
Blade Barringer
02545ae439
3.32.0
2016-08-14 14:10:40 -05:00
Blade Barringer
5a47f2a19f
chore(i18n): update locales
2016-08-14 14:08:50 -05:00
Blade Barringer
c7a2b69b32
chore(i18n): update locales
2016-08-13 07:03:50 -05:00
Blade Barringer
b1d06671c8
chore(i18n): update locales
2016-08-12 08:57:45 -05:00
Kaitlin Hipkin
55111a6ddc
New Party Loading Messages ( #7862 )
...
* add basic party loading message code; doesn't work yet
* fixup party loading messages, remove rpg-style messages
* move party-loading messages back into groups.json
* party-loading message logic returns a string instead of a number
2016-08-12 08:53:03 -05:00
Matteo Pagliazzi
7ccbcd7b33
add reorder task step to ios tutorial, mounts and inbox steps for both android and ios
2016-08-12 14:55:55 +02:00
Blade Barringer
8a4109b9d7
chore(i18n): update locales
2016-08-11 13:01:23 -05:00
Phillip Thelen
679378331d
add client and OS info to amplitude events
...
closes #7865
2016-08-11 08:58:13 -05:00
Blade Barringer
e3c40aa142
fix(client): Prevent restore streak from showing up in challenge creation
2016-08-11 08:48:44 -05:00
Husman
725c3b36f3
feat: allowing modification of challenge tasks after challenge creation. fixes #7320
...
closes #7877
2016-08-11 08:48:39 -05:00
Blade Barringer
89822222fe
Merge pull request #7881 from Hus274/7716
...
fix: shows user correct challenge when showing won challenge modal
2016-08-11 08:07:16 -05:00
Blade Barringer
fed1eb8c21
fix(client): set state chagne to scroll to top
...
closes #7880
fixes #4326
2016-08-11 07:59:12 -05:00
Blade Barringer
858da4f9c9
Merge pull request #7890 from HabitRPG/sabrecat/prefs-undefined
...
Fix preferences typeError
2016-08-11 07:48:14 -05:00
Josh Holland
cdeb498c0b
Align guild gems box with other page elements ( #7829 )
...
* Align guild gems box with other page elements
Fixes #7796 .
* Fix issues caused by aligning guild gems box
* Remove unnecessary comment
* Connect gem total box and plus/add gems button
When the add gems button is displayed, set border-radius on touching
corners between the two buttons to 0, so that they are displayed as a
unit rather than two separate buttons.
2016-08-11 07:45:21 -05:00
Sabe Jones
e7a820e28d
fix(editing): preferences typeError
2016-08-10 20:23:14 +00:00
Blade Barringer
395e602cfc
3.31.0
2016-08-10 12:28:32 -05:00
Blade Barringer
d50cedfd31
chore(i18n): update locales
2016-08-10 12:18:55 -05:00
Blade Barringer
a5b2e53914
fix(client): Add client redirect for coupon url
2016-08-10 12:12:56 -05:00
Blade Barringer
0e42d6ba32
Merge pull request #7889 from crookedneighbor/fix_purchase_call_in_view
...
fix: Correct purchase call to use purchaseType, not identifier
2016-08-10 12:00:06 -05:00
Blade Barringer
420cebd93b
fix: Correct purchase call to use purchaseType, not identifier
2016-08-10 08:58:01 -05:00
Blade Barringer
384783567b
chore(tests): Add test to catch bugs when adding invalid types to market
2016-08-10 08:44:21 -05:00
Sabe Jones
64ffa4912d
3.30.2
2016-08-10 05:28:29 +00:00
Sabe Jones
64c8e4d16d
fix(content): item type handling
2016-08-10 05:18:30 +00:00
Sabe Jones
0d1bff5dda
3.30.1
2016-08-10 03:47:30 +00:00
Blade Barringer
06cae45ed9
lint: Correct missing semicolons
2016-08-09 22:29:48 -05:00
Blade Barringer
2d553417b4
fix(api): Correct identifier for magic hatching potions
2016-08-09 22:21:54 -05:00
Alys
4df2b723fa
fix errors in apidocs for coupons/enter/:code and tasks/:taskId
2016-08-10 12:50:07 +10:00
Sabe Jones
f92cba6a40
3.30.0
2016-08-09 23:40:31 +00:00
