Martin Muzatko
|
8e727b18c5
|
cleanup of dist and added docs dist to gitignore
|
2018-10-09 09:55:41 +02:00 |
|
takeshi_matsushita
|
136f973462
|
Update ja.json
|
2018-10-09 08:01:54 +09:00 |
|
takeshi_matsushita
|
930d0170f9
|
Add ja.json
|
2018-10-09 07:49:55 +09:00 |
|
ByoungYong Kim
|
73e0ab41b9
|
Merge pull request #1 from strapi/master
Sync strapi/strapi to ryubro/strapi
|
2018-10-08 21:39:24 +02:00 |
|
Jim LAURIE
|
40a3c0418d
|
Merge branch 'master' into improve-ctm/delete-edit-view
|
2018-10-08 20:07:22 +02:00 |
|
ByoungYong Kim
|
94aa36bd20
|
Merge branch 'master' into fix/sso-not-working-in-the-wild
|
2018-10-08 18:39:12 +02:00 |
|
ByoungYong Kim
|
c6ee00003f
|
Revert "Fixed that protocol was hardcoded as 'http' and couldn't be configured regarding sso."
This reverts commit 17d5e295b53953a97fb5636ba8f373d7ff60a4fe.
|
2018-10-08 18:37:24 +02:00 |
|
cyril lopez
|
5c391f49e4
|
Merge branch 'master' of github.com:strapi/strapi into improve/admin-auth
|
2018-10-08 17:50:13 +02:00 |
|
Jim LAURIE
|
53391a5096
|
Merge pull request #2019 from strapi/split-admin-dev
Split Admin entry point between prod and dev
|
2018-10-08 17:45:07 +02:00 |
|
Jim LAURIE
|
4dd93f4b78
|
Merge branch 'master' into split-admin-dev
|
2018-10-08 17:44:35 +02:00 |
|
Jim LAURIE
|
8a325bf536
|
Merge pull request #2103 from strapi/3.0.0-alpha.14.3
3.0.0-alpha.14.3
|
2018-10-08 17:44:12 +02:00 |
|
Jim LAURIE
|
87c3af3d1e
|
3.0.0-alpha.14.3
v3.0.0-alpha.14.3
|
2018-10-08 17:14:19 +02:00 |
|
Aurelsicoko
|
72e47dde75
|
Update delete button style
|
2018-10-08 16:45:24 +02:00 |
|
ByoungYong Kim
|
17d5e295b5
|
Fixed that protocol was hardcoded as 'http' and couldn't be configured regarding sso.
|
2018-10-08 13:18:34 +02:00 |
|
ByoungYong Kim
|
4beab15bc3
|
Fixed that plugin-content-manager's bootstrap code mutates global models
|
2018-10-08 13:17:07 +02:00 |
|
ByoungYong Kim
|
12cc6d6039
|
Added provider into user model as it seems to be required for SSO.
|
2018-10-08 13:16:28 +02:00 |
|
Jim LAURIE
|
d586442fbd
|
Fix deep delete relation for oneWay and when there is no relations
|
2018-10-08 12:25:44 +02:00 |
|
Jim LAURIE
|
ebd60f93cc
|
Merge pull request #2096 from strapi/fix/1077
Fix numerical 0 display in data list
|
2018-10-08 11:54:56 +02:00 |
|
Jim LAURIE
|
9f67701183
|
Merge branch 'master' into fix/1077
|
2018-10-08 11:54:46 +02:00 |
|
Jim LAURIE
|
b0f4f004d8
|
Merge pull request #2079 from maturanomx/bug/minorChanges
Minor changes and bug fixes
|
2018-10-08 11:20:11 +02:00 |
|
cyril lopez
|
9ce27ae3d8
|
Clean svg
|
2018-10-08 11:20:04 +02:00 |
|
Jim LAURIE
|
dfee8052de
|
Merge branch 'master' into bug/minorChanges
|
2018-10-08 11:20:03 +02:00 |
|
Jim LAURIE
|
7ceeed4d10
|
Merge pull request #2075 from strapi/update/2071
Fix typo update service on bookshelf
|
2018-10-08 11:19:36 +02:00 |
|
Jim LAURIE
|
43dfafd181
|
Merge branch 'master' into update/2071
|
2018-10-08 11:19:28 +02:00 |
|
Jim LAURIE
|
99ce46f6bb
|
Delete path on save in sql column generator
|
2018-10-08 10:40:28 +02:00 |
|
Jim LAURIE
|
021fd9f885
|
Merge pull request #2094 from mleko-forks/translate/pl-email-and-settings-manager
Update PL translations
|
2018-10-08 09:52:28 +02:00 |
|
Daniel Król
|
79c1e9a95c
|
Merge branch 'translate/pl-content-manager' into translate/pl-email-and-settings-manager
|
2018-10-07 20:33:37 +02:00 |
|
Jim LAURIE
|
35b94db32e
|
Fix numerical 0 display in data list
|
2018-10-07 19:36:51 +02:00 |
|
Daniel Król
|
6642c640bf
|
Add missing translations
|
2018-10-07 19:27:22 +02:00 |
|
Daniel Król
|
d2beb2732d
|
Merge branch 'master' into translate/pl-email-and-settings-manager
|
2018-10-07 19:12:43 +02:00 |
|
Daniel Król
|
540d5571ab
|
Add missing translations for 2 plugins
|
2018-10-07 19:03:05 +02:00 |
|
Jim LAURIE
|
d8a2c9a833
|
Merge pull request #2091 from endymion1818/patch-1
Add instructions for cloning locally from Heroku
|
2018-10-07 17:30:09 +02:00 |
|
Jim LAURIE
|
6dd38bc732
|
Merge branch 'master' into patch-1
|
2018-10-07 17:29:19 +02:00 |
|
Jim LAURIE
|
d1ae57a7cb
|
Merge pull request #2085 from devaublanc/master
Fix error on fetch permissions
|
2018-10-07 17:00:50 +02:00 |
|
Jim LAURIE
|
5684700a72
|
Merge branch 'master' into master
|
2018-10-07 17:00:42 +02:00 |
|
Ben Read
|
a6756a447d
|
you can't have 2 "origin"s - renaming
|
2018-10-07 15:29:34 +01:00 |
|
Ben Read
|
3e940d76db
|
Add instructions for cloning locally from Heroku
This took me ages of trial & error effort when I first started investigating Strapi. I nearly gave up several times. The only available instructions are a bit difficult to follow (https://help.heroku.com/XOBUHLKQ/why-do-i-see-a-message-you-appear-to-have-cloned-an-empty-repository-when-using-heroku-git-clone).
I think this addition would help new adopters to get a more useful instance of Strapi running that would help them more easily evaluate the benefits of the content builder.
|
2018-10-06 17:29:59 +01:00 |
|
Jim LAURIE
|
367e510121
|
Merge pull request #2077 from maturanomx/bug/codeQuality
Fix conditional logic
|
2018-10-06 12:05:35 +02:00 |
|
Jim LAURIE
|
ff1013448d
|
Merge branch 'master' into bug/codeQuality
|
2018-10-06 12:04:44 +02:00 |
|
Jim LAURIE
|
0893775b07
|
Merge pull request #2089 from IdaszakDaniel/PL-missing-translation-keys
Update PL translations
|
2018-10-06 11:22:12 +02:00 |
|
IdaszakDaniel
|
207676e123
|
PL missing translation keys
|
2018-10-05 21:40:27 +02:00 |
|
Jim LAURIE
|
25ab8e7bef
|
Add base /documentation
|
2018-10-05 17:24:17 +02:00 |
|
Jim LAURIE
|
b59487c838
|
Merge pull request #2078 from segush11/translation-keys-ru
Update RU translations
|
2018-10-05 14:45:03 +02:00 |
|
Benjamin Devaublanc
|
507ab8b922
|
Fix error on fetch permissions
Can't fetch permissions if we have an api that contain a service with no
controllers
|
2018-10-05 13:07:56 +02:00 |
|
Marianelli Michele
|
76d333a523
|
Update translations
|
2018-10-05 00:48:58 +02:00 |
|
Marianelli Michele
|
a3563f2f5b
|
Update translations
|
2018-10-05 00:37:57 +02:00 |
|
Alberto Maturano
|
bdde29eba8
|
Use the personal repository for contributions
Or, the fork step should not be there...
|
2018-10-04 17:05:29 -05:00 |
|
Alberto Maturano
|
2410d5ab9d
|
Simplify logic
|
2018-10-04 15:22:10 -05:00 |
|
Alberto Maturano
|
e4f60a26ab
|
Use just one call system
|
2018-10-04 15:21:05 -05:00 |
|
Alberto Maturano
|
017e713ec4
|
Remove unused imported library
|
2018-10-04 15:19:56 -05:00 |
|