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
33e999909f
Merge branch 'fix-1186'
2019-03-08 22:57:57 +00:00
6be95cd2ac
Re-centered dropzone error arrow
2019-03-08 22:57:24 +00:00
f467185e86
Merge branch 'master' into fix-1186
2019-03-08 22:47:31 +00:00
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
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
1c312906bc
Added a configurable upload size limit
...
Closes #1293
2019-03-08 21:06:37 +00:00
9126c87f2b
Merge pull request #1272 from Xiphoseer/patch-1
...
Add german translations for shelves
2019-03-07 22:14:35 +00:00
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
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
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
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
e471d0c52a
Added lua to code languages
...
Closes #1223
2019-03-02 08:52:14 +00:00
0a431e3223
Merge pull request #1263 from christophert/add-powershellmarkup
...
Add Powershell Code Markup
2019-03-02 08:45:08 +00:00
058cc2cbd6
Update entities.php
2019-02-12 12:30:43 +01:00
edd98c00e5
Update entities.php
2019-02-12 12:30:12 +01:00
19bb11a1c9
Update entities.php
...
Add informal german shelve localisations
2019-02-12 12:28:48 +01:00
9511d10ec8
Update entities.php
...
Add german shelve localizations
2019-02-12 12:24:01 +01:00
77d3bd31a6
add powershell code block link
2019-02-06 01:06:59 -05:00
56004abdf4
Added high-level release and roadmap info to readme
...
Closes #1259
2019-02-06 00:09:39 +00:00
df6f6e2d77
Merge branch 'master' of github.com:BookStackApp/BookStack
2019-02-04 19:57:43 +00:00
ba1b3fc181
Made some readme tweaks
2019-02-04 19:57:21 +00:00
9dba9ca178
Fixes tooltip on the image manager.
...
Fixes #1186
2019-01-27 19:43:31 +05:30
8a4a81629f
Merge pull request #1237 from BookStackApp/phpcs-fixes
...
PHPCS related fixes.
2019-01-27 16:04:30 +05:30
5ef0992d5b
PHPCS related fixes.
2019-01-27 15:59:23 +05:30
12be7d0086
Added extra s3 config parameters for use s3-like service compatibility
...
For #1192 and #1195
2019-01-20 15:23:49 +00:00
ba0af9214e
Updated socialite to work around google+ API shutdown
...
Fixes #1190
Will require docs update
2019-01-20 14:58:06 +00:00
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
a70ee9664a
Fixed firefox page print view and removed comments from prints
...
Closes #1211
2019-01-19 11:33:27 +00:00
156c0a88e9
Updated sidebar to prevent rubber-banding with comments disabled
...
Fixes #1218
2019-01-19 11:10:46 +00:00
a3ccde8698
Updated TinyMCE and fixed TinyMCE/Codemirror cursor jumping
...
For #1162
2019-01-12 19:23:18 +00:00
9700b7ccea
Merge pull request #1205 from BookStackApp/env-cleanup
...
Simplified example env and created full example copy
2019-01-06 16:05:51 +00:00
54c428c375
Commented APP_URL by default to prevent upgrade path issues
2019-01-06 16:01:24 +00:00
ebe5d643f3
Simplified example env and created full example copy
2019-01-06 15:46:16 +00:00
e66ddbc17b
Merge pull request #1197 from moucho/master
...
Spanish update
2019-01-06 14:37:11 +00:00
0e0a17cc30
Prevented page text content includes
...
Avoids possible permission issues where included content shown in search or preview
where the user would not normally have permission to view the included content.
Closes #1178
2019-01-05 17:18:40 +00:00
ffceb4092e
Merge branch 'cw1998-fix/#1110'
2019-01-05 15:22:59 +00:00
50e5527483
Added test to cover "users" header link in correct permission conditions
2019-01-05 15:22:47 +00:00
f63fd4beca
Merge branch 'fix/#1110' of git://github.com/cw1998/BookStack into cw1998-fix/#1110
2019-01-05 15:12:33 +00:00
d682a0157f
Merge branch 'qianmengnet-master'
2019-01-05 15:01:38 +00:00
70ad707c3c
Tweaked profile page anchor links and swapped register/login links
...
Also added test for login/register links on non-auth app view
Relates to #1146
2019-01-05 15:01:16 +00:00
3062bf1876
Merge branch 'master' of git://github.com/qianmengnet/BookStack into qianmengnet-master
2019-01-05 14:47:47 +00:00
a2087fe3ff
Made delete permissions a requirement for move operations
...
Closes #1200
2019-01-05 14:39:40 +00:00
19770d2792
Use joint_permissions to determine is a user has an available page or chapter to copy.
2019-01-02 16:55:28 +11:00
99c6d70c51
Initial updates to allow for page copy when the user can read the page but can't update it.
2018-12-31 17:01:49 +11:00
0830521e60
Merge pull request #1 from BookStackApp/master
...
Update From Bookstack
2018-12-31 09:00:19 +11:00
2317bf2350
Added check for last admin on role change
...
Will show error message if last admin and admin role is removed.
Closes #1124
Also cleaned up user controller a little.
2018-12-30 16:11:58 +00:00
2c48f4f7e8
Format update
2018-12-24 12:41:42 +01:00
456afdcd4c
Updated configuration files
...
Added a notice to the top of each to explain they should not be normally modified.
Standardised comment format used for each item.
Better aligned some files with laravel 5.5 options.
2018-12-23 16:26:39 +00:00
68017e2553
Added testing for avatar fetching systems & config
...
Abstracts imageservice http interaction.
Closes #1193
2018-12-23 15:34:38 +00:00
