summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | | | Bump autoloaderRoeland Jago Douma2018-04-112-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | | Log possible exception caused by wrong version numberMorris Jobke2018-04-111-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | | | Fix version comparison with minor and patch level requirementsChristoph Wurst2018-04-114-14/+215
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an app requires a specific minor or path level server version, the version_compare prevented the installation as only the major version had been compared and that checks obviously returns `false`. Now the full version is used for comparison, making it possible to release apps for a specific minor or patch level version of Nextcloud. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | Merge pull request #7800 from Abijeet/bug-7281Morris Jobke2018-04-116-104/+242
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixes the usability issues with the comment section delete and edit
| * | | | | | | | Fixing failing test cases due to change in functionality.Abijeet2018-03-273-26/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes scrutinizer warnings. Signed-off-by: Abijeet <abijeetpatro@gmail.com>
| * | | | | | | | Disabled comment changes opacity only for message text.Abijeet2018-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Abijeet <abijeetpatro@gmail.com>
| * | | | | | | | Adds a tooltip for the submit / save button in comments.Abijeet2018-03-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Towards #7281 Also hiding the menu before triggering click action. Signed-off-by: Abijeet <abijeetpatro@gmail.com>
| * | | | | | | | Added ellipsis for longer usernames.Abijeet2018-03-271-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Towards #7281 Signed-off-by: Abijeet <abijeetpatro@gmail.com>
| * | | | | | | | Moves the edit and delete options into a dropdown menu.Abijeet2018-03-274-25/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #7281 - Added a new View to render the dropdown. - Modified the existing code. Signed-off-by: Abijeet <abijeetpatro@gmail.com>
| * | | | | | | | Converts the css file to scss file, and adds border-top to comments.Abijeet2018-03-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Abijeet <abijeetpatro@gmail.com>
| * | | | | | | | Fixes the following UI issues,Abijeet2018-03-272-57/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Increased the size of the delete, edit, close and submit buttons to take up 44x44px. 2. Now showing the delete button at all times when editing to avoid usability issues with touch screens. 3. Edit icon is also shown at all times, rather than only on hover. 4. Reduced the gap between comments a wee bit. 5. Fixed issues with focus event now working properly for edit and delete. 6. Removed absolute positioning of elements for alignment. 7. Fixed issue with tooltips becoming too high due to padding around actions. Occurred due to my changes. 8. Changed the position of the submit and close icons. 9. Fixed issue with jumping of the delete icon in Firefox. Occurred due to my changes. 10. Fixed issue with wrapping of content due to long author names. Occurred due to my changes. 11. Fixed issue with longer comments not appearing properly. This might have occurred due to my changes. Signed-off-by: Abijeet <abijeetpatro@gmail.com>
| * | | | | | | | Fixes div being added placed directly under ul during editing of comments.Abijeet2018-03-271-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Abijeet <abijeetpatro@gmail.com>
| * | | | | | | | Fixes issue where saving a non-modified comment kept the edit window open.Abijeet2018-03-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now irrespective of the whether the comment has been modified we are going to go back to the view mode. Signed-off-by: Abijeet <abijeetpatro@gmail.com>
* | | | | | | | | Merge pull request #9147 from nextcloud/log-previous-exceptionMorris Jobke2018-04-111-12/+23
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | log previous exception
| * | | | | | | | log previous exceptionRobin Appelman2018-04-111-12/+23
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | Merge pull request #8946 from nextcloud/log-exceptions-as-nested-array-2Morris Jobke2018-04-114-58/+129
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Log exceptions as nested array instead of encoded json
| * | | | | | | | adjust tests to new exception log formatRobin Appelman2018-04-112-14/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>