Udschal Imanov
8095cc3e03
Merge branch 'master' into fix-reload
...
* master:
Keep first set permissions & remove duplicate
3.0.0-alpha.12.2
Improve the check of the database tables
Add strapi-knex in generated project dependencies
Avoid to loose relationship when editing from the many side
Fix loosing of morph relations on update in CM with Bookshelf
Fix loose many dominant
Remove the return to avoid the loop break
Fix single upload with Bookshelf
Fix entry create relations
Remove duplicate permissions
Fixes #886
add translations for EN and DE for authenticationDatabase and SSl in admin panel
add authenticationDatabase and SSL to admin panel
2018-05-03 22:24:30 +02:00
Jim LAURIE
caff62850a
Merge pull request #1103 from strapi/fix/permissions
...
Fix permissions disappear from UI
2018-05-03 16:56:21 +02:00
Jim LAURIE
58deb0c3e9
Merge branch 'master' into fix/permissions
2018-05-03 16:46:06 +02:00
Jim LAURIE
af7a3c474b
Merge pull request #1079 from stephledev/master
...
Add authSource & ssl options to the admin panel
2018-05-03 16:41:06 +02:00
Aurelsicoko
451ad266fb
Keep first set permissions & remove duplicate
2018-05-03 16:26:57 +02:00
Jim LAURIE
e328338181
Merge branch 'master' into master
2018-05-03 16:18:11 +02:00
Jim LAURIE
4db33cec4a
Merge pull request #1081 from strapi/fix/886
...
Remove attribute plugin in model
2018-05-03 16:09:42 +02:00
Jim LAURIE
10eee03393
Merge branch 'master' into fix/886
2018-05-03 15:59:11 +02:00
Jim LAURIE
3c61ed106a
Merge pull request #1100 from strapi/3.0.0-alpha.12.2
...
3.0.0-alpha.12.1
2018-05-03 14:19:16 +02:00
Jim Laurie
c491c61a97
3.0.0-alpha.12.2
2018-05-03 14:15:21 +02:00
Jim LAURIE
e67da24554
Merge pull request #1098 from strapi/fix/knex
...
Add strapi-knex in generated project dependencies
2018-05-03 12:46:39 +02:00
Aurelsicoko
54c5afa311
Merge branch 'fix/knex' of github.com:strapi/strapi into fix/knex
2018-05-03 12:46:11 +02:00
Aurelsicoko
add8d47a86
Improve the check of the database tables
2018-05-03 12:45:02 +02:00
Jim LAURIE
8a5e3a59bb
Merge branch 'master' into fix/knex
2018-05-03 12:44:20 +02:00
Jim LAURIE
67a96da6d6
Merge pull request #1097 from strapi/fix/many-to-one
...
Avoid to loose relationship when editing from the many side
2018-05-03 12:35:42 +02:00
Aurelsicoko
120e10ef65
Add strapi-knex in generated project dependencies
2018-05-03 12:35:32 +02:00
Aurelsicoko
c67e2ef6d4
Avoid to loose relationship when editing from the many side
2018-05-03 12:08:35 +02:00
Jim LAURIE
750167aad4
Merge pull request #1092 from strapi/upload/bookshelf
...
Fix loosing of morph relations on update in CM with Bookshelf
2018-05-03 10:08:56 +02:00
Udschal Imanov
ae8023c52d
fix strapi.reload.isWatching === undefined
2018-05-02 22:16:13 +02:00
Jim LAURIE
902ea63c05
Merge branch 'master' into upload/bookshelf
2018-05-02 17:57:24 +02:00
Jim LAURIE
899faecfa0
Merge pull request #1091 from strapi/fix-ctb-relations-many
...
Fix loose many to many dominant
2018-05-02 17:55:56 +02:00
Aurelsicoko
e9202c7a24
Fix loosing of morph relations on update in CM with Bookshelf
2018-05-02 17:52:23 +02:00
Jim LAURIE
ddff1ab3be
Merge branch 'master' into fix-ctb-relations-many
2018-05-02 17:43:55 +02:00
Jim Laurie
c944cb9e26
Fix loose many dominant
2018-05-02 17:41:09 +02:00
Jim LAURIE
19f360a43a
Merge pull request #1090 from strapi/upload/bookshelf
...
Fix when there are many manyMorphOne relations in the model
2018-05-02 17:18:25 +02:00
Aurelsicoko
2fe530e334
Merge branch 'master' of github.com:strapi/strapi into upload/bookshelf
2018-05-02 17:08:07 +02:00
Aurelsicoko
e3fc6ad30b
Remove the return to avoid the loop break
2018-05-02 17:07:03 +02:00
Jim LAURIE
fc6e126165
Merge pull request #1089 from strapi/fix-cm-entry-relations
...
Fix entry create relations
2018-05-02 17:06:32 +02:00
Jim LAURIE
e6a14367f3
Merge branch 'master' into fix-cm-entry-relations
2018-05-02 17:04:41 +02:00
Jim LAURIE
63bc6bf5c0
Merge pull request #1087 from strapi/upload/bookshelf
...
Fix single upload with Bookshelf
2018-05-02 17:04:25 +02:00
Aurelsicoko
ce3d52d73e
Fix single upload with Bookshelf
2018-05-02 16:15:36 +02:00
Jim Laurie
3ea2c8a775
Fix entry create relations
2018-05-02 15:39:12 +02:00
Aurelsicoko
f62c5f52fc
Remove duplicate permissions
2018-05-02 11:40:42 +02:00
Aurelsicoko
a6fd8fc460
Fixes #886
2018-05-01 14:36:17 +02:00
Jim LAURIE
11a92c8f61
Merge pull request #1080 from strapi/delete-logs
...
Delete log
2018-05-01 14:31:44 +02:00
Jim LAURIE
806904c498
Delete log
2018-05-01 14:31:26 +02:00
stephledev
d924db42fc
Merge branch 'master' of github.com:strapi/strapi
2018-05-01 13:04:10 +02:00
stephledev
760a6d9a9a
add translations for EN and DE for authenticationDatabase and SSl in admin panel
2018-05-01 12:59:28 +02:00
stephledev
5e5815e309
add authenticationDatabase and SSL to admin panel
2018-05-01 12:56:51 +02:00
Jim LAURIE
238c0c8141
Merge pull request #1072 from strapi/fix-sort-default
...
Set asc as default for sorting
2018-05-01 12:00:06 +02:00
Jim LAURIE
d92bd283b6
Merge branch 'master' into fix-sort-default
2018-05-01 11:50:13 +02:00
Jim LAURIE
fa0ec2e016
Merge pull request #1070 from strapi/fix-1059
...
Fix relation detection OneToManyMorph for OneToMany
2018-05-01 11:49:53 +02:00
Jim LAURIE
36a60be839
Merge branch 'master' into fix-1059
2018-05-01 11:38:29 +02:00
Jim LAURIE
dded34eae9
Merge pull request #1068 from strapi/fix-ctb
...
Fix open modal relation bug
2018-05-01 11:37:56 +02:00
Jim LAURIE
a3d9454ee0
Merge branch 'master' into fix-ctb
2018-05-01 11:29:31 +02:00
Jim LAURIE
b1fec9c02f
Merge pull request #1067 from strapi/improve-dev-setup
...
Add steps in the CONTRIBUTING_GUIDE and plugin development sections
2018-05-01 11:29:15 +02:00
Jim LAURIE
15e62b477e
Merge branch 'master' into improve-dev-setup
2018-05-01 11:20:27 +02:00
Jim LAURIE
1e41c08378
Merge pull request #993 from zhuang17/add_simply_chinese_translation
...
Add Simplified Chinese translation
2018-05-01 11:20:09 +02:00
Jim Laurie
ba16a0b7c5
Set asc as default
2018-04-30 17:48:43 +02:00
Jim Laurie
596adb5f61
Fix 1059
2018-04-30 17:14:13 +02:00
