885 Commits

Author	SHA1	Message	Date
Dan Brown	f63fd4beca	Merge branch 'fix/#1110' of git://github.com/cw1998/BookStack into cw1998-fix/#1110	2019-01-05 15:12:33 +00:00
Dan Brown	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
Dan Brown	3062bf1876	Merge branch 'master' of git://github.com/qianmengnet/BookStack into qianmengnet-master	2019-01-05 14:47:47 +00:00
Dan Brown	a2087fe3ff	Made delete permissions a requirement for move operations ... Closes #1200	2019-01-05 14:39:40 +00:00
Dan Brown	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
Dan Brown	f4ea5f1f55	Updated page exports to use absolute time format ... For #1065	2018-12-22 16:35:04 +00:00
Dan Brown	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
Dan Brown	5fe630b8d2	Merge branch 'master' into dropzone-timeout	2018-12-22 15:08:54 +00:00
Dan Brown	d910defbfd	Merge pull request #1183 from Mant1kor/master ... Add Ukrainian translate	2018-12-22 15:00:56 +00:00
Dan Brown	153adb055c	Merge pull request #1180 from vasiliev123/update-pl-language ... Updates for PL language	2018-12-22 14:58:30 +00:00
Mantikor	37ab97af8c	Add files via upload	2018-12-18 10:01:50 +02:00
Mantikor	7fcd7a5d91	Rename resources/lang/activities.php to resources/lang/uk/activities.php	2018-12-18 10:01:18 +02:00
Mantikor	c67f76f776	Add files via upload	2018-12-18 10:00:45 +02:00
Mantikor	9a444b4a04	Update settings.php ... added 'uk' language	2018-12-17 18:16:43 +02:00
Dan Brown	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
Dan Brown	101a7b40b9	Updated codemirror SQL mode name ... Now will highlight a lot more SQL syntax. Closes #1181.	2018-12-16 15:38:49 +00:00
Dan Brown	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
Dan Brown	2753629dbe	Cleaned up script and formatted remaining EN files	2018-12-16 13:12:13 +00:00
Dan Brown	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
Jurij Vasiliev	d6dd96e7fc	1. Fixed translation for Copy and Reply	2018-12-13 13:58:08 +01:00
Jurij Vasiliev	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
Dan Brown	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
ezzra	f943f0d401	de_informal - remove comments from unused lines	2018-12-12 10:37:24 +01:00
ezzra	a2acd063f3	add german informal language	2018-12-11 19:39:16 +01:00
Dan Brown	4cf43f67d6	Merge pull request #1072 from CliffyPrime/german_update ... Update german translation	2018-11-27 21:26:18 +00:00
Dan Brown	86899864dd	Merge pull request #1117 from leomartinez/master ... Updated 'Spanish Argentina' translation.	2018-11-27 21:24:01 +00:00
qianmengnet	3c796b1ae7	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.	2018-11-26 09:05:38 +08:00
qianmengnet	b7915cc7b0	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	2018-11-26 08:47:49 +08:00
Abijeet	eac82c47a5	Fixes image deletion failing in subdirectory. ... Fixes #1092 Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-11-25 00:46:04 +05:30
Abijeet	d3d3e2ad3e	Added a default timeout of 60 seconds to dropzone. ... Fixes #876	2018-11-18 00:22:08 +05:30
Christopher Wilkinson	54b36cd305	Show users link in top nav if user is signed in and only manages users	2018-11-13 13:43:20 +00:00
Leonardo Martinez	f8396d3632	Updated 'Spanish Argentina' translation.	2018-11-12 10:15:06 -03:00
Dan Brown	302b53562d	Fixed clipboard imports	2018-11-10 16:08:33 +00:00
Dan Brown	d0c166c207	Added linked images to markdown paste insert	2018-11-10 15:35:13 +00:00
Dan Brown	321b53c827	Merge branch 'master' of git://github.com/thomasjsn/BookStack into thomasjsn-master	2018-11-10 15:23:29 +00:00
Dan Brown	0724ae3640	Merge pull request #1098 from TheLastOperator/master ... Update french translations	2018-11-10 13:58:56 +00:00
Dan Brown	cfc1a2f045	Removed settings that had been copied from en	2018-11-10 13:55:13 +00:00
Dan Brown	b012f27ae3	Merge branch 'master' of git://github.com/qianmengnet/BookStack into qianmengnet-master	2018-11-10 13:54:35 +00:00
Dan Brown	58bec7287f	Merge pull request #1088 from kejjang/zh_TW_update ... Update zh_TW translation	2018-11-10 13:52:23 +00:00
Dan Brown	9341ae4910	Merge pull request #1066 from limkukhyun/codev-kuk-master ... completed the Korean translation. Please accept the pull request	2018-11-10 13:50:39 +00:00
Dan Brown	1328755f95	Merge pull request #1034 from DeehSlash/pt_br_translations ... Adds missing pt_BR translation	2018-11-10 13:47:38 +00:00
Dan Brown	e3230f8f21	Standardised module loading system & fixed build system ... Fixed broken build system in broken webpack version. Also updates module system to standardise on ES6 import/exports, Especially since babel has changed it's 'default' logic for the old module system.	2018-11-09 21:17:35 +00:00
qianmengnet	fd37d95ffc	Chinese translation update for v0.24.1 ... 0.24.1	2018-11-08 08:10:04 +08:00
Florian PREVOST	1c89fcd20a	Update french translasion	2018-10-30 15:13:17 +01:00
Kej	773ab9d7ff	Update zh_TW translation	2018-10-25 11:38:49 +08:00
CliffyPrime	6c7d87c836	Update german translation ... Started working on updating / completing the german translation files, as some recent changes (shelves etc.) are not yet translated. Also changed some wordings to better fit into the flow and word order of the german language. Started with two small files, will do more soon...	2018-10-17 23:44:13 +02:00
codev-kuk-mac	5d1162fb64	translate complate	2018-10-15 16:36:11 +09:00
Thomas Jensen	90929baa52	Wrap images inserted with markdown editor with anchor tag to original file ref #1062	2018-10-13 21:43:35 +02:00
codev-kuk-mac	4afc67a962	settings - completed ... entities - Some edits done	2018-10-12 17:22:29 +09:00
codev-kuk-mac	042d8b3274	translate entities, setting	2018-10-12 16:06:08 +09:00