Jim LAURIE
|
b79b88b55c
|
Merge branch 'master' into patch-1
|
2019-01-15 11:16:24 +01:00 |
|
Jim LAURIE
|
2b4ad00095
|
Merge pull request #2590 from denisinvader/admin-logout-component-intl
Add intl support in logout component
|
2019-01-14 14:33:25 +01:00 |
|
Jim LAURIE
|
45acd75d1c
|
Merge branch 'master' into admin-logout-component-intl
|
2019-01-14 14:33:07 +01:00 |
|
Jim LAURIE
|
c1d4f5a1c3
|
Merge pull request #2612 from strapi/documentation-link
Add Documentation and Help links
|
2019-01-14 09:58:00 +01:00 |
|
Jim LAURIE
|
071e0e0344
|
Merge branch 'master' into documentation-link
|
2019-01-14 09:57:51 +01:00 |
|
Jim LAURIE
|
325fe9f1bd
|
Merge pull request #2618 from AndroAmater/patch-1
Update graphql.md
|
2019-01-13 18:12:13 +01:00 |
|
AndroAmater
|
0b5421dc29
|
Update graphql.md
"Lower than or equal to" repeats twice so on line 197 it says "`<field>_gte`: Lower than or equal to.
|
2019-01-12 19:12:46 +01:00 |
|
Jim LAURIE
|
39f4d8884f
|
Merge pull request #2597 from derrickmehaffy/enhancement/prtemplate
Update PR Template with database testing checks
|
2019-01-11 12:48:33 +01:00 |
|
Jim LAURIE
|
2ac633e8b2
|
Merge branch 'master' into enhancement/prtemplate
|
2019-01-11 12:48:26 +01:00 |
|
Jim LAURIE
|
1688641bc7
|
Update style
|
2019-01-11 12:46:14 +01:00 |
|
Jim LAURIE
|
20e30a2e74
|
Merge pull request #2537 from pragone/patch-1
Fix query building in user-permissions/services/Provider.js
|
2019-01-11 10:55:56 +01:00 |
|
Jim LAURIE
|
4bffe2749c
|
Remove error log
We will work on a complete logs tag plan in the future.
|
2019-01-11 10:55:21 +01:00 |
|
Paolo Ragone
|
0ae11d661a
|
Merge remote-tracking branch 'origin/master' into patch-1
|
2019-01-11 22:53:55 +13:00 |
|
Paolo Ragone
|
d19ad83390
|
Merge branch 'patch-1' of github.com:pragone/strapi into patch-1
|
2019-01-11 22:53:15 +13:00 |
|
Paolo Ragone
|
b6fc268297
|
Fixed bug following recommendation
|
2019-01-11 22:52:28 +13:00 |
|
Paolo Ragone
|
b3ebf8e736
|
Merge remote-tracking branch 'origin/master' into patch-1
|
2019-01-11 22:50:19 +13:00 |
|
Jim LAURIE
|
999b3d579e
|
Merge pull request #2445 from jacargentina/fix-boom-duplicate-error
Avoid duplicating the message when wrapping errors with Bom
|
2019-01-10 18:09:32 +01:00 |
|
Jim LAURIE
|
6bda031376
|
Merge branch 'master' into fix-boom-duplicate-error
|
2019-01-10 18:03:35 +01:00 |
|
Jim LAURIE
|
4a1270f17e
|
Merge pull request #2500 from bearjaws/models-documentation-index
Updated documentation for model indexing
|
2019-01-10 16:45:26 +01:00 |
|
Jim LAURIE
|
3b94faf514
|
Merge branch 'master' into models-documentation-index
|
2019-01-10 16:45:18 +01:00 |
|
Jim LAURIE
|
dedd2551c1
|
Add mongo support
|
2019-01-10 16:45:02 +01:00 |
|
Pierre Burgy
|
1533657015
|
Add Strapi in powered by sentence
|
2019-01-10 16:41:13 +01:00 |
|
Pierre Burgy
|
934d2a3739
|
Add Documentation and Help links
|
2019-01-10 16:11:58 +01:00 |
|
Paolo Ragone
|
2283e38996
|
Merge branch 'master' into patch-1
|
2019-01-10 22:42:25 +13:00 |
|
Jim LAURIE
|
732fcff747
|
Merge pull request #2565 from jgreene/master
Update inquirer version to resolve Windows cli hang
|
2019-01-09 16:21:59 +01:00 |
|
Jim LAURIE
|
1090c8f113
|
Merge branch 'master' into master
|
2019-01-09 16:20:11 +01:00 |
|
Jim LAURIE
|
04a11ac18f
|
Merge pull request #2518 from abdonrd/fix-gae-deploy
Avoid write files if not development environment
|
2019-01-09 15:55:36 +01:00 |
|
Jim LAURIE
|
5b259487f0
|
Merge branch 'master' into fix-gae-deploy
|
2019-01-09 15:55:27 +01:00 |
|
Jim LAURIE
|
1fc996e33a
|
Merge pull request #2572 from mirazmamun/patch-1
Update deployment guide with helpful hint
|
2019-01-09 14:36:28 +01:00 |
|
Jim LAURIE
|
e66e7e3052
|
Merge branch 'master' into patch-1
|
2019-01-09 14:34:28 +01:00 |
|
Jim LAURIE
|
e41948de3f
|
Add setting for production environment
|
2019-01-09 14:19:39 +01:00 |
|
Jim LAURIE
|
e6a816ecae
|
Merge pull request #2571 from strapi/fix/#2555
Fix Create new role bug related to permissions missing
|
2019-01-08 14:43:03 +01:00 |
|
Jim LAURIE
|
c4a8a4eb4e
|
Merge branch 'master' into fix/#2555
|
2019-01-08 14:42:34 +01:00 |
|
DMehaffy
|
e08d8a2fb1
|
Update PR Template with database testing checks
|
2019-01-08 05:49:28 -07:00 |
|
Jim LAURIE
|
ddcf26ddd4
|
Merge pull request #2594 from trevorkirpaul/bugfix/documentation
Small grammatical fix
|
2019-01-08 12:32:16 +01:00 |
|
Trevor Kirpaul
|
c660ac57b2
|
fixed grammar in Documentation withing the 'guides' section on the 'filters' page
|
2019-01-07 22:42:40 -05:00 |
|
Jim LAURIE
|
8bbccad862
|
Merge pull request #2556 from chaitanyya/feature/998
Custom timestamp column names in database
|
2019-01-07 15:13:16 +01:00 |
|
invader
|
aba68be9d4
|
admin: remove defaultMessages in Logout component (now keys defined in all locales)
|
2019-01-07 02:10:11 +03:00 |
|
invader
|
e34be57d52
|
admin: AdminPage container - define prop types for getAdminData
|
2019-01-07 02:10:01 +03:00 |
|
invader
|
8e87f42289
|
admin: add logout component translation keys to every locale (google translate)
|
2019-01-07 02:09:50 +03:00 |
|
invader
|
dbd1d68ccc
|
admin: add intl support in Logout component and add ru translations
|
2019-01-07 02:09:38 +03:00 |
|
Jim LAURIE
|
6a3d2daac1
|
Merge branch 'master' into feature/998
|
2019-01-06 15:27:11 +01:00 |
|
Jim LAURIE
|
ab80eff34b
|
Merge pull request #2585 from strapi/remove-relations-route-bookshelf
Remove relations route from bookshelf template
|
2019-01-06 15:20:49 +01:00 |
|
Jim LAURIE
|
a23fe2c307
|
Remove relations route from bookshelf template
|
2019-01-06 15:17:59 +01:00 |
|
Jim LAURIE
|
b0434c9ea7
|
Merge pull request #2584 from strapi/migration-jwt
Add migration of jwt.json file
|
2019-01-06 14:04:51 +01:00 |
|
Jim LAURIE
|
279cbc68e2
|
Merge branch 'master' into migration-jwt
|
2019-01-06 14:04:43 +01:00 |
|
Jim LAURIE
|
2b3af8300c
|
Add migration of jwt.json file
|
2019-01-06 14:00:04 +01:00 |
|
Jim LAURIE
|
5a54581b34
|
Merge pull request #2583 from strapi/logo/documentation
Add logo to documentation plugin
|
2019-01-05 16:54:53 +01:00 |
|
Aurélien Georget
|
d142b02f61
|
Add logo to documentation plugin
|
2019-01-05 16:53:05 +01:00 |
|
Paolo Ragone
|
2a1cb510b9
|
Merge branch 'master' into patch-1
|
2019-01-05 09:40:58 +13:00 |
|