33691 Commits

Author SHA1 Message Date
Jim LAURIE
db59944941
Merge pull request #398 from strapi/fix/menulinks
Fix/menulinks
2017-12-21 14:36:46 +01:00
Jim Laurie
a8c1f4bb6f Merge branch 'master' of https://github.com/strapi/strapi into fix/menulinks 2017-12-21 14:20:12 +01:00
Jim LAURIE
e1cbce318a
Merge pull request #397 from strapi/fix/install
Fix/install
2017-12-21 14:18:31 +01:00
Jim Laurie
d3ba0b5f97 Merge branch 'master' of https://github.com/strapi/strapi into fix/install 2017-12-21 14:06:24 +01:00
Jim LAURIE
3b45e25b5a
Merge pull request #399 from strapi/hotfix/findOne
Fix filter findOne params
2017-12-21 14:05:40 +01:00
Jim Laurie
b2aecbe240 Merge branch 'master' of https://github.com/strapi/strapi into hotfix/findOne 2017-12-21 13:47:18 +01:00
Jim LAURIE
a19a445d73
Merge pull request #394 from strapi/fix/models-functions
Fix models functions life cycle
2017-12-21 13:46:44 +01:00
Jim Laurie
e5d15fdd0b Merge branch 'master' of https://github.com/strapi/strapi into fix/models-functions 2017-12-21 13:31:57 +01:00
Jim LAURIE
d3b68aa5c8
Merge pull request #400 from strapi/documentation/filter_sort
Improve documentation for sorting filters
2017-12-21 13:31:02 +01:00
Aurelsicoko
6baf2e5090 Build admin during setup 2017-12-20 18:34:33 +01:00
Aurelsicoko
18de7cabc2 Update path to deployment section 2017-12-20 17:21:46 +01:00
Aurelsicoko
3c7efa07f8 Add new setup command and deployment section in the documentation 2017-12-20 17:20:44 +01:00
Aurelsicoko
ca7f12e985 Improve documentation for sorting filters 2017-12-20 16:06:02 +01:00
Aurelsicoko
34763b0237 Display build warns and errors 2017-12-20 15:43:17 +01:00
Aurelsicoko
47f41820bf Fix registerPlugin condition 2017-12-20 13:57:24 +01:00
Jim Laurie
252082f84e Fix filter findOne params 2017-12-20 13:45:53 +01:00
Aurelsicoko
963a09b3a3 Ignore dotfile during post-install and optimize plugins' middlewares load 2017-12-20 12:20:22 +01:00
cyril lopez
d616a4f7b6 Install plugin on port 1337 2017-12-20 11:23:50 +01:00
Aurelsicoko
8f36c10e1c Improve script setup 2017-12-19 21:23:20 +01:00
Aurelsicoko
beb1419fb8 Inject .gitignore during plugin install and improve admin setup script 2017-12-19 15:40:54 +01:00
Jim Laurie
987fbcffa7 Also restore remove function 2017-12-19 14:52:13 +01:00
Jim Laurie
d773c849a4 Fix before and after remove data life cycle functions 2017-12-19 14:47:48 +01:00
Aurelsicoko
df912952e9 Be able setup admin and start on generated project 2017-12-19 12:26:30 +01:00
cyril lopez
05b699f557
Merge pull request #388 from strapi/fix/ctm-model-entries
Fix model entry count when deleting an entry and handle singular for …
2017-12-18 15:33:27 +01:00
cyril lopez
bc25ca3870 Fix typo 2017-12-18 15:18:03 +01:00
cyril lopez
c0e032969c Fix model entry count when deleting an entry and handle singular for entries number 2017-12-18 15:08:25 +01:00
Aurelsicoko
42fd5a6215 Merge branch 'relation/users' of github.com:strapi/strapi into relation/users 2017-12-18 14:24:59 +01:00
Aurelsicoko
1a8eed9a5e Update documentation to explain table/collection naming for plugins 2017-12-18 14:23:59 +01:00
Aurelsicoko
b208b0aa92 Change table naming for plugins 2017-12-18 14:07:35 +01:00
cyril lopez
1b5a2396fb Add autoFocus to ctm edit view 2017-12-18 13:34:00 +01:00
cyril lopez
a976284786 Add required fields to user model 2017-12-18 13:31:33 +01:00
cyril lopez
f0ffee869e Update branch
Merge branch 'relation/users' of github.com:strapi/strapi into relation/users
2017-12-18 12:07:22 +01:00
cyril lopez
cbe4202742 Add tab nav to popuprelation 2017-12-18 12:05:52 +01:00
Aurelsicoko
1f989d8537 Remove capitalize on button too 2017-12-18 12:02:05 +01:00
Aurelsicoko
b881c9c63d Merge branch 'relation/users' of github.com:strapi/strapi into relation/users 2017-12-18 11:58:18 +01:00
Aurelsicoko
c6a1dcf5cd Only uppercase first letter of labels 2017-12-18 11:57:09 +01:00
cyril lopez
09f9805680 Fix ctb notification error 2017-12-18 11:48:52 +01:00
cyril lopez
5b84b38d74 Update branch
Merge branch 'relation/users' of github.com:strapi/strapi into relation/users
2017-12-18 11:46:09 +01:00
cyril lopez
788894cf3a Prevent user from editing not configurable attr 2017-12-18 11:45:02 +01:00
Aurelsicoko
b632e4e17c Fix API creation with new configurable key 2017-12-18 11:40:26 +01:00
Aurelsicoko
39d21388a3 Merge branch 'relation/users' of github.com:strapi/strapi into relation/users 2017-12-16 18:30:16 +01:00
Aurelsicoko
92c891e341 Improve error when association fail and handle configurable key in models 2017-12-16 18:26:04 +01:00
cyril lopez
b619632662 Update branch
Merge branch 'master' of github.com:strapi/strapi into relation/users
2017-12-16 17:46:05 +01:00
cyril lopez
669cdcf104
Merge pull request #384 from strapi/fix/ctm-back-header
Fix ctm editview backheader
2017-12-16 17:45:00 +01:00
cyril lopez
61392cc476 Add install plugin route 2017-12-16 17:35:16 +01:00
Aurelsicoko
6d8b81ecbd Resolve conflicts 2017-12-16 17:08:58 +01:00
Aurelsicoko
6ac1bca417 Update algorithm to correctly add, edit and delete relationships between models and plugins' models 2017-12-16 17:03:34 +01:00
cyril lopez
4726c52a9c Change install plugin design 2017-12-16 16:51:23 +01:00
cyril lopez
f43d7e75cc Update branch
Merge branch 'master' of github.com:strapi/strapi into install-plugins
2017-12-16 14:57:19 +01:00
cyril lopez
83500c4e3b Update branch
Merge branch 'master' of github.com:strapi/strapi into fix/ctm-back-header
2017-12-16 14:54:40 +01:00