29765 Commits

Author SHA1 Message Date
Aurélien Georget
dc3eb2d748 Merge branch 'alpha.4' of github.com:strapi/strapi into alpha.4 2017-04-03 10:03:11 +02:00
Jim Laurie
4645e7fd00 Map columnName to create relations 2017-03-24 12:03:14 +01:00
Pierre Burgy
b0578d2c07 Basic list and detail display for content manager 2017-03-20 22:08:49 +01:00
Pierre Burgy
d39c72a542 Enable active links in left menu 2017-03-18 17:59:36 +01:00
Pierre Burgy
09302af45e Display content in content manager home page 2017-03-18 17:38:55 +01:00
Pierre Burgy
e13c612509 Load and display models in left menu 2017-03-18 17:34:00 +01:00
Pierre Burgy
ef7ad188f2 Add port setting for knex 2017-03-15 16:45:53 +01:00
Aurélien Georget
68488ca48c Fix lifecycle callback for Bookshelf 2017-03-15 13:47:02 +01:00
Pierre Burgy
1228cee998 Fix missing files admin issue 2017-03-15 11:48:56 +01:00
Pierre Burgy
692f1308ab Fix scss variable path 2017-03-14 16:09:53 +01:00
Pierre Burgy
11a235ae50 App postcss config in settings manager 2017-03-14 16:07:25 +01:00
Aurélien GEORGET
c9441292fd Merge pull request #190 from strapi/improvement/policies
Improvement/policies
2017-03-14 14:39:42 +01:00
Pierre Burgy
0cac44a17b Merge branch 'alpha.4' of https://github.com/strapi/strapi into improvement/policies 2017-03-14 14:32:25 +01:00
Aurélien GEORGET
0c12744256 Merge pull request #191 from strapi/improvement/generators
Improvement/generators
2017-03-14 14:32:11 +01:00
Pierre Burgy
c753ca9667 Merge branch 'alpha.4' of https://github.com/strapi/strapi into improvement/generators 2017-03-14 14:23:12 +01:00
Aurélien GEORGET
1b5b0b0003 Merge pull request #193 from strapi/fix/dependencies
Fix/dependencies
2017-03-14 14:22:16 +01:00
Aurélien Georget
8a2c13cae7 Use latest version koa-joi-router 2017-03-14 14:09:52 +01:00
Aurélien Georget
efa4983608 Update setup 2017-03-14 13:56:32 +01:00
Pierre Burgy
d4468ba89b Use shelljs for setup script 2017-03-14 12:25:39 +01:00
Aurélien Georget
c8acd6fcef Disabled karma tests for dashboard 2017-03-09 16:22:09 +01:00
Aurélien Georget
77051bde19 Update dependencies and fix setup 2017-03-09 15:25:15 +01:00
Pierre Burgy
1889b2adc7 Fix format for API generator 2017-03-09 14:26:47 +01:00
Pierre Burgy
26710f42cd Use lodash get function to keep consistency in code 2017-03-09 13:56:14 +01:00
Pierre Burgy
0d504dd266 Remove useless parameter for plugin generator 2017-03-07 18:30:33 +01:00
Pierre Burgy
22cbc321eb Merge branch 'alpha.4' of https://github.com/strapi/strapi into improvement/generators 2017-03-07 16:02:31 +01:00
Pierre Burgy
8cdb09fe41 Merge branch 'alpha.4' of https://github.com/strapi/strapi into improvement/policies 2017-03-07 15:07:15 +01:00
Pierre Burgy
5bc7803b03 Set policies in config object 2017-03-06 23:56:51 +01:00
Aurélien Georget
a5a1d98961 Add TTL to Redis session and expose session in ctx.state 2017-03-06 11:47:33 +01:00
Pierre Burgy
bd20e9764a Plugin's policies can be used from app APIs 2017-03-03 12:48:19 +01:00
Pierre Burgy
2f018a0521 Implement logic for plugin policies 2017-03-03 11:33:51 +01:00
Pierre Burgy
010ee20731 Fix policy generator 2017-03-02 12:28:06 +01:00
Pierre Burgy
5c23d8325a Implement logic for api policies 2017-03-02 12:25:20 +01:00
Pierre Burgy
f03c27724a Implement logic for global policies 2017-03-02 12:18:13 +01:00
Pierre Burgy
86baa4dc65 Fix issue that was preventing the usage of mongoose 2017-03-02 11:07:41 +01:00
Pierre Burgy
0322eddff1 Merge branch 'alpha.4' of https://github.com/strapi/strapi into improvement/generators 2017-03-02 11:02:56 +01:00
Pierre Burgy
08fc750f9f Fix conflicts 2017-03-02 10:58:41 +01:00
Aurélien Georget
957cc17d0a Allow to change Bookshelf pivot prefix 2017-02-15 14:43:09 +01:00
Aurélien Georget
62174c2a24 Support pivots for Bookshelf 2017-02-15 13:53:23 +01:00
Aurélien Georget
99e0c3b33f Fix restart when there is not exit code 2017-02-14 14:43:30 +01:00
Aurélien Georget
dff292593e Merge branch 'alpha.4' of github.com:strapi/strapi into alpha.4 2017-02-14 14:37:04 +01:00
Aurélien Georget
0a2db78275 Process exit when Redis connection failed 2017-02-14 14:34:01 +01:00
Pierre Burgy
353252d68c Add basic plugin generator 2017-02-14 01:18:07 +01:00
Pierre Burgy
17135196a5 Improve arguments handling for generators 2017-02-14 01:10:37 +01:00
Aurélien GEORGET
eab6cb08e9 Merge pull request #183 from v3yr0n/master
Template and mongoose fix
2017-02-06 14:02:55 +01:00
André Gonçalves
006d951e34 Fixed service template to add the capital letter and fixed issue that was preventing the usage of mongoose 2017-02-03 16:36:59 +00:00
Aurélien Georget
eade0d37c7 Merge branch 'master' of github.com:strapi/strapi into alpha.4 2017-02-03 12:39:12 +01:00
Pierre Burgy
872dfebc09 Fix config dictionary build 2017-02-03 12:24:01 +01:00
Aurélien Georget
f7b89f7e35 Add disabledCaching options 2017-02-03 11:55:31 +01:00
Aurélien Georget
007164ec4b Typo 2017-02-03 11:42:14 +01:00
Aurélien Georget
c76c4a9cd2 Provide new util caching method for strapi-redis 2017-02-01 17:17:06 +01:00