summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Show a link to the docs instead of a button on the untrusted domain pageMorris Jobke2018-04-179-182/+4
| | | | | | | | Before there was a button to "quickly" add the untrusted domain to the config. This button often didn't worked, because the generated URL was often untrusted as well. Thus removing it and providing proper docs seems to be the better approach to handle this rare case. Also the log should not be spammed by messages for the untrusted domain accesses, because they are user related and not necessarily an administrative issue. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #9159 from nextcloud/appinfo-single-localizedMorris Jobke2018-04-174-0/+34
|\ | | | | fix appinfo parsing when a single localized option is provided
| * fix appinfo parsing when a single localized option is providedRobin Appelman2018-04-174-0/+34
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #9203 from nextcloud/declare-func-as-safeMorris Jobke2018-04-172-15/+17
|\ \ | |/ |/| Declare func() as safe method in phan
| * Declare func() as safe method in phanMorris Jobke2018-04-172-15/+17
| | | | | | | | | | | | We added a special `func()` method to the query builder, which is a plain text function by definition. It uses the string and does no escaping on purpose. It has the potential for an injection but requiring to add the "supress warning" to all surrounding code makes it harder to spot actual problems, that this plugin want to find. So it's better to only need to check the func() and not all the surrounding code as well. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9162 from nextcloud/allow-lang-ocs-apiRoeland Jago Douma2018-04-171-1/+7
|\ \ | | | | | | Add language support for user creation
| * | Fixed testsJohn Molakvoæ (skjnldsv)2018-04-161-1/+2
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Add language support for user creationJohn Molakvoæ (skjnldsv)2018-04-161-1/+6
| |/ | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #9184 from nextcloud/bug-9150Morris Jobke2018-04-171-3/+6
|\ \ | | | | | | Fixes issue with the large cursor on Safari in the comment section.
| * | Fixes issue with the large cursor on Safari in the comment section.Abijeet2018-04-141-3/+6
| | | | | | | | | | | | | | | | | | This was being caused due to the `display: inline-block` on the contenteditable div. Signed-off-by: Abijeet <abijeetpatro@gmail.com>
* | | Merge pull request #9206 from nextcloud/fix-select-textRoeland Jago Douma2018-04-171-6/+0
|\ \ \ | | | | | | | | Fix user selectable text for public links for text files
| * | | Fix user selectable text for public links for text filesMorris Jobke2018-04-161-6/+0
| | |/ | |/| | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2018-04-178-4/+8
| | |
* | | Merge pull request #9205 from nextcloud/plaintext-emailsMorris Jobke2018-04-165-16/+80
|\ \ \ | | | | | | | | Provide an option to disable HTML emails
| * | | Provide an option to disable HTML emailsMorris Jobke2018-04-165-16/+80
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #9168 from ↵Morris Jobke2018-04-163-5/+7
|\ \ \ | |/ / |/| | | | | | | | nextcloud/enabled-state-proper-return-and-tests-fixes Return proper boolean user enabled state api
| * | Return proper boolean user enabled state apiJohn Molakvoæ (skjnldsv)2018-04-163-5/+7
|/ / | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #9200 from nextcloud/fix-invalid-phan-detectionblizzz2018-04-161-0/+2
|\ \ | | | | | | Fixes false positive possible sql injection by phan
| * | Fixes false positive possible sql injection by phanMorris Jobke2018-04-161-0/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9172 from nextcloud/karma-avatar-tests-fixMorris Jobke2018-04-161-5/+5
|\ \ | | | | | | Fix js tests with placeholder
| * | Fix js tests with placeholderJohn Molakvoæ (skjnldsv)2018-04-131-5/+5
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2018-04-164-4/+4
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2018-04-146-0/+82
| |
* | [tx-robot] updated from transifexNextcloud bot2018-04-1312-4/+44
|/
* Merge pull request #9164 from nextcloud/fix-autoloaderblizzz2018-04-124-9/+35
|\ | | | | Fix autoloader
| * Fix autoloaderMorris Jobke2018-04-124-9/+35
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #8535 from nextcloud/new-color-generatorJan-Christoph Borchardt2018-04-122-161/+134
|\ | | | | New color generator algorithm
| * Fixed documentationJohn Molakvoæ (skjnldsv)2018-04-061-7/+7
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * fixup! Updated php generatorJohn Molakvoæ (skjnldsv)2018-04-061-8/+9
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Updated php generatorJohn Molakvoæ (skjnldsv)2018-04-061-116/+80
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * New algorithmJohn Molakvoæ (skjnldsv)2018-04-061-46/+54
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #9134 from nextcloud/db-locks-cliRobin Appelman2018-04-127-11/+171
|\ \ | | | | | | dont keep shared database locks when running cli scripts
| * | dont keep shared database locks when running cli scriptsRobin Appelman2018-04-117-11/+171
| | | | | | | | | | | | | | | | | | For cli scripts we don't have the assumption that the universe will be cleaned up soon Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #9158 from nextcloud/revert-9144-allow-lang-ocs-apiMorris Jobke2018-04-121-6/+1
|\ \ \ | | | | | | | | Revert "Add language support for user creation in api"
| * | | Revert "Add language support for user creation in api"Morris Jobke2018-04-121-6/+1
|/ / /
* | | Merge pull request #8820 from nextcloud/mtime-sortMorris Jobke2018-04-121-1/+1
|\ \ \ | | | | | | | | Sorts filepicker files by modified date
| * | | sorts filepicker files by modified dateSagorika Das2018-03-141-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Sagorika Das <sagorika1996@gmail.com>
* | | | [tx-robot] updated from transifexNextcloud bot2018-04-12154-264/+306
| |/ / |/| |
* | | Merge pull request #8452 from sagorika1996/folderMorris Jobke2018-04-111-0/+2
|\ \ \ | | | | | | | | Descend into newly created folder by clicking enter again
| * | | updated jsSagorika Das2018-03-011-5/+1
| | | | | | | | | | | | | | | | Signed-off-by: Sagorika Das <sagorika1996@gmail.com>
| * | | New folder creation flowSagorika Das2018-03-011-0/+6
| | | | | | | | | | | | | | | | | | | | Descend into newly created folder by clicking enter again. Signed-off-by: Sagorika Das <sagorika1996@gmail.com>
* | | | Merge pull request #9145 from nextcloud/use-authorized-github-checksMorris Jobke2018-04-112-0/+8
|\ \ \ \ | | | | | | | | | | Add auth token to github requests
| * | | | Add auth token to github requestsMorris Jobke2018-04-112-0/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #9144 from nextcloud/allow-lang-ocs-apiMorris Jobke2018-04-111-1/+6
|\ \ \ \ \ | | | | | | | | | | | | Add language support for user creation in api
| * | | | | Add language support for user creationJohn Molakvoæ (skjnldsv)2018-04-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | Merge pull request #9148 from nextcloud/dav-read-exceptionRoeland Jago Douma2018-04-111-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | transform exception during file read to sabre exceptions
| * | | | | | transform exception during file read to sabre exceptionsRobin Appelman2018-04-111-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #9097 from nextcloud/bugfix/7661/use_mb_substrJulius Härtl2018-04-111-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use multibyte substring
| * | | | | | | Use multibyte substringRoeland Jago Douma2018-04-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #7661 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | Merge pull request #9024 from nextcloud/fix/app-fetcher-major-minor-versionsMorris Jobke2018-04-116-17/+225
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix version comparison with minor and patch level requirements
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-23 23:49:14 +0000