Jim LAURIE
|
77b068ef07
|
Merge branch 'master' into add-overlay-blocker
|
2018-01-18 09:33:00 +01:00 |
|
Jim Laurie
|
66617e31c8
|
Merge branch 'auth-provider/update-user-models' of github.com:strapi/strapi into auth-provider/configs
|
2018-01-18 09:08:27 +01:00 |
|
Jim Laurie
|
7442e01abb
|
Fix conflict documentation
|
2018-01-18 08:32:44 +01:00 |
|
Jim LAURIE
|
7034aff360
|
Merge pull request #461 from strapi/alpha.8
3.0.0-alpha.8
|
2018-01-17 21:25:26 +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 |
|
Jim Laurie
|
03643bfb13
|
3.0.0-alpha.8
v3.0.0-alpha.8
|
2018-01-17 16:59:28 +01:00 |
|
cyril lopez
|
e50a56d230
|
Fix list-plugins plugin icon css
|
2018-01-17 16:47:13 +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 |
|
cyril lopez
|
8571d05c4f
|
Update branch
Merge branch 'add-overlay-blocker' of github.com:strapi/strapi into add-overlay-blocker
|
2018-01-17 14:38:07 +01:00 |
|
cyril lopez
|
d35f36bd27
|
Update branch
Merge branch 'master' of github.com:strapi/strapi into add-overlay-blocker
|
2018-01-17 14:37:45 +01:00 |
|
cyril lopez
|
fdd48bc2df
|
Merge branch 'master' into add-overlay-blocker
|
2018-01-17 14:37:22 +01:00 |
|
cyril lopez
|
f6715c0ccb
|
Update OverlayBlocker doc
|
2018-01-17 14:36:26 +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 |
|
cyril lopez
|
e7fcb3cd8c
|
Fix typo
|
2018-01-17 14:30:37 +01:00 |
|
cyril lopez
|
5d92accfab
|
Remove OverlayBlocker from ctb
|
2018-01-17 14:28:41 +01:00 |
|
cyril lopez
|
d3f81bc2b1
|
Remove stm request helper and remove stm OverlayBlocker related constants and action
|
2018-01-17 14:19:02 +01:00 |
|
Aurelsicoko
|
ecc7fe0b83
|
Fix backend URL in development mode
|
2018-01-17 14:13:31 +01:00 |
|
cyril lopez
|
289f75aa98
|
Update branch
Merge branch 'master' of github.com:strapi/strapi into add-overlay-blocker
|
2018-01-17 13:00:00 +01:00 |
|
cyril lopez
|
d9895fc431
|
Remove the OverlayBlocker from users plugin pass set lockApp in the strapi object
|
2018-01-17 12:58:14 +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 |
|
cyril lopez
|
b13960de3c
|
Created Global constants and actions to display the OverlayBlocker directly from the request helper when the server is restarting
|
2018-01-17 12:08:48 +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
|
aa06c0bfd0
|
Update branch
Merge branch 'master' of github.com:strapi/strapi into add-overlay-blocker
|
2018-01-17 11:23:33 +01:00 |
|
cyril lopez
|
8222a30d98
|
Fix doc typos
|
2018-01-17 10:46:29 +01:00 |
|
cyril lopez
|
8866354d9c
|
Update branch
Merge branch 'master' of github.com:strapi/strapi into add-documentation
|
2018-01-17 10:39:26 +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 |
|