]> BookStack Code Mirror - bookstack/log
bookstack
6 years agoCzech translation 1347/head
Martin Šimek [Fri, 22 Mar 2019 23:35:42 +0000 (00:35 +0100)]
Czech translation

+ Unit test repair

6 years agoCzech translation
Martin Šimek [Fri, 22 Mar 2019 21:46:44 +0000 (22:46 +0100)]
Czech translation

+ Typos
+ errors.php

6 years agoCzech translation
Martin Šimek [Tue, 19 Mar 2019 21:45:14 +0000 (22:45 +0100)]
Czech translation

+ Czech language (cs)
+ settings.php in english populated by new option
Note: validation php taken from  lavarel official translation (https://github.com/caouecs/Laravel-lang/blob/master/src/cs/validation.php)

6 years agoMerge branch 'dfanara-feature-ldap-attributes'
Dan Brown [Sun, 10 Mar 2019 10:55:36 +0000 (10:55 +0000)]
Merge branch 'dfanara-feature-ldap-attributes'

6 years agoPerformed some LDAP service/test cleanup
Dan Brown [Sun, 10 Mar 2019 10:54:19 +0000 (10:54 +0000)]
Performed some LDAP service/test cleanup

6 years agoMerge branch 'feature-ldap-attributes' of git://github.com/dfanara/BookStack into...
Dan Brown [Sun, 10 Mar 2019 10:31:09 +0000 (10:31 +0000)]
Merge branch 'feature-ldap-attributes' of git://github.com/dfanara/BookStack into dfanara-feature-ldap-attributes

6 years agoUpdated shelf menu item to show on custom permission
Dan Brown [Sat, 9 Mar 2019 21:15:45 +0000 (21:15 +0000)]
Updated shelf menu item to show on custom permission

- Extended new 'userCanOnAny' helper to take a entity class for
filtering.

Closes #1201

6 years agoMerge branch 'mark-james-Copy-For-View-Only'
Dan Brown [Sat, 9 Mar 2019 16:52:47 +0000 (16:52 +0000)]
Merge branch 'mark-james-Copy-For-View-Only'

6 years agoAbstracted userCanCreatePage helper to work for any permisison
Dan Brown [Sat, 9 Mar 2019 16:50:22 +0000 (16:50 +0000)]
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.

6 years agoMerge branch 'Copy-For-View-Only' of git://github.com/mark-james/BookStack into mark...
Dan Brown [Sat, 9 Mar 2019 16:12:12 +0000 (16:12 +0000)]
Merge branch 'Copy-For-View-Only' of git://github.com/mark-james/BookStack into mark-james-Copy-For-View-Only

6 years agoPreserve original display_name_attribute configuration values. 1317/head
Daniel Fanara [Sat, 9 Mar 2019 06:13:30 +0000 (01:13 -0500)]
Preserve original display_name_attribute configuration values.

6 years agoIssue #1306 - Unit Tests for LdapService Changes
Daniel Fanara [Sat, 9 Mar 2019 06:08:49 +0000 (01:08 -0500)]
Issue #1306 - Unit Tests for LdapService Changes

6 years agoIssue #1306 - Specify display name attribute from LDAP
Daniel Fanara [Sat, 9 Mar 2019 04:55:11 +0000 (23:55 -0500)]
Issue #1306 - Specify display name attribute from LDAP

6 years agoMerge branch 'fix-1186'
Dan Brown [Fri, 8 Mar 2019 22:57:57 +0000 (22:57 +0000)]
Merge branch 'fix-1186'

6 years agoRe-centered dropzone error arrow
Dan Brown [Fri, 8 Mar 2019 22:57:24 +0000 (22:57 +0000)]
Re-centered dropzone error arrow

6 years agoMerge branch 'master' into fix-1186
Dan Brown [Fri, 8 Mar 2019 22:47:31 +0000 (22:47 +0000)]
Merge branch 'master' into fix-1186

6 years agoUpdated redis config logic, Now takes a password
Dan Brown [Fri, 8 Mar 2019 22:42:48 +0000 (22:42 +0000)]
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

6 years agoSet 'uploaded_to' parameters for editor-pasted/dragged images
Dan Brown [Fri, 8 Mar 2019 21:32:31 +0000 (21:32 +0000)]
Set 'uploaded_to' parameters for editor-pasted/dragged images

Allows image-listing permission system to work as intended.
Fixes #1287

6 years agoAdded a configurable upload size limit
Dan Brown [Fri, 8 Mar 2019 21:06:37 +0000 (21:06 +0000)]
Added a configurable upload size limit

Closes #1293

6 years agoMerge pull request #1272 from Xiphoseer/patch-1
Dan Brown [Thu, 7 Mar 2019 22:14:35 +0000 (22:14 +0000)]
Merge pull request #1272 from Xiphoseer/patch-1

Add german translations for shelves

6 years agoMerge pull request #1314 from maantje/patch-2
Dan Brown [Thu, 7 Mar 2019 21:53:08 +0000 (21:53 +0000)]
Merge pull request #1314 from maantje/patch-2

Update Dutch password_hint translation to correspond with validation

6 years agoUpdated user language select to use correct default
Dan Brown [Thu, 7 Mar 2019 21:09:23 +0000 (21:09 +0000)]
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

6 years agoUpdate Dutch password_hint translation to correspond with validation rule 1314/head
Jamie Schouten [Wed, 6 Mar 2019 16:10:15 +0000 (17:10 +0100)]
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',
        ]);
    }
