Jim LAURIE
|
10bf271b1c
|
Merge pull request #2914 from strapi/events
Set events in the front-end
|
2019-03-08 15:57:03 +01:00 |
|
Jim LAURIE
|
73b31d4e27
|
Merge branch 'master' into events
|
2019-03-08 15:56:50 +01:00 |
|
Jim LAURIE
|
be36c280f3
|
Fix lint
|
2019-03-08 15:53:58 +01:00 |
|
Jim LAURIE
|
d6942f2625
|
Merge pull request #2850 from rsinelle/master
Return bad request in case of empty files attribut
|
2019-03-08 15:19:25 +01:00 |
|
Jim LAURIE
|
b8edcbc283
|
Merge branch 'master' into master
|
2019-03-08 15:18:56 +01:00 |
|
Jim LAURIE
|
0071d28f22
|
Move error message to translation
|
2019-03-08 14:56:09 +01:00 |
|
Jim LAURIE
|
a5ce7bca4e
|
Merge pull request #2812 from gilhardl/fix-2731
Fix $pull error deleting entry with dominant model of many-to-many relation
|
2019-03-08 13:47:22 +01:00 |
|
Jim LAURIE
|
90d67ef4cf
|
Merge branch 'master' into fix-2731
|
2019-03-08 10:19:36 +01:00 |
|
Jim LAURIE
|
f2bac2a59a
|
Merge pull request #2633 from abdonrd/patch-1
Update graphql dependency to v14.1.0
|
2019-03-07 17:51:55 +01:00 |
|
Jim LAURIE
|
241ba857d8
|
Merge branch 'master' into patch-1
|
2019-03-07 17:51:39 +01:00 |
|
soupette
|
b6907e6f10
|
Fix PR feedback
|
2019-03-07 16:06:02 +01:00 |
|
Jim LAURIE
|
a98756504d
|
Merge pull request #2943 from strapi/fix/2530
Fix for SQL Mutation Updates
|
2019-03-07 15:55:54 +01:00 |
|
Jim LAURIE
|
d22bc090f1
|
Merge branch 'master' into fix/2530
|
2019-03-07 15:55:14 +01:00 |
|
Jim LAURIE
|
9d439e00a0
|
Merge pull request #2901 from strapi/improve/blockerComponent
Improve OverlayBlocker when server error
|
2019-03-07 15:11:04 +01:00 |
|
Jim LAURIE
|
8d01b9380c
|
Update 30s to 15s
|
2019-03-07 15:10:09 +01:00 |
|
Jim LAURIE
|
b6bdf6f7ce
|
Merge branch 'master' into improve/blockerComponent
|
2019-03-07 14:38:40 +01:00 |
|
Jim LAURIE
|
af11222622
|
Merge pull request #2859 from dev-drprasad/add-granularity-of-max-size-upload-for-file-upload
Add granularity of 'max size upload' for file upload (< 1MB)
|
2019-03-07 14:37:00 +01:00 |
|
Jim LAURIE
|
26ac833855
|
Merge branch 'master' into add-granularity-of-max-size-upload-for-file-upload
|
2019-03-07 14:36:32 +01:00 |
|
Jim LAURIE
|
f1f4728d29
|
Merge pull request #2706 from brinley/patch-2
Updated notifications container position to fixed
|
2019-03-07 14:35:59 +01:00 |
|
Jim LAURIE
|
cfd8e4414b
|
Merge branch 'master' into patch-2
|
2019-03-07 14:26:36 +01:00 |
|
Jim LAURIE
|
768ad2ffcd
|
Merge pull request #2664 from derrickmehaffy/enhancement/bigint
Add Big Integer to adminUI
|
2019-03-07 13:53:58 +01:00 |
|
Jim LAURIE
|
8241863444
|
Merge branch 'master' into enhancement/bigint
|
2019-03-07 13:42:16 +01:00 |
|
DMehaffy
|
8a20a151d0
|
Temporary fix for SQL Mutation Updates
|
2019-03-07 02:54:19 -07:00 |
|
Jim LAURIE
|
6db92eb17b
|
Merge pull request #2909 from EpicUsaMan/patch-5
Fix for UPPERCASE / camelCase names
|
2019-03-07 10:20:03 +01:00 |
|
Jim LAURIE
|
2422e3c87b
|
Merge branch 'master' into patch-5
|
2019-03-07 10:19:30 +01:00 |
|
Jim LAURIE
|
5924ed2f5d
|
Merge pull request #2918 from strapi/enhancement/file-email-provider-orga
Manage email and upload providers from an npm organisation
|
2019-03-06 18:02:04 +01:00 |
|
Jim LAURIE
|
84d50b78c1
|
Merge branch 'master' into enhancement/file-email-provider-orga
|
2019-03-06 18:01:42 +01:00 |
|
Jim LAURIE
|
d352948639
|
Merge pull request #2916 from strapi/fix/confirm-email-token
Remove token from register route if confirm email is required
|
2019-03-06 17:58:18 +01:00 |
|
Jim LAURIE
|
8640864b71
|
Merge branch 'master' into fix/confirm-email-token
|
2019-03-06 17:57:52 +01:00 |
|
Jim LAURIE
|
eb70b66e01
|
Merge pull request #2915 from strapi/fix/confirmation-email-bad-token
Fix bad token for confirmation link
|
2019-03-06 17:57:35 +01:00 |
|
Jim LAURIE
|
d5da04cfe4
|
Merge branch 'master' into fix/confirmation-email-bad-token
|
2019-03-06 17:57:26 +01:00 |
|
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 |
|