Jim Laurie
|
cf6b240451
|
Merge branch 'master' of github.com:strapi/strapi into auth-provider/configs
|
2018-01-18 13:45:46 +01:00 |
|
Jim LAURIE
|
37f73c4dde
|
Merge pull request #446 from strapi/add-overlay-blocker
Add overlay blocker
|
2018-01-18 13:45:31 +01:00 |
|
Jim LAURIE
|
c6a0d0afbf
|
Merge branch 'master' into add-overlay-blocker
|
2018-01-18 13:31:36 +01:00 |
|
Jim LAURIE
|
cdefbe7a08
|
Merge pull request #465 from strapi/update-doc-version
Update strapi version in documentation
|
2018-01-18 13:30:16 +01:00 |
|
Jim Laurie
|
801a47994a
|
Add migration from alpha.7.4 to alpha.8
|
2018-01-18 12:28:59 +01:00 |
|
Jim LAURIE
|
8b3d71559f
|
Merge branch 'master' into update-doc-version
|
2018-01-18 12:14:38 +01:00 |
|
Jim LAURIE
|
7be9addd82
|
Merge pull request #438 from strapi/add-documentation
Add helpers in documentation
|
2018-01-18 12:13:54 +01:00 |
|
Jim LAURIE
|
f129a24920
|
Delete text migration guide link
|
2018-01-18 11:47:12 +01:00 |
|
Jim LAURIE
|
2612a6250d
|
Merge branch 'master' into add-documentation
|
2018-01-18 11:44:03 +01:00 |
|
Jim Laurie
|
5adff62481
|
Update strapi version in documentation
|
2018-01-18 11:18:48 +01:00 |
|
Aurelsicoko
|
fa8976c98f
|
Fix infinite login
|
2018-01-18 11:13:44 +01:00 |
|
cyril lopez
|
b29ff0893e
|
Update branch
Merge branch 'add-overlay-blocker' of github.com:strapi/strapi into add-overlay-blocker
|
2018-01-18 10:57:39 +01:00 |
|
cyril lopez
|
87d01af7a7
|
Decrease BackHeader z-index
|
2018-01-18 10:56:31 +01:00 |
|
Jim Laurie
|
b2e07979c7
|
Template forgot password email object
|
2018-01-18 10:03:29 +01:00 |
|
Jim LAURIE
|
b53b074b3f
|
Update overlay blocker documentation
|
2018-01-18 09:40:48 +01:00 |
|
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 |
|