33691 Commits

Author SHA1 Message Date
soupette
561fe2f1a8 Add tests to app container 2019-03-06 16:22:32 +01:00
soupette
916ebff9d4 Init new ctb 2019-03-06 15:17:53 +01:00
soupette
554faaf9c7 Add test config 2019-03-06 09:54:29 +01:00
cupofnestor
28cb54297f
Merge pull request #3 from strapi/master
updating my fork
2019-03-05 16:09:31 -05:00
EpicUsaMan
38887214ed
Add support for array of methods to plugins 2019-03-05 22:03:52 +02:00
EpicUsaMan
585051b77f
Remove unused code 2019-03-05 21:12:35 +02:00
EpicUsaMan
3acebcffc0
Support array of methods in documentation plugin 2019-03-05 20:55:46 +02:00
REDDY PRASAD
9ef5910569 👽 Add translations for error messages of FileUpload plugin 2019-03-04 10:44:16 +05:30
REDDY PRASAD
5539a3e27c 💅 Show proper error messages for 'File Upload' plugin 2019-03-02 19:53:33 +05:30
Jim LAURIE
f691542184
Merge pull request #2905 from henrych4/fix-mongoose-update-hook
Trigger beforeUpdate and afterUpdate hooks when update document
2019-03-02 15:13:33 +01:00
Jim LAURIE
b5fe3fd376
Merge branch 'master' into fix-mongoose-update-hook 2019-03-02 15:13:06 +01:00
Jim LAURIE
45f0e08e33
Merge pull request #2855 from ReesesSnickers/patch-1
Updated minor grammar defect on  Installation documentation
2019-03-02 14:07:54 +01:00
Jim LAURIE
193d2bdc93
Merge branch 'master' into patch-1 2019-03-02 14:07:46 +01:00
Jim LAURIE
28506035cf
Remove logs 2019-03-02 14:02:40 +01:00
Jim LAURIE
4c693388b4
Merge pull request #2842 from JABedford/text-fixes
Grammar fixes to strapi-new start up console log.
2019-03-02 13:59:12 +01:00
Jim LAURIE
bee2de3de3
Merge branch 'master' into text-fixes 2019-03-02 13:58:24 +01:00
Jim LAURIE
c7b0409613
Merge pull request #2802 from fromjonathan/patch-1
Improved educational flow and language.
2019-03-02 13:57:05 +01:00
Jim LAURIE
aa50a35593
Merge branch 'master' into patch-1 2019-03-02 13:56:51 +01:00
Jim LAURIE
8acb7b2c45
Update role name 2019-03-02 13:56:26 +01:00
Jim LAURIE
0d731bf8cb
Merge pull request #2911 from strapi/fix/users-count-role-sql
Fix user count per role on SQL database
2019-03-02 13:49:01 +01:00
Jim LAURIE
720bb53858
Merge branch 'master' into fix/users-count-role-sql 2019-03-02 13:48:53 +01:00
Jim LAURIE
4286987d90
Merge pull request #2906 from strapi/add/npmLock
Forcefully disable package-lock generation
2019-03-02 13:48:34 +01:00
Jim LAURIE
898c9c2aca
Merge branch 'master' into add/npmLock 2019-03-02 13:48:26 +01:00
Jim LAURIE
dac168cedb Manage email and upload providers from an npm organisation 2019-03-01 17:09:19 +01:00
Jim LAURIE
d110a942eb Remove token from register route if confirm email is required 2019-03-01 16:28:44 +01:00
Jim LAURIE
53e82cde6a Fix bad token for confirmation link 2019-03-01 15:01:09 +01:00
Aurélien Georget
9090c8effd Fix conflicts 2019-03-01 12:55:43 +01:00
Jim LAURIE
cca2ea98dc Fix user count per role on SQL database 2019-03-01 10:52:52 +01:00
Jim LAURIE
b0c12a3912
Merge pull request #2907 from EpicUsaMan/patch-4
Fix for SQLite #2879
2019-03-01 10:29:59 +01:00
Jim LAURIE
81fb449f28
Merge branch 'master' into patch-4 2019-03-01 10:29:49 +01:00
EpicUsaMan
2c2e22d48c
Fix for UPPERCASE / camelCase names 2019-02-28 21:41:46 +02:00
Jim LAURIE
9ba21014eb
Merge pull request #2896 from strapi/fix/#2783
Fix update entry when empty date field
2019-02-28 18:59:12 +01:00
Jim LAURIE
68ea58d8c7
Merge branch 'master' into fix/#2783 2019-02-28 18:58:51 +01:00
EpicUsaMan
ae50cace6e
Fix for SQLite 2019-02-28 19:27:36 +02:00
EpicUsaMan
32361e2949
Fix for SQLite 2019-02-28 19:22:01 +02:00
DMehaffy
ed1d5f05ce Forcefully disable package-lock generation 2019-02-28 09:54:50 -07:00
Jim LAURIE
93cc29fe51
Merge pull request #2883 from strapi/onboarding-videos
Getting started videos
2019-02-28 17:41:22 +01:00
Jim LAURIE
d5c4f1c055
Merge branch 'master' into onboarding-videos 2019-02-28 17:41:14 +01:00
Jim LAURIE
017df84bab
Merge pull request #2650 from hashinteractive/mailgun-attachment
Added attachment property to mailgun msg object
2019-02-28 16:34:24 +01:00
Jim LAURIE
bec6534a07
Merge branch 'master' into mailgun-attachment 2019-02-28 16:34:17 +01:00
Abdón Rodríguez Davila
0735f113cc
Update packages/strapi-plugin-content-manager/admin/src/containers/EditPage/saga.js
Co-Authored-By: soupette <cyril.lpz@gmail.com>
2019-02-28 16:19:57 +01:00
Ky
974f723d1b PR template merge 2019-02-28 15:08:35 +01:00
Aurélien Georget
03d212d10f Fix conflicts 2019-02-28 14:44:01 +01:00
REDDY PRASAD
5fa45859c9 💅 Implement 'step' feature for InputNumber component 2019-02-28 16:28:06 +05:30
hhhung
96bfc820c3 trigger beforeUpdate and afterUpdate hooks 2019-02-28 16:40:35 +08:00
soupette
2448bc63fe Fix button delay 2019-02-27 17:51:41 +01:00
soupette
d3a4c2a6f3 Add new state to overlay blocker 2019-02-27 17:48:06 +01:00
Ky
cbb365afae refacto before PR 2019-02-27 17:02:30 +01:00
virginieky
b4fd2f4b6f
Merge branch 'master' into onboarding-videos 2019-02-27 14:50:01 +01:00
Ky
b1a01c352d some fixes before PR 2019-02-27 14:49:04 +01:00