7150 Commits

Author SHA1 Message Date
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
invader
7659bdb697 admin: update Russian translations in users and permissions plugin 2019-01-11 02:26:44 +03:00
invader
3a79e40080 Update Russian translations in the Content Manager plugin 2019-01-10 22:52:41 +03:00
invader
34f98dd851 plugin-content-manager: fix typo in Russian locale 2019-01-10 21:19:45 +03: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
e23129b051 Removed references to dead dialects 2019-01-10 23:39:32 +13:00
Paolo Ragone
2283e38996
Merge branch 'master' into patch-1 2019-01-10 22:42:25 +13:00
Paolo Ragone
994c270773 Merge branch 'update_knex' of github.com:pragone/strapi into update_knex 2019-01-10 22:24:24 +13:00
Paolo Ragone
5d7ce15078 Merge branch 'master' of github.com:strapi/strapi into update_knex 2019-01-10 22:24:15 +13:00
Paolo Ragone
bdf0a7c840
Merge branch 'master' into update_knex 2019-01-10 21:54:23 +13:00
Paolo Ragone
e998825b4d Added some documentation 2019-01-10 21:53:17 +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
Paolo Ragone
603f536d5e Updated knex 2019-01-09 23:24:45 +13:00
Paolo Ragone
803ce0bea0
Merge branch 'master' into lint_improvement 2019-01-09 21:25:44 +13:00
Liroo
40faec2845 "strapi new" mongo +srv prefix uri in command line args 2019-01-08 14:52:17 +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
Sajjad Shirazy
786ccbf7f7
bugfix: in production Playground doesn't load the schema 2019-01-08 13:10:18 +03:30
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
invader
cedf4a8cb6 admin: russian locale text improvements 2019-01-07 01:29:39 +03:00
invader
6d488931b1 admin: fix text in img preview for Russian locale 2019-01-07 01:14:33 +03:00
invader
a72b05f291 admin: better texts for russian locale 2019-01-07 00:21:25 +03:00
invader
ec899b3be4 admin russian locale: more typo 2019-01-06 23:41:12 +03:00
invader
fe7cef549d admin: update ru locale for home page welcome block 2019-01-06 22:20:14 +03:00
invader
71cac31e57 admin: fix typos and punctuation in ru locale 2019-01-06 21:44:52 +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