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
866187830a
Merge branch 'Vinrobot-custom-avatar-provider'
2018-12-22 19:29:35 +00:00
b56fc21aaf
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
2018-12-22 19:29:19 +00:00
d673bf61c2
Merge branch 'custom-avatar-provider' of git://github.com/Vinrobot/BookStack into Vinrobot-custom-avatar-provider
2018-12-22 18:18:14 +00:00
18b10153e5
Updated composer with bumped php version and extra extensions
2018-12-22 16:49:09 +00:00
7c8edf5673
Merge pull request #1096 from christophert/add-ldaptlsinsecure
...
Add option to disable LDAPS Certificate Validation
2018-12-22 16:38:50 +00:00
f4ea5f1f55
Updated page exports to use absolute time format
...
For #1065
2018-12-22 16:35:04 +00:00
f62843c861
Updated DZ upload timeout var name and error handling
...
For #1133 & #876
Concerns BookStackApp/website#31
2018-12-22 15:45:13 +00:00
5fe630b8d2
Merge branch 'master' into dropzone-timeout
2018-12-22 15:08:54 +00:00
d910defbfd
Merge pull request #1183 from Mant1kor/master
...
Add Ukrainian translate
2018-12-22 15:00:56 +00:00
153adb055c
Merge pull request #1180 from vasiliev123/update-pl-language
...
Updates for PL language
2018-12-22 14:58:30 +00:00
26ec1cc3dc
Added proper escaping to LDAP filter operations
...
To cover #1163
2018-12-20 20:04:09 +00:00
d476e30df0
Added 'uk' locale
2018-12-18 10:03:10 +02:00
37ab97af8c
Add files via upload
2018-12-18 10:01:50 +02:00
7fcd7a5d91
Rename resources/lang/activities.php to resources/lang/uk/activities.php
2018-12-18 10:01:18 +02:00
c67f76f776
Add files via upload
2018-12-18 10:00:45 +02:00
9a444b4a04
Update settings.php
...
added 'uk' language
2018-12-17 18:16:43 +02:00
106f32591d
Update app.php
...
added 'uk' locale
2018-12-17 14:10:54 +02:00
7f6929d716
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
2018-12-16 20:44:57 +00:00
651ae2f3be
Fixed failing language test after addition of formatter
2018-12-16 15:46:02 +00:00
101a7b40b9
Updated codemirror SQL mode name
...
Now will highlight a lot more SQL syntax.
Closes #1181 .
2018-12-16 15:38:49 +00:00
1930ed4d6a
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.
2018-12-16 14:04:04 +00:00
2753629dbe
Cleaned up script and formatted remaining EN files
2018-12-16 13:12:13 +00:00
86a00a59d4
Created sketchy translation formatter script
...
Compares a translation file to a EN version to
place translations on matching line numbers and matches
up comments.
2018-12-14 21:23:05 +00:00
d6dd96e7fc
1. Fixed translation for Copy and Reply
2018-12-13 13:58:08 +01:00
1b1ddb6794
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
2018-12-13 13:39:26 +01:00
f65ff3a9a8
Merge branch 'ezzra-german_informal'
2018-12-12 20:47:03 +00:00
323bff7d6d
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
2018-12-12 20:46:27 +00:00
0e3d507ec2
Merge branch 'german_informal' of git://github.com/ezzra/BookStack into ezzra-german_informal
2018-12-12 19:02:16 +00:00
f943f0d401
de_informal - remove comments from unused lines
2018-12-12 10:37:24 +01:00
1b01d65965
Updated readme with phpunit version, removed old translations line
2018-12-11 23:26:43 +00:00
a2acd063f3
add german informal language
2018-12-11 19:39:16 +01:00
e9e3e8b6b1
Added npm install details
...
Closes #1174
2018-12-11 14:54:34 +00:00
7f95b51b00
Rolled tri-layout to page edit and book-create
2018-12-09 16:51:31 +00:00
ff0b9004bc
Cleaned existing grid view up a little
2018-12-09 14:04:28 +00:00
8fd8652bbf
Added tri-layout desktop sticky-scroll
2018-12-09 13:42:35 +00:00
Dan Brown
Mark James
moucho
Mantikor
Jurij Vasiliev
ezzra