```

6 years agoImproved alignment classes used by WYSIWYG editor
Dan Brown [Sat, 2 Mar 2019 09:08:01 +0000 (09:08 +0000)]
Improved alignment classes used by WYSIWYG editor

- Fixed table cells being floated, Fixes #1284.
- Made it possible to easily center linked images.

6 years agoAdded lua to code languages
Dan Brown [Sat, 2 Mar 2019 08:52:14 +0000 (08:52 +0000)]
Added lua to code languages

Closes #1223

6 years agoMerge pull request #1263 from christophert/add-powershellmarkup
Dan Brown [Sat, 2 Mar 2019 08:45:08 +0000 (08:45 +0000)]
Merge pull request #1263 from christophert/add-powershellmarkup

Add Powershell Code Markup

6 years agoUpdate entities.php 1272/head
Xiphoseer [Tue, 12 Feb 2019 11:30:43 +0000 (12:30 +0100)]
Update entities.php

6 years agoUpdate entities.php
Xiphoseer [Tue, 12 Feb 2019 11:30:12 +0000 (12:30 +0100)]
Update entities.php

6 years agoUpdate entities.php
Xiphoseer [Tue, 12 Feb 2019 11:28:48 +0000 (12:28 +0100)]
Update entities.php

Add informal german shelve localisations

6 years agoUpdate entities.php
Xiphoseer [Tue, 12 Feb 2019 11:24:01 +0000 (12:24 +0100)]
Update entities.php

Add german shelve localizations

6 years agoadd powershell code block link 1263/head
Christopher Tran [Wed, 6 Feb 2019 06:06:59 +0000 (01:06 -0500)]
add powershell code block link

6 years agoAdded high-level release and roadmap info to readme 1274/head
Dan Brown [Wed, 6 Feb 2019 00:09:39 +0000 (00:09 +0000)]
Added high-level release and roadmap info to readme

Closes #1259

6 years agoMerge branch 'master' of github.com:BookStackApp/BookStack
Dan Brown [Mon, 4 Feb 2019 19:57:43 +0000 (19:57 +0000)]
Merge branch 'master' of github.com:BookStackApp/BookStack

6 years agoMade some readme tweaks
Dan Brown [Mon, 4 Feb 2019 19:57:21 +0000 (19:57 +0000)]
Made some readme tweaks

6 years agoFixes tooltip on the image manager. 1238/head
abijeet [Sun, 27 Jan 2019 14:13:31 +0000 (19:43 +0530)]
Fixes tooltip on the image manager.

Fixes #1186

6 years agoMerge pull request #1237 from BookStackApp/phpcs-fixes
Abijeet Patro [Sun, 27 Jan 2019 10:34:30 +0000 (16:04 +0530)]
Merge pull request #1237 from BookStackApp/phpcs-fixes

PHPCS related fixes.

6 years agoPHPCS related fixes. 1237/head
abijeet [Sun, 27 Jan 2019 10:29:23 +0000 (15:59 +0530)]
PHPCS related fixes.

6 years agoAdded extra s3 config parameters for use s3-like service compatibility
Dan Brown [Sun, 20 Jan 2019 15:23:49 +0000 (15:23 +0000)]
Added extra s3 config parameters for use s3-like service compatibility

For #1192 and #1195

6 years agoUpdated socialite to work around google+ API shutdown
Dan Brown [Sun, 20 Jan 2019 14:58:06 +0000 (14:58 +0000)]
Updated socialite to work around google+ API shutdown

Fixes #1190
Will require docs update

6 years agoAdded ability for date format strings to be localized by back-end
Dan Brown [Sat, 19 Jan 2019 12:11:18 +0000 (12:11 +0000)]
Added ability for date format strings to be localized by back-end

Requires the locale to be installed on the system-side.
Closes #1214

6 years agoFixed firefox page print view and removed comments from prints
Dan Brown [Sat, 19 Jan 2019 11:33:11 +0000 (11:33 +0000)]
Fixed firefox page print view and removed comments from prints

Closes #1211

6 years agoUpdated sidebar to prevent rubber-banding with comments disabled
Dan Brown [Sat, 19 Jan 2019 11:10:46 +0000 (11:10 +0000)]
Updated sidebar to prevent rubber-banding with comments disabled

Fixes #1218

6 years agoUpdated TinyMCE and fixed TinyMCE/Codemirror cursor jumping
Dan Brown [Sat, 12 Jan 2019 19:23:18 +0000 (19:23 +0000)]
Updated TinyMCE and fixed TinyMCE/Codemirror cursor jumping

For #1162

6 years agoMerge pull request #1205 from BookStackApp/env-cleanup
Dan Brown [Sun, 6 Jan 2019 16:05:51 +0000 (16:05 +0000)]
Merge pull request #1205 from BookStackApp/env-cleanup

Simplified example env and created full example copy

6 years agoCommented APP_URL by default to prevent upgrade path issues 1205/head
Dan Brown [Sun, 6 Jan 2019 16:01:24 +0000 (16:01 +0000)]
Commented APP_URL by default to prevent upgrade path issues

6 years agoSimplified example env and created full example copy
Dan Brown [Sun, 6 Jan 2019 15:46:16 +0000 (15:46 +0000)]
Simplified example env and created full example copy

6 years agoMerge pull request #1197 from moucho/master
Dan Brown [Sun, 6 Jan 2019 14:37:11 +0000 (14:37 +0000)]
Merge pull request #1197 from moucho/master

Spanish update

6 years agoPrevented page text content includes
Dan Brown [Sat, 5 Jan 2019 17:18:40 +0000 (17:18 +0000)]
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

6 years agoMerge branch 'cw1998-fix/#1110'
Dan Brown [Sat, 5 Jan 2019 15:22:59 +0000 (15:22 +0000)]
Merge branch 'cw1998-fix/#1110'

6 years agoAdded test to cover "users" header link in correct permission conditions
Dan Brown [Sat, 5 Jan 2019 15:22:47 +0000 (15:22 +0000)]
Added test to cover "users" header link in correct permission conditions

6 years agoMerge branch 'fix/#1110' of git://github.com/cw1998/BookStack into cw1998-fix/#1110
Dan Brown [Sat, 5 Jan 2019 15:12:33 +0000 (15:12 +0000)]
Merge branch 'fix/#1110' of git://github.com/cw1998/BookStack into cw1998-fix/#1110

6 years agoMerge branch 'qianmengnet-master'
Dan Brown [Sat, 5 Jan 2019 15:01:38 +0000 (15:01 +0000)]
Merge branch 'qianmengnet-master'

6 years agoTweaked profile page anchor links and swapped register/login links
Dan Brown [Sat, 5 Jan 2019 15:01:16 +0000 (15:01 +0000)]
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

6 years agoMerge branch 'master' of git://github.com/qianmengnet/BookStack into qianmengnet...
Dan Brown [Sat, 5 Jan 2019 14:47:47 +0000 (14:47 +0000)]
Merge branch 'master' of git://github.com/qianmengnet/BookStack into qianmengnet-master

6 years agoMade delete permissions a requirement for move operations
Dan Brown [Sat, 5 Jan 2019 14:39:40 +0000 (14:39 +0000)]
Made delete permissions a requirement for move operations

Closes #1200

6 years agoUse joint_permissions to determine is a user has an available page or chapter to... 1202/head
Mark James [Wed, 2 Jan 2019 05:55:28 +0000 (16:55 +1100)]
Use joint_permissions to determine is a user has an available page or chapter to copy.

6 years agoInitial updates to allow for page copy when the user can read the page but can't...
Mark James [Mon, 31 Dec 2018 06:01:49 +0000 (17:01 +1100)]
Initial updates to allow for page copy when the user can read the page but can't update it.

6 years agoMerge pull request #1 from BookStackApp/master
mark-james [Sun, 30 Dec 2018 22:00:19 +0000 (09:00 +1100)]
Merge pull request #1 from BookStackApp/master

Update From Bookstack

6 years agoAdded check for last admin on role change
Dan Brown [Sun, 30 Dec 2018 16:11:58 +0000 (16:11 +0000)]
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.

6 years agoFormat update 1197/head
moucho [Mon, 24 Dec 2018 11:41:42 +0000 (12:41 +0100)]
Format update

6 years agoUpdated configuration files
Dan Brown [Sun, 23 Dec 2018 16:26:39 +0000 (16:26 +0000)]
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.

6 years agoAdded testing for avatar fetching systems & config
Dan Brown [Sun, 23 Dec 2018 15:34:38 +0000 (15:34 +0000)]
Added testing for avatar fetching systems & config

Abstracts imageservice http interaction.
Closes #1193

6 years agoMerge branch 'Vinrobot-custom-avatar-provider'
Dan Brown [Sat, 22 Dec 2018 19:29:35 +0000 (19:29 +0000)]
Merge branch 'Vinrobot-custom-avatar-provider'

6 years agoAbstracted user avatar fetching away from gravatar
Dan Brown [Sat, 22 Dec 2018 19:29:19 +0000 (19:29 +0000)]
Abstracted user avatar fetching away from gravatar

Still uses gravatar as a default.
Updated URL placeholders to follow LDAP format.
Potential breaking config change: `GRAVATAR=false` replaced by `AVATAR_URL=false`
Builds upon #1111

6 years agoMerge branch 'custom-avatar-provider' of git://github.com/Vinrobot/BookStack into...
Dan Brown [Sat, 22 Dec 2018 18:18:14 +0000 (18:18 +0000)]
Merge branch 'custom-avatar-provider' of git://github.com/Vinrobot/BookStack into Vinrobot-custom-avatar-provider

6 years agoUpdated composer with bumped php version and extra extensions
Dan Brown [Sat, 22 Dec 2018 16:49:09 +0000 (16:49 +0000)]
Updated composer with bumped php version and extra extensions

6 years agoMerge pull request #1096 from christophert/add-ldaptlsinsecure
Dan Brown [Sat, 22 Dec 2018 16:38:50 +0000 (16:38 +0000)]
Merge pull request #1096 from christophert/add-ldaptlsinsecure

Add option to disable LDAPS Certificate Validation

6 years agoUpdated page exports to use absolute time format
Dan Brown [Sat, 22 Dec 2018 16:35:04 +0000 (16:35 +0000)]
Updated page exports to use absolute time format

For #1065

6 years agoUpdated DZ upload timeout var name and error handling
Dan Brown [Sat, 22 Dec 2018 15:45:13 +0000 (15:45 +0000)]
Updated DZ upload timeout var name and error handling

For #1133 & #876
Concerns BookStackApp/website#31

6 years agoMerge branch 'master' into dropzone-timeout
Dan Brown [Sat, 22 Dec 2018 15:08:54 +0000 (15:08 +0000)]
Merge branch 'master' into dropzone-timeout

6 years agoMerge pull request #1183 from Mant1kor/master
Dan Brown [Sat, 22 Dec 2018 15:00:56 +0000 (15:00 +0000)]
Merge pull request #1183 from Mant1kor/master

Add Ukrainian translate

6 years agoMerge pull request #1180 from vasiliev123/update-pl-language
Dan Brown [Sat, 22 Dec 2018 14:58:30 +0000 (14:58 +0000)]
Merge pull request #1180 from vasiliev123/update-pl-language

Updates for PL language

6 years agoAdded proper escaping to LDAP filter operations
Dan Brown [Thu, 20 Dec 2018 20:04:09 +0000 (20:04 +0000)]
Added proper escaping to LDAP filter operations

To cover #1163

6 years agoAdded 'uk' locale 1183/head
Mantikor [Tue, 18 Dec 2018 08:03:10 +0000 (10:03 +0200)]
Added 'uk' locale

6 years agoAdd files via upload
Mantikor [Tue, 18 Dec 2018 08:01:50 +0000 (10:01 +0200)]
Add files via upload

6 years agoRename resources/lang/activities.php to resources/lang/uk/activities.php
Mantikor [Tue, 18 Dec 2018 08:01:18 +0000 (10:01 +0200)]
Rename resources/lang/activities.php to resources/lang/uk/activities.php

6 years agoAdd files via upload
Mantikor [Tue, 18 Dec 2018 08:00:45 +0000 (10:00 +0200)]
Add files via upload

6 years agoUpdate settings.php
Mantikor [Mon, 17 Dec 2018 16:16:43 +0000 (18:16 +0200)]
Update settings.php

added 'uk' language

6 years agoUpdate app.php
Mantikor [Mon, 17 Dec 2018 12:10:54 +0000 (14:10 +0200)]
Update app.php

added 'uk' locale

6 years agoRe-enabled plaintext view for email notifications
Dan Brown [Sun, 16 Dec 2018 20:44:57 +0000 (20:44 +0000)]
Re-enabled plaintext view for email notifications

Updated mail notifications to set the HTML and plaintext views since before
no plaintext version was being created.

Closes #1182

6 years agoFixed failing language test after addition of formatter
Dan Brown [Sun, 16 Dec 2018 15:46:02 +0000 (15:46 +0000)]
Fixed failing language test after addition of formatter

6 years agoUpdated codemirror SQL mode name
Dan Brown [Sun, 16 Dec 2018 15:38:49 +0000 (15:38 +0000)]
Updated codemirror SQL mode name

Now will highlight a lot more SQL syntax.
Closes #1181.

6 years agoMade some further fixes to the formatting script
Dan Brown [Sun, 16 Dec 2018 14:04:04 +0000 (14:04 +0000)]
Made some further fixes to the formatting script

Takes into account single and double quotes.
Ignores //! comments and the 'language_select' array.

Language files may need some cleaning up and may encounter some other bugs when running.

6 years agoCleaned up script and formatted remaining EN files
Dan Brown [Sun, 16 Dec 2018 13:12:13 +0000 (13:12 +0000)]
Cleaned up script and formatted remaining EN files

6 years agoCreated sketchy translation formatter script
Dan Brown [Fri, 14 Dec 2018 21:23:05 +0000 (21:23 +0000)]
Created sketchy translation formatter script

Compares a translation file to a EN version to
place translations on matching line numbers and matches
up comments.

6 years ago1. Fixed translation for Copy and Reply 1180/head
Jurij Vasiliev [Thu, 13 Dec 2018 12:58:08 +0000 (13:58 +0100)]
1. Fixed translation for Copy and Reply

6 years agoMajor updates on polish language
Jurij Vasiliev [Thu, 13 Dec 2018 12:21:02 +0000 (13:21 +0100)]
Major updates on polish language
1. Changed Book translation from księga => podręcznik (księga is very old word, and thus not fit to the app. Podręcznik is word for book used in school and fits much more to the documentation site)
2. Changed Entity transaltion from encja => obiekt (encja is word used in IT world, common people doesn't know what it is. Obiekt (object) fits better for no IT geeks and explains them more than word encja)
3. Added Shelf/Bookshelf transaltion. Now they are named Półka/Półki
4. Changed Draft translation from szkic => wersja robocza (in every system like wordpress/wiki etc. the word for draft is wersja robocza. Szkic is word for draft of an image)
5. Fixed typos
6. Fixed unfit plural words when they were not needed

6 years agoMerge branch 'ezzra-german_informal'
Dan Brown [Wed, 12 Dec 2018 20:47:03 +0000 (20:47 +0000)]
Merge branch 'ezzra-german_informal'

6 years agoExtended translations system for arrays & extension
Dan Brown [Wed, 12 Dec 2018 20:46:27 +0000 (20:46 +0000)]
Extended translations system for arrays & extension

Extended the base Laravel translation system to
allow a locale to be based upon another.

Also adds functionality to take base & fallback locales into account when fetching
an array of translations.

Related to work done in #1159

6 years agoMerge branch 'german_informal' of git://github.com/ezzra/BookStack into ezzra-german_...
Dan Brown [Wed, 12 Dec 2018 19:02:16 +0000 (19:02 +0000)]
Merge branch 'german_informal' of git://github.com/ezzra/BookStack into ezzra-german_informal

6 years agode_informal - remove comments from unused lines 1159/head
ezzra [Wed, 12 Dec 2018 09:37:24 +0000 (10:37 +0100)]
de_informal - remove comments from unused lines

6 years agoUpdated readme with phpunit version, removed old translations line
Dan Brown [Tue, 11 Dec 2018 23:26:43 +0000 (23:26 +0000)]
Updated readme with phpunit version, removed old translations line

6 years agoadd german informal language
ezzra [Tue, 11 Dec 2018 18:39:16 +0000 (19:39 +0100)]
add german informal language

6 years agoAdded npm install details
Dan Brown [Tue, 11 Dec 2018 14:54:34 +0000 (14:54 +0000)]
Added npm install details

Closes #1174

6 years agoUpdated NPM dependancies
Dan Brown [Tue, 27 Nov 2018 21:47:34 +0000 (21:47 +0000)]
Updated NPM dependancies

6 years agoMerge pull request #1072 from CliffyPrime/german_update
Dan Brown [Tue, 27 Nov 2018 21:26:18 +0000 (21:26 +0000)]
Merge pull request #1072 from CliffyPrime/german_update

Update german translation

6 years agoMerge pull request #1117 from leomartinez/master
Dan Brown [Tue, 27 Nov 2018 21:24:01 +0000 (21:24 +0000)]
Merge pull request #1117 from leomartinez/master

Updated 'Spanish Argentina' translation.

6 years agoAdd "register" to nav. 1146/head
qianmengnet [Mon, 26 Nov 2018 01:05:38 +0000 (09:05 +0800)]
Add "register" to nav.

Add "register" to nav.You need to click "login" to find register, which is not convenient for people who are not familiar with the app.

6 years agoAdd anchor link to "Created Content" on the "View Profile"
qianmengnet [Mon, 26 Nov 2018 00:47:49 +0000 (08:47 +0800)]
Add anchor link to "Created Content" on the "View Profile"

Add 3 anchor link to "Created Content" on the "View Profile" page and click to jump to the page section

6 years agoFixes image deletion failing in subdirectory. 1143/head
Abijeet [Sat, 24 Nov 2018 19:16:04 +0000 (00:46 +0530)]
Fixes image deletion failing in subdirectory.

Fixes #1092

Signed-off-by: Abijeet <redacted>