yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 10:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,708 Commits 121 Branches 507 Tags
Commit Graph

2708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aurelsicoko
a06336cdbb Update permissions from UI in database 2018-01-22 18:19:44 +01:00
Aurelsicoko
9daf29be78 Be able to retrieve role data with populate 2018-01-19 17:57:10 +01:00
Aurelsicoko
fa8976c98f Fix infinite login 2018-01-18 11:13:44 +01:00
Aurelsicoko
b84976fbbd Improve init action to check if there is an administrator 2018-01-17 19:22:35 +01:00
Aurelsicoko
4b9923b574 Fix typo 2018-01-17 19:00:36 +01:00
Aurelsicoko
d5390fd4aa Merge branch 'master' of github.com:strapi/strapi into update-roles-models 2018-01-17 18:52:51 +01:00
Aurelsicoko
4aa28a196e [WIP] Read and update roles & permissions using database 2018-01-17 18:50:12 +01:00
Aurélien GEORGET
10dfd71c84
Merge pull request #454 from strapi/install-plugin 
Install plugin
 2018-01-17 16:09:24 +01:00
Aurélien GEORGET
8ca63de5a9
Merge branch 'master' into install-plugin 2018-01-17 15:32:36 +01:00
Aurélien GEORGET
02594dc964
Update styles.scss 2018-01-17 15:32:21 +01:00
Jim LAURIE
832dd1629e
Merge pull request #459 from strapi/fix/create-user-log 
Fix postgres and mysql logs user table creation
 2018-01-17 15:02:49 +01:00
Aurélien GEORGET
2c1fd73251
Merge branch 'master' into fix/create-user-log 2018-01-17 14:35:43 +01:00
Jim LAURIE
8749dc24f6
Merge pull request #458 from strapi/hotfix/backendURL 
Fix backend URL in development mode
 2018-01-17 14:35:25 +01:00
Jim Laurie
ef2be5c6ee Fix postgres and mysql logs user table creation 2018-01-17 14:32:38 +01:00
Aurelsicoko
ecc7fe0b83 Fix backend URL in development mode 2018-01-17 14:13:31 +01:00
Jim LAURIE
e90f0b5858
Merge pull request #457 from strapi/fix/connectivity-data-path 
Fix data path in connectivity functions
 2018-01-17 12:16:17 +01:00
Jim Laurie
da0789a890 Merge branch 'fix/connectivity-data-path' of github.com:strapi/strapi into fix/connectivity-data-path 2018-01-17 11:39:36 +01:00
Jim Laurie
acb17bc5ca Relaunch travis build 2018-01-17 11:39:22 +01:00
cyril lopez
41eba07f21 etup 2018-01-17 10:36:25 +01:00
Jim LAURIE
d0d80b62e4
Fix missing dot 2018-01-17 10:13:23 +01:00
Jim Laurie
7a4cb0e507 Fix data path in connectivity functions 2018-01-17 09:14:34 +01:00
cyril lopez
52c8aeeee3
Merge branch 'master' into install-plugin 2018-01-16 18:08:54 +01:00
cyril lopez
50661fa805 Add redirection to plugin if the plugin is already installed, redirect the user to the mktplace for buying a tee shirt 2018-01-16 18:06:15 +01:00
Aurelsicoko
b04a495bc4 Prefix plugin global name 2018-01-16 17:54:35 +01:00
cyril lopez
49cf60f477 Fix popUpWarning design 2018-01-16 17:35:45 +01:00
Jim LAURIE
696368815c
Merge pull request #431 from strapi/fix/deploy 
Fix/deploy
 2018-01-16 16:59:25 +01:00
cyril lopez
6adeeeadbb Fix list plugins description and css 2018-01-16 16:34:53 +01:00
Aurelsicoko
8c9f77a615 Use debug option instead of verbose 2018-01-16 16:33:05 +01:00
Aurelsicoko
83e0ffd323 Merge duplicate code and add verbose option on setup command 2018-01-16 16:18:33 +01:00
Aurelsicoko
adb11a0b8b Merge branch 'master' of github.com:strapi/strapi into fix/deploy 2018-01-16 16:02:02 +01:00
Aurelsicoko
b6d4dbf16e Remove https from documentation examples 2018-01-16 16:00:52 +01:00
cyril lopez
451500b434
Merge pull request #448 from strapi/fix/install-plugin 
Fix install plugin page
 2018-01-16 10:46:05 +01:00
Aurelsicoko
4edcff2627 Merge branch 'fix/deploy' of github.com:strapi/strapi into fix/deploy 2018-01-16 10:39:32 +01:00
Aurélien GEORGET
ff62fb351c
Merge branch 'master' into fix/deploy 2018-01-15 19:02:32 +01:00
Aurélien GEORGET
ec08c22aef
Merge branch 'master' into fix/install-plugin 2018-01-15 18:18:36 +01:00
Jim LAURIE
96050824f1
Merge pull request #447 from acifer/patch-1 
Update and rename authentification.md to authentication.md
 2018-01-15 18:02:56 +01:00
Aurelsicoko
9031ff1799 Fix webpack public path and production configuration templating 2018-01-15 17:45:22 +01:00
cyril lopez
0a62a4e6dc Fix install plugin page 2018-01-15 16:43:08 +01:00
acifer
b713866ea1
Update and rename authentification.md to authentication.md 2018-01-15 16:41:42 +01:00
Aurelsicoko
247caae4b4 Omit publicPath and update publicPath on the fly 2018-01-15 14:31:04 +01:00
Aurelsicoko
16c253a846 Fix Travis 2018-01-15 11:31:19 +01:00
Aurelsicoko
4b39785a8a Copy plugins.json content instead of faking the copy 2018-01-12 16:41:59 +01:00
Jim LAURIE
cd44524cdf
Merge pull request #441 from strapi/fix-auth-redirect-route 
Fix redirect route
 2018-01-12 15:24:22 +01:00
Aurelsicoko
cc455ee309 Only try to require configuration server when there is an app 2018-01-12 14:53:20 +01:00
Aurelsicoko
8d0a8379d0 Update path generation for admin and plugins 2018-01-12 14:46:02 +01:00
cyril lopez
1445dc0aa5 Fix redirect route 2018-01-12 14:03:30 +01:00
Aurelsicoko
216a1b3bbb Remove host configuration in admin build 2018-01-12 11:38:03 +01:00
Jim LAURIE
5834090a71
Merge pull request #440 from fixerror/master 
fix bug
 2018-01-12 09:14:27 +01:00
FixError
c5bb2da0a4 fix bug 
(const variable is assigned it cannot be assigned again and an attempt to do so will throw an error)
 2018-01-12 00:58:34 +02:00
Aurelsicoko
109d2ca6b0 Use build backend URL to load plugins from origin 2018-01-11 17:49:11 +01:00