Jim LAURIE
cff5c248a9
Merge branch 'master' into fix-cors-option
2018-06-04 12:06:24 +02:00
Johann Pinson
8884a81994
feat(plugin): add enum icon inside table row
2018-06-04 12:05:17 +02:00
Johann Pinson
e594f311f7
feat(plugin): add enumeration to content type builder
2018-06-04 11:57:14 +02:00
Jim LAURIE
3d3d75b135
Merge branch 'master' into test-suits
2018-06-03 20:59:57 +02:00
Jim Laurie
8085a2deaf
Update oneToOne test with id
2018-06-03 20:46:43 +02:00
Jim LAURIE
6bf7542dc0
Merge pull request #1310 from nurikabe/patch-3
...
Specify MongoDB >= 2.6
2018-06-03 14:53:35 +02:00
Evan Owens
238b3f9b4a
Specify MongoDB >= 2.6
...
Need to use MongoDB >= 2.6 otherwise get wire version errors on start:
```
UnhandledPromiseRejectionWarning: MongoError: Server at 127.0.0.1:27017 reports wire version 0, but this version of Node.js Driver requires at least 2 (MongoDB2.6).
```
2018-06-01 23:57:06 -04:00
Evan Owens
321d9ae47c
Left-align form labels in Edge
2018-06-01 21:21:11 -04:00
soupette
07583f27dc
Design TableDelete
2018-06-01 17:43:14 +02:00
soupette
3f548f8cc5
Init bulk actions
...
Design custom input checkbox
2018-06-01 16:58:53 +02:00
Jim LAURIE
32158a20f1
Merge pull request #1302 from strapi/fix-add-ct
...
Fix add multi column for mysql
2018-06-01 16:07:38 +02:00
Jim LAURIE
d515177c4a
Merge branch 'master' into fix-add-ct
2018-06-01 15:49:57 +02:00
Jim Laurie
f284c5d3e0
Fix PR feedback
2018-06-01 15:49:08 +02:00
Johann Pinson
eda412785f
feat(graphql): generate default name for Enum if not specified
2018-06-01 15:28:18 +02:00
soupette
78c9c8b936
Merge branch 'master' of github.com:strapi/strapi into content-manager-filters
2018-06-01 14:55:12 +02:00
soupette
71b017468d
Fix PR feedback
2018-06-01 14:51:12 +02:00
Jim Laurie
676334d03d
Launch test with mongo postgres and mysql
2018-06-01 14:31:30 +02:00
Jim LAURIE
eef8478533
Merge pull request #1279 from kamalbennani/bugfix/graphql-returns-empty-array-when-entities-are-not-hosted-by-the-model
...
GraphQL returns empty array when entities are not hosted by the model
2018-06-01 11:51:25 +02:00
Jim LAURIE
16c958f32f
Merge branch 'master' into bugfix/graphql-returns-empty-array-when-entities-are-not-hosted-by-the-model
2018-06-01 11:37:58 +02:00
Jim LAURIE
65d586b3d4
Merge pull request #1299 from strapi/fix-boolean-mysql
...
Convert 1/0 to true/false for mysql
2018-06-01 11:37:44 +02:00
Jim LAURIE
5199273be2
Merge branch 'master' into fix-boolean-mysql
2018-06-01 11:20:35 +02:00
Jim LAURIE
d55749cde2
Merge pull request #1307 from okaris/count-route-controller-service-bookshelf
...
Added count to api template for bookshelf
2018-06-01 10:58:08 +02:00
Okaris
d5cca40270
Added count to api template for bookshelf
2018-06-01 08:16:54 +03:00
Salem
3913e0d582
Create ar.json
2018-06-01 01:32:36 +03:00
Salem
82508698d3
Create ar.json
2018-06-01 01:10:51 +03:00
Austin Bratcher
ddc01eb27b
Update to add dynamic settings to email plugin
...
Email plugin now functions more like the upload plugin. Users can go to the plugins page, click on the settings cog for the email, and switch between providers or change settings. The default provider is strapi-email-sendmail. Extra providers can be added by installing strapi-email-mailgun or strapi-email-sendgrid.
2018-05-31 14:29:00 -05:00
Austin Bratcher
cbb97f22eb
Merge remote-tracking branch 'Strapi-Master/master'
2018-05-31 14:01:31 -05:00
Jim LAURIE
81488b86f0
Merge pull request #1305 from strapi/remove-info-db-ctb
...
Remove warning in content-type-builder when creating tables
2018-05-31 19:53:14 +02:00
Jim LAURIE
524999e451
Merge branch 'master' into remove-info-db-ctb
2018-05-31 19:04:12 +02:00
Kamal Bennani Bouchiba
ff2543652f
Merge branch 'master' into bugfix/graphql-returns-empty-array-when-entities-are-not-hosted-by-the-model
2018-05-31 17:06:45 +02:00
soupette
7f4488f65f
Remove NoTableWarning int ctb since we automatically creates table
2018-05-31 16:14:08 +02:00
Jim LAURIE
f9b65b2e83
Merge pull request #1170 from marcostephan/third-party-windows-auth
...
Fix third party auth providers always disabled on windows
2018-05-31 16:06:31 +02:00
soupette
44cff94989
Fix conflicts
2018-05-31 15:31:46 +02:00
soupette
ff1eaa4b4f
Disable autocomplete
2018-05-31 15:24:22 +02:00
soupette
e0ee3bb2a1
Fix margin in FilterOptions with bool select
2018-05-31 15:14:38 +02:00
soupette
b559f62e25
Fix boolean filters for mysql
2018-05-31 15:06:20 +02:00
Jim LAURIE
a9d725c74c
Merge branch 'master' into third-party-windows-auth
2018-05-31 14:54:51 +02:00
Jim LAURIE
b52f68a3ef
Merge pull request #1293 from okaris/count-route-controller-service
...
Add count route on generated API
2018-05-31 14:50:19 +02:00
Jim LAURIE
7a1e050526
Merge branch 'master' into count-route-controller-service
2018-05-31 14:33:35 +02:00
Jim LAURIE
033127105d
Merge pull request #1276 from johannpinson/patch-content-manager
...
Improve <Ico> component for handle click if specified
2018-05-31 14:27:50 +02:00
soupette
b8f0b327b7
Empty layout
2018-05-31 14:14:01 +02:00
soupette
2c262f7d19
Fix build css
2018-05-31 13:57:08 +02:00
Jim LAURIE
1d44f6c271
Merge branch 'master' into patch-content-manager
2018-05-31 13:53:07 +02:00
Jim LAURIE
6d3d03df8d
Merge pull request #1287 from johannpinson/patch-graphql-required
...
Add `!` flag for GraphQL and non-nullable field
2018-05-31 13:52:33 +02:00
Jim LAURIE
aeff4d663c
Merge branch 'master' into patch-graphql-required
2018-05-31 12:22:18 +02:00
Jim Laurie
5d8a24a010
Fix add multi column for mysql fix #1241
2018-05-31 12:03:24 +02:00
Salem
3146cadf30
Create ar.json
2018-05-31 01:12:42 +03:00
Salem
e6b6c67b00
Create ar.json
2018-05-31 01:05:33 +03:00
Salem
967f6e3d4b
Create ar.json
2018-05-31 01:04:17 +03:00
Salem
e6b812a357
Update languages.json
2018-05-31 01:03:12 +03:00
