yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,903 Commits 127 Branches 497 Tags
Commit Graph

1282 Commits

Author SHA1 Message Date
Alexandre Bodin
50b371b853 Merge branch 'beta' into tech/core-api 2019-04-19 08:26:13 +02:00
soupette
ff31c75c47 Add watch mode to rollup 2019-04-19 00:14:50 +02:00
soupette
5dd8106aa0 Move css import to admin and build ctm 2019-04-18 19:54:21 +02:00
Alexandre Bodin
0d72faaddc Merge branch 'master' into beta 2019-04-18 18:47:48 +02:00
soupette
8fb7608226 Use build for ctb upload us but not stm 2019-04-18 17:50:23 +02:00
soupette
862288d3d9 Run build in dev mode 2019-04-18 14:59:49 +02:00
soupette
06eeca0f65 Build upload 2019-04-18 01:10:38 +02:00
soupette
f14ad13481 Build users-permissions plugin 2019-04-18 00:32:21 +02:00
Jim LAURIE
84f951e2a5
Fix connection name 2019-04-17 17:05:25 +02:00
Jim LAURIE
99477c4b80 Fix #3147 join multi database 2019-04-17 15:13:05 +02:00
soupette
554fc7654a Clean files 2019-04-17 11:45:55 +02:00
soupette
c7b7fddaba Load ctb 2019-04-16 18:03:50 +02:00
soupette
61f115fbee Load users and email 2019-04-16 16:55:53 +02:00
Jim LAURIE
fd87e6353e 3.0.0-alpha.26 2019-04-16 11:13:14 +02:00
Alexandre Bodin
eb9e53028e Add yarn lock 2019-04-16 09:05:47 +02:00
Alexandre Bodin
87857b94be Implement strapi.queries for all models 2019-04-16 09:05:46 +02:00
Alexandre Bodin
eb7c4534f8 Exports schema.graphql in devmode, load extensions folder and run merge config and overwrites 2019-04-16 09:00:24 +02:00
Alexandre Bodin
9e9ff9907d Refactor strapi load 2019-04-16 08:50:22 +02:00
Abdón Rodríguez Davila
5429931b10 Move collectionName to the top as the generated API models 2019-04-12 15:01:05 +02:00
Abdón Rodríguez Davila
efb989dcfd
Enable timestamps option as default in the User & Permissions plugin 2019-04-12 14:57:17 +02:00
soupette
1544cdf877 Fix PR feedback 2019-04-09 18:35:49 +02:00
soupette
a2192c1dec Fix conflicts 2019-04-09 16:01:01 +02:00
soupette
c60457f3c7 Fix conflicts 2019-04-09 14:22:13 +02:00
soupette
e56e46e030 Split admin and users. 
Co-authored-by: lauriejim
 2019-04-09 12:09:03 +02:00
soupette
3c108fe555 Fix PR feedback 2019-04-08 20:04:30 +02:00
soupette
7027606a1d Merge branch 'master' of github.com:strapi/strapi into improve/ctb 2019-04-08 17:16:06 +02:00
soupette
e5393acf66 Merge branch 'front/admin-new-hook-architecture' of github.com:strapi/strapi into front/admin-new-hook-architecture-admin-rework 2019-04-08 16:20:21 +02:00
soupette
fb1c404f56 Merge branch 'front/admin-new-hook-architecture' of github.com:strapi/strapi into front/admin-new-hook-architecture-lifecycle 2019-04-08 13:53:31 +02:00
soupette
f37f740aba Fix PR feedback 2019-04-05 00:50:14 +02:00
soupette
59587d02cd Fix forgot password views 2019-04-03 17:26:31 +02:00
soupette
95f936c8ce Add Onboarding in new Admin container 2019-04-03 14:10:42 +02:00
soupette
e1977d28ca Add test to App container 2019-04-02 17:44:25 +02:00
soupette
be95294bdc Add lifecycles to all plugins 2019-04-02 14:17:01 +02:00
soupette
55ac5d5179 Add initializer container to all plugins 2019-04-02 14:06:44 +02:00
Alexandre Bodin
b93b4e105d Cleanup tests 2019-03-28 15:10:32 +01:00
Alexandre Bodin
3c70b18451 Update filtering documentation 2019-03-28 14:55:27 +01:00
Alexandre Bodin
3098309369 Use mongoose.find on simple queries for a perf boost 2019-03-26 14:57:02 +01:00
soupette
d2f50f7bae Fix relations 2019-03-25 19:08:17 +01:00
Alexandre Bodin
0c5b255e75 Fix graphql loaders and add some e2e graphql tests 2019-03-25 16:37:46 +01:00
Alexandre Bodin
f8e8928d8a Handle orWhere in mongo and format value / cast 2019-03-22 18:08:11 +01:00
Alexandre Bodin
d2db6b633f Mongo + graphql v1 2019-03-21 09:07:36 +01:00
Jim LAURIE
c5f3eb67ce Fix loose permissions with Mongo 2019-03-21 09:07:02 +01:00
Kamal Bennani
5c7dd886aa No longer use convertParams 2019-03-21 09:07:02 +01:00
Kamal Bennani
17d8eb36c0 Adapt User plugin to the new API 2019-03-21 09:06:06 +01:00
Kamal Bennani
e8c92fc3d7 Adapt Services to the new Mongoose API 2019-03-21 09:06:06 +01:00
Kamal Bennani
c93311557e Adapt Services to the new Bookshelf API 2019-03-21 09:05:42 +01:00
Jim LAURIE
2b678f2f0a 3.0.0-alpha.25.2 2019-03-15 23:32:36 +01:00
Jim LAURIE
54457aadd0 3.0.0-alpha.25.1 2019-03-15 18:02:32 +01:00
Jim LAURIE
a63afc888f 3.0.0-alpha.25 2019-03-14 12:08:21 +01:00
Alexandre Bodin
a0b45e2741 Add cypress run 2019-03-13 00:10:20 +01:00