Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Log classnames of arguments in exception trace | Robin Appelman | 2018-04-17 | 4 | -95/+145 |
| | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | Merge pull request #9159 from nextcloud/appinfo-single-localized | Morris Jobke | 2018-04-17 | 4 | -0/+34 |
|\ | | | | | fix appinfo parsing when a single localized option is provided | ||||
| * | fix appinfo parsing when a single localized option is provided | Robin Appelman | 2018-04-17 | 4 | -0/+34 |
| | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | Merge pull request #9203 from nextcloud/declare-func-as-safe | Morris Jobke | 2018-04-17 | 2 | -15/+17 |
|\ \ | |/ |/| | Declare func() as safe method in phan | ||||
| * | Declare func() as safe method in phan | Morris Jobke | 2018-04-17 | 2 | -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-api | Roeland Jago Douma | 2018-04-17 | 1 | -1/+7 |
|\ \ | | | | | | | Add language support for user creation | ||||
| * | | Fixed tests | John Molakvoæ (skjnldsv) | 2018-04-16 | 1 | -1/+2 |
| | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | Add language support for user creation | John Molakvoæ (skjnldsv) | 2018-04-16 | 1 | -1/+6 |
| |/ | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | Merge pull request #9184 from nextcloud/bug-9150 | Morris Jobke | 2018-04-17 | 1 | -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. | Abijeet | 2018-04-14 | 1 | -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-text | Roeland Jago Douma | 2018-04-17 | 1 | -6/+0 |
|\ \ \ | | | | | | | | | Fix user selectable text for public links for text files | ||||
| * | | | Fix user selectable text for public links for text files | Morris Jobke | 2018-04-16 | 1 | -6/+0 |
| | |/ | |/| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-04-17 | 8 | -4/+8 |
| | | | |||||
* | | | Merge pull request #9205 from nextcloud/plaintext-emails | Morris Jobke | 2018-04-16 | 5 | -16/+80 |
|\ \ \ | | | | | | | | | Provide an option to disable HTML emails | ||||
| * | | | Provide an option to disable HTML emails | Morris Jobke | 2018-04-16 | 5 | -16/+80 |
| |/ / | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #9168 from ↵ | Morris Jobke | 2018-04-16 | 3 | -5/+7 |
|\ \ \ | |/ / |/| | | | | | | | | nextcloud/enabled-state-proper-return-and-tests-fixes Return proper boolean user enabled state api | ||||
| * | | Return proper boolean user enabled state api | John Molakvoæ (skjnldsv) | 2018-04-16 | 3 | -5/+7 |
|/ / | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | Merge pull request #9200 from nextcloud/fix-invalid-phan-detection | blizzz | 2018-04-16 | 1 | -0/+2 |
|\ \ | | | | | | | Fixes false positive possible sql injection by phan | ||||
| * | | Fixes false positive possible sql injection by phan | Morris Jobke | 2018-04-16 | 1 | -0/+2 |
|/ / | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #9172 from nextcloud/karma-avatar-tests-fix | Morris Jobke | 2018-04-16 | 1 | -5/+5 |
|\ \ | | | | | | | Fix js tests with placeholder | ||||
| * | | Fix js tests with placeholder | John Molakvoæ (skjnldsv) | 2018-04-13 | 1 | -5/+5 |
| | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-04-16 | 4 | -4/+4 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-04-14 | 6 | -0/+82 |
| | | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-04-13 | 12 | -4/+44 |
|/ | |||||
* | Merge pull request #9164 from nextcloud/fix-autoloader | blizzz | 2018-04-12 | 4 | -9/+35 |
|\ | | | | | Fix autoloader | ||||
| * | Fix autoloader | Morris Jobke | 2018-04-12 | 4 | -9/+35 |
|/ | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | Merge pull request #8535 from nextcloud/new-color-generator | Jan-Christoph Borchardt | 2018-04-12 | 2 | -161/+134 |
|\ | | | | | New color generator algorithm | ||||
| * | Fixed documentation | John Molakvoæ (skjnldsv) | 2018-04-06 | 1 | -7/+7 |
| | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | fixup! Updated php generator | John Molakvoæ (skjnldsv) | 2018-04-06 | 1 | -8/+9 |
| | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | Updated php generator | John Molakvoæ (skjnldsv) | 2018-04-06 | 1 | -116/+80 |
| | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | New algorithm | John Molakvoæ (skjnldsv) | 2018-04-06 | 1 | -46/+54 |
| | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | Merge pull request #9134 from nextcloud/db-locks-cli | Robin Appelman | 2018-04-12 | 7 | -11/+171 |
|\ \ | | | | | | | dont keep shared database locks when running cli scripts | ||||
| * | | dont keep shared database locks when running cli scripts | Robin Appelman | 2018-04-11 | 7 | -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-api | Morris Jobke | 2018-04-12 | 1 | -6/+1 |
|\ \ \ | | | | | | | | | Revert "Add language support for user creation in api" | ||||
| * | | | Revert "Add language support for user creation in api" | Morris Jobke | 2018-04-12 | 1 | -6/+1 |
|/ / / | |||||
* | | | Merge pull request #8820 from nextcloud/mtime-sort | Morris Jobke | 2018-04-12 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Sorts filepicker files by modified date | ||||
| * | | | sorts filepicker files by modified date | Sagorika Das | 2018-03-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Sagorika Das <sagorika1996@gmail.com> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-04-12 | 154 | -264/+306 |
| |/ / |/| | | |||||
* | | | Merge pull request #8452 from sagorika1996/folder | Morris Jobke | 2018-04-11 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Descend into newly created folder by clicking enter again | ||||
| * | | | updated js | Sagorika Das | 2018-03-01 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Sagorika Das <sagorika1996@gmail.com> | ||||
| * | | | New folder creation flow | Sagorika Das | 2018-03-01 | 1 | -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-checks | Morris Jobke | 2018-04-11 | 2 | -0/+8 |
|\ \ \ \ | | | | | | | | | | | Add auth token to github requests | ||||
| * | | | | Add auth token to github requests | Morris Jobke | 2018-04-11 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | | Merge pull request #9144 from nextcloud/allow-lang-ocs-api | Morris Jobke | 2018-04-11 | 1 | -1/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Add language support for user creation in api | ||||
| * | | | | | Add language support for user creation | John Molakvoæ (skjnldsv) | 2018-04-11 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | | | | | Merge pull request #9148 from nextcloud/dav-read-exception | Roeland Jago Douma | 2018-04-11 | 1 | -1/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | transform exception during file read to sabre exceptions | ||||
| * | | | | | | transform exception during file read to sabre exceptions | Robin Appelman | 2018-04-11 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | | | | | Merge pull request #9097 from nextcloud/bugfix/7661/use_mb_substr | Julius Härtl | 2018-04-11 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use multibyte substring | ||||
| * | | | | | | | Use multibyte substring | Roeland Jago Douma | 2018-04-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #7661 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | | | | | Merge pull request #9024 from nextcloud/fix/app-fetcher-major-minor-versions | Morris Jobke | 2018-04-11 | 6 | -17/+225 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix version comparison with minor and patch level requirements |