 Blade Barringer
|
68fabbf56f
|
Update names
|
2015-10-29 08:07:06 -05:00 |
|
|
Blade Barringer
|
4b44c935e8
|
Merge branch 'develop' into Bunjl-develop
|
2015-10-29 07:58:31 -05:00 |
|
|
Blade Barringer
|
bce37f7220
|
Adjusted Press Kit naming.
|
2015-10-29 07:55:17 -05:00 |
|
|
Matteo Pagliazzi
|
01373882c6
|
make error notification persistent, change text and make it translatable
|
2015-10-28 19:42:26 +01:00 |
|
|
Blade Barringer
|
7205ac689d
|
Merge pull request #6114 from kylestratis/issue-5542a
Issue 5542a - remove FIXME comment from invitations section in user model
|
2015-10-28 06:45:50 -05:00 |
|
|
jpk24rent
|
909d556a6d
|
Merge remote-tracking branch 'HabitRPG/develop' into develop
|
2015-10-28 09:47:47 +02:00 |
|
|
jpk24rent
|
5269df2932
|
namefix
|
2015-10-28 09:47:04 +02:00 |
|
|
Blade Barringer
|
5754b4f72a
|
chore(i18n): update locales
|
2015-10-27 21:38:23 -05:00 |
|
|
Blade Barringer
|
1a6b1f2a1c
|
Update string
|
2015-10-27 21:36:52 -05:00 |
|
|
Blade Barringer
|
b82054128d
|
chore(i18n): update locales
|
2015-10-27 21:36:51 -05:00 |
|
|
Blade Barringer
|
b70597e1d1
|
Merge pull request #6122 from crookedneighbor/batch_update_adjustment
Batch update adjustment
|
2015-10-27 21:35:19 -05:00 |
|
|
Blade Barringer
|
ed464a2b70
|
Merge pull request #6127 from crookedneighbor/reinstate_amplitude
Reinstate amplitude
|
2015-10-27 21:35:10 -05:00 |
|
|
Blade Barringer
|
711413f832
|
Update string
|
2015-10-27 21:28:33 -05:00 |
|
|
Blade Barringer
|
cdc58c78fd
|
Merge branch 'nicolevonvon-develop' into develop
|
2015-10-27 20:19:09 -05:00 |
|
|
Blade Barringer
|
c812c0ae90
|
Add popover to no owner label
|
2015-10-27 20:18:39 -05:00 |
|
|
kylestratis
|
0283408d1e
|
Removed FIXME comment above invitations object - the object is still being used.
|
2015-10-27 21:12:19 -04:00 |
|
|
Blade Barringer
|
691ab86bd6
|
Add test for default user id
|
2015-10-27 19:40:11 -05:00 |
|
|
Blade Barringer
|
a7c52e6086
|
Reinstate amplitude analytics
|
2015-10-27 19:37:57 -05:00 |
|
|
Matteo Pagliazzi
|
3bae95d3ae
|
remove console.log for push notifications
|
2015-10-27 22:11:47 +01:00 |
|
|
nicolevonvon
|
47ec2e1f93
|
Challenges now display'no owner' if original owner deletes account
|
2015-10-27 22:15:19 +02:00 |
|
|
Blade Barringer
|
68689d1a05
|
Remove debug option from mocha opts
|
2015-10-27 12:25:39 -05:00 |
|
|
Matteo Pagliazzi
|
7541c5a260
|
fix(analytics): disable amplitude
|
2015-10-27 17:59:29 +01:00 |
|
|
Matteo Pagliazzi
|
d05b00fb34
|
fix(analytics): enable analytics and correctly export methods
|
2015-10-27 17:39:37 +01:00 |
|
|
Matteo Pagliazzi
|
2443177729
|
fix(server): disable analytics until bug is fixed
|
2015-10-27 17:26:15 +01:00 |
|
|
Matteo Pagliazzi
|
98a00fcb4e
|
fix(memory) do not check for new relic until it is enabled again
|
2015-10-27 17:10:46 +01:00 |
|
|
Blade Barringer
|
f9afc8a8c6
|
Reorganize development user operations
|
2015-10-27 08:48:18 -05:00 |
|
|
jpk24rent
|
078c37bdda
|
presskit
press kit update
|
2015-10-27 15:34:52 +02:00 |
|
|
Blade Barringer
|
4886b50aa3
|
Add testing for batch update. Handle unknown operations better.
|
2015-10-27 08:13:30 -05:00 |
|
|
Blade Barringer
|
f13641b6a9
|
Add NODE_ENV to test server startup
|
2015-10-27 08:00:33 -05:00 |
|
|
Alys
|
1cc7ea872f
|
chore(news): Exhaust Strike Bailey - recommiting after temporary removal
|
2015-10-27 19:18:05 +10:00 |
|
|
Alys
|
23059763eb
|
revert Exhaust Strike Bailey change (commit f5d6c92897) to allow urgent deployment
|
2015-10-27 18:45:30 +10:00 |
|
|
Alys
|
a29c412781
|
prevent addTenGems and addHourglass being used in production -- PRs https://github.com/HabitRPG/habitrpg/pull/6115 and https://github.com/HabitRPG/habitrpg/pull/6117 by nivl4
|
2015-10-27 18:31:17 +10:00 |
|
|
Sabe Jones
|
f5d6c92897
|
chore(news): Exhaust Strike Bailey
|
2015-10-27 00:24:11 -04:00 |
|
|
Blade Barringer
|
c04b27ffd5
|
Simplify community guidelines string
|
2015-10-26 18:08:45 -05:00 |
|
|
Blade Barringer
|
f0e4149adb
|
Merge branch 'develop' into ksami-develop
|
2015-10-26 17:56:05 -05:00 |
|
|
Blade Barringer
|
4dd368a028
|
Merge pull request #6082 from anilanar/reroll-syntax-bug
fix a minor syntax error when opening reroll modal.
|
2015-10-26 17:55:16 -05:00 |
|
|
Blade Barringer
|
a556cf1c13
|
Merge pull request #6113 from crookedneighbor/ogAc8BA0_prevent_changing_class_change_from_api
ogAc8BA0 - prevent changing class change from api without spending gems
|
2015-10-26 17:45:56 -05:00 |
|
|
Blade Barringer
|
09596c657b
|
Remove only form test
|
2015-10-26 17:34:29 -05:00 |
|
|
Blade Barringer
|
2790008937
|
Adjust error message to not point to a readme file that does not exist.
|
2015-10-26 17:27:08 -05:00 |
|
|
Blade Barringer
|
13bca6b9a9
|
Prevent class from being changed via PUT /user
|
2015-10-26 17:25:51 -05:00 |
|
|
Blade Barringer
|
c7b162271c
|
Adjust context title.
|
2015-10-26 17:13:21 -05:00 |
|
|
Sabe Jones
|
2df6df2bee
|
Merge pull request #6091 from HabitRPG/sabrecat/mystery-201510
October 2015 Subscriber Items
|
2015-10-26 15:04:43 -05:00 |
|
|
Blade Barringer
|
13fa14270d
|
Add additional check for stat change
|
2015-10-26 12:52:18 -05:00 |
|
|
Blade Barringer
|
f8d08b4195
|
Merge branch 'jeremyabbott-userputtests' into userput
|
2015-10-26 12:25:17 -05:00 |
|
|
Blade Barringer
|
6a6922bb3f
|
Add tests for protected paths
|
2015-10-26 12:24:02 -05:00 |
|
|
Jeremy Abbott
|
e4269723e1
|
Creates initial PUT /user test
Adds missing semi-colon to DELETE-user.test.js
|
2015-10-26 10:54:37 -05:00 |
|
|
Blade Barringer
|
0eac953170
|
Adjust stying of put test
|
2015-10-26 08:04:30 -05:00 |
|
|
Blade Barringer
|
cf7be0b7a3
|
Merge branch 'develop' into jeremyabbott-userputtests
|
2015-10-26 08:00:30 -05:00 |
|
|
Blade Barringer
|
04fbdaa107
|
Reinstate error code in resolve promise for api tests.
|
2015-10-26 07:53:51 -05:00 |
|
|
Jeremy Abbott
|
eeb14075bb
|
Creates initial PUT /user test
|
2015-10-25 22:58:10 -05:00 |
|