Commit Graph

1561 Commits

Author SHA1 Message Date
Dan Brown 13c9d7bc2d
Merge branch 'master' into release 2019-03-21 19:43:48 +00:00
Dan Brown f5fe524e6c
Added extension whitelist for image uploads
- A continuation of the security issues addressed in v0.25.3
2019-03-21 19:43:15 +00:00
Dan Brown 119b539586
Updated version and assets for release v0.25.3 2019-03-21 00:03:26 +00:00
Dan Brown 29a5c180f0
Merge branch 'master' into release 2019-03-21 00:02:33 +00:00
Dan Brown 37b91b6b0e
Hardened image file validation by removing custom validation
- Added test to check PHP files cannot be uploaded as an image.
2019-03-20 23:59:55 +00:00
Dan Brown 7906602291
Updated version and assets for release v0.25.2 2019-03-10 13:45:21 +00:00
Dan Brown 6dafe773ff
Merge branch 'master' into release 2019-03-10 13:44:29 +00:00
Dan Brown 00703fa817
Merge branch 'dfanara-feature-ldap-attributes' 2019-03-10 10:55:36 +00:00
Dan Brown 44c537de1a
Performed some LDAP service/test cleanup 2019-03-10 10:54:19 +00:00
Dan Brown 6bccf0e64a
Merge branch 'feature-ldap-attributes' of git://github.com/dfanara/BookStack into dfanara-feature-ldap-attributes 2019-03-10 10:31:09 +00:00
Dan Brown 042a6f9760
Updated shelf menu item to show on custom permission
- Extended new 'userCanOnAny' helper to take a entity class for
filtering.

Closes #1201
2019-03-09 21:15:45 +00:00
Dan Brown 04287745e4
Merge branch 'mark-james-Copy-For-View-Only' 2019-03-09 16:52:47 +00:00
Dan Brown 5c9b528517
Abstracted userCanCreatePage helper to work for any permisison
- Added test to cover scenario where someone with create-own permission
would want to copy a viewable item into a container entity that they
own.
2019-03-09 16:50:22 +00:00
Dan Brown 6be2d3f28c
Merge branch 'Copy-For-View-Only' of git://github.com/mark-james/BookStack into mark-james-Copy-For-View-Only 2019-03-09 16:12:12 +00:00
Daniel Fanara 6d20bdc1fb Preserve original display_name_attribute configuration values. 2019-03-09 01:13:30 -05:00
Daniel Fanara 502ea608bf Issue #1306 - Unit Tests for LdapService Changes 2019-03-09 01:08:49 -05:00
Daniel Fanara 55b07c7076 Issue #1306 - Specify display name attribute from LDAP 2019-03-08 23:55:11 -05:00
Dan Brown 33e999909f
Merge branch 'fix-1186' 2019-03-08 22:57:57 +00:00
Dan Brown 6be95cd2ac
Re-centered dropzone error arrow 2019-03-08 22:57:24 +00:00
Dan Brown f467185e86
Merge branch 'master' into fix-1186 2019-03-08 22:47:31 +00:00
Dan Brown 646fd822c5
Updated redis config logic, Now takes a password
- Previous config did not use multiple servers in any way.
- Cluster will now be created automatically if multiple servers given.
- Removed REDIS_CLUSTER option.

Closes #1283
2019-03-08 22:42:48 +00:00
Dan Brown d96baf2d4a
Set 'uploaded_to' parameters for editor-pasted/dragged images
Allows image-listing permission system to work as intended.
Fixes #1287
2019-03-08 21:32:31 +00:00
Dan Brown 1c312906bc
Added a configurable upload size limit
Closes #1293
2019-03-08 21:06:37 +00:00
Dan Brown 9126c87f2b
Merge pull request #1272 from Xiphoseer/patch-1
Add german translations for shelves
2019-03-07 22:14:35 +00:00
Dan Brown 579d98a908
Merge pull request #1314 from maantje/patch-2
Update Dutch password_hint translation to correspond with validation
2019-03-07 21:53:08 +00:00
Dan Brown 98a4359198
Updated user language select to use correct default
- Updated localisation system to take note of system defaul locale
before replacing the current locale
Fixes #1316
2019-03-07 21:09:23 +00:00
Jamie Schouten 6f710225b5
Update Dutch password_hint translation to correspond with validation rule
At the moment the translation says ```Minimaal 5 tekens``` which means your password should be at least 5 characters long. But a 5 character long password is not allowed by the validator. 

I think this was a translation error from the English one where it says ```Must be over 5 characters```. To make the Dutch translation correct the Dutch translation should be changed to ```Minimaal 6 tekens```.

```
    /**
     * Get a validator for an incoming registration request.
     *
     * @param  array $data
     * @return \Illuminate\Contracts\Validation\Validator
     */
    protected function validator(array $data)
    {
        return Validator::make($data, [
            'name' => 'required|max:255',
            'email' => 'required|email|max:255|unique:users',
            'password' => 'required|min:6',
        ]);
    }
```
2019-03-06 17:10:15 +01:00
Dan Brown b273b9d6d0
Improved alignment classes used by WYSIWYG editor
- Fixed table cells being floated, Fixes #1284.
- Made it possible to easily center linked images.
2019-03-02 09:08:01 +00:00
Dan Brown e471d0c52a
Added lua to code languages
Closes #1223
2019-03-02 08:52:14 +00:00
Dan Brown 0a431e3223
Merge pull request #1263 from christophert/add-powershellmarkup
Add Powershell Code Markup
2019-03-02 08:45:08 +00:00
Xiphoseer 058cc2cbd6
Update entities.php 2019-02-12 12:30:43 +01:00
Xiphoseer edd98c00e5
Update entities.php 2019-02-12 12:30:12 +01:00
Xiphoseer 19bb11a1c9
Update entities.php
Add informal german shelve localisations
2019-02-12 12:28:48 +01:00
Xiphoseer 9511d10ec8
Update entities.php
Add german shelve localizations
2019-02-12 12:24:01 +01:00
Christopher Tran 77d3bd31a6 add powershell code block link 2019-02-06 01:06:59 -05:00
Dan Brown 56004abdf4
Added high-level release and roadmap info to readme
Closes #1259
2019-02-06 00:09:39 +00:00
Dan Brown df6f6e2d77
Merge branch 'master' of github.com:BookStackApp/BookStack 2019-02-04 19:57:43 +00:00
Dan Brown ba1b3fc181
Made some readme tweaks 2019-02-04 19:57:21 +00:00
abijeet 9dba9ca178 Fixes tooltip on the image manager.
Fixes #1186
2019-01-27 19:43:31 +05:30
Abijeet Patro 8a4a81629f
Merge pull request #1237 from BookStackApp/phpcs-fixes
PHPCS related fixes.
2019-01-27 16:04:30 +05:30
abijeet 5ef0992d5b PHPCS related fixes. 2019-01-27 15:59:23 +05:30
Dan Brown 25bc28a1be
Updated version and assets for release v0.25.1 2019-01-20 15:42:32 +00:00
Dan Brown 4c561c7fa0
Merge branch 'master' into release 2019-01-20 15:41:24 +00:00
Dan Brown 12be7d0086
Added extra s3 config parameters for use s3-like service compatibility
For #1192 and #1195
2019-01-20 15:23:49 +00:00
Dan Brown ba0af9214e
Updated socialite to work around google+ API shutdown
Fixes #1190
Will require docs update
2019-01-20 14:58:06 +00:00
Dan Brown 36424a24b5
Added ability for date format strings to be localized by back-end
Requires the locale to be installed on the system-side.
Closes #1214
2019-01-19 12:11:18 +00:00
Dan Brown a70ee9664a Fixed firefox page print view and removed comments from prints
Closes #1211
2019-01-19 11:33:27 +00:00
Dan Brown 156c0a88e9
Updated sidebar to prevent rubber-banding with comments disabled
Fixes #1218
2019-01-19 11:10:46 +00:00
Dan Brown 95b3e78573
Updated version and assets for release v0.25.0 2019-01-12 22:48:53 +00:00
Dan Brown 63a345bc93
Merge branch 'master' into release 2019-01-12 22:47:07 +00:00