4810 Commits

Author SHA1 Message Date
Paolo Ragone
c72e4bd1e5
Merge branch 'master' into update_knex 2019-01-17 22:19:15 +13:00
Jim LAURIE
c3c24ca7ad 3.0.0-alpha.19 2019-01-16 11:49:16 +01:00
David Baxter
c01124388d
Incorrect params variable name in user update 2019-01-16 14:39:24 +11:00
Jim LAURIE
712e997c54
Merge branch 'master' into admin-russian-locale-fixes 2019-01-15 20:29:21 +01:00
Jim LAURIE
291793256e
Merge branch 'master' into master 2019-01-15 11:49:26 +01:00
Jim LAURIE
9246c856b3
Fix condition 2019-01-15 11:45:36 +01:00
Jim LAURIE
a11b4842fe
Apply the correct value by db 2019-01-15 11:26:26 +01:00
Paolo Ragone
b393f3edea
Merge branch 'master' into update_knex 2019-01-15 19:18:12 +13:00
Jim LAURIE
45acd75d1c
Merge branch 'master' into admin-logout-component-intl 2019-01-14 14:33:07 +01:00
Jim LAURIE
071e0e0344
Merge branch 'master' into documentation-link 2019-01-14 09:57:51 +01:00
invader
4b27e6f2e7 admin: rename 'Конструктор Типов Контента' to 'Типы контента' in left menu for Russian translation 2019-01-12 02:39:18 +03:00
invader
a85ea98e8b admin: update Russian translations in upload plugin 2019-01-12 02:25:27 +03:00
invader
9fe2f358d4 admin: update Russian translations for settings manager plugin 2019-01-12 02:22:45 +03:00
invader
6241c58f17 admin: fix updated Russian translation in documentation plugin 2019-01-12 01:59:22 +03:00
invader
421a8a482d admin: update Russian translation in email plugin 2019-01-12 01:55:36 +03:00
invader
ce7d927677 admin: translate documentation plugin to Russian 2019-01-12 01:50:52 +03:00
invader
2566e4477a admin: update Russian translations in content type builder plugin 2019-01-12 01:25:00 +03:00
invader
80e80c9788 Admin: "Типы Данных" -> "Типы Контента" in content-manager plugin Russian translations 2019-01-11 23:05:25 +03:00
Paolo Ragone
9559f19b77
Merge branch 'master' into update_knex 2019-01-12 08:38:18 +13:00
mohamead
4edd70d549 Fix connection issue with Heroku Postgres 2019-01-11 15:20:20 +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
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
6bda031376
Merge branch 'master' into fix-boom-duplicate-error 2019-01-10 18:03:35 +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
5d7ce15078 Merge branch 'master' of github.com:strapi/strapi into update_knex 2019-01-10 22:24:15 +13:00
Jim LAURIE
1090c8f113
Merge branch 'master' into master 2019-01-09 16:20:11 +01:00
Jim LAURIE
5b259487f0
Merge branch 'master' into fix-gae-deploy 2019-01-09 15:55:27 +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
Jim LAURIE
c4a8a4eb4e
Merge branch 'master' into fix/#2555 2019-01-08 14:42:34 +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
a23fe2c307 Remove relations route from bookshelf template 2019-01-06 15:17:59 +01:00
Jim LAURIE
279cbc68e2
Merge branch 'master' into migration-jwt 2019-01-06 14:04:43 +01:00