summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9309 from nextcloud/feature/noid/no_js_sharepermission_logicMorris Jobke2018-04-272-17/+7
|\ | | | | Do not add sharePermission logic in JS
| * Fix sharedfilelistSpec.js testsRoeland Jago Douma2018-04-261-3/+6
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Do not add sharePermission logic in JSRoeland Jago Douma2018-04-261-14/+1
| | | | | | | | | | | | | | We have a dedicated dav property. We should do all the magic in 1 place. Not several. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | unbound cloned connection fixRoger Szabo2018-04-271-0/+3
| | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
* | Merge pull request #9319 from nextcloud/rakekniven-patch-1Morris Jobke2018-04-271-1/+1
|\ \ | | | | | | Fixed typo
| * | Fixed typorakekniven2018-04-261-1/+1
| |/
* / [tx-robot] updated from transifexNextcloud bot2018-04-2738-46/+122
|/
* move log constants to ILoggerArthur Schiwon2018-04-2626-134/+167
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* [tx-robot] updated from transifexNextcloud bot2018-04-262-0/+2
|
* Merge pull request #9256 from nextcloud/fed-sharing-improvementsMorris Jobke2018-04-256-89/+25
|\ | | | | improve error reporting and move format parameter to the options
| * improve error reporting and move format parameter to the optionsBjoern Schiessle2018-04-256-89/+25
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #9296 from nextcloud/migrate-groups-fetch-to-ocs-apiMorris Jobke2018-04-251-369/+373
|\ \ | | | | | | Migrate groups fetch to ocs api
| * | Workflow engine to ocs apiJohn Molakvoæ (skjnldsv)2018-04-251-369/+373
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #9284 from nextcloud/bugfix/9279/strict_sharee_apiMorris Jobke2018-04-251-5/+6
|\ \ \ | | | | | | | | Make ShareesAPIController strict
| * | | Make ShareesAPIController strictRoeland Jago Douma2018-04-231-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #9279 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #8540 from nextcloud/theming-advancedMorris Jobke2018-04-2516-620/+713
|\ \ \ \ | | | | | | | | | | Add option for header logo and favicon in theming app
| * | | | Add more tests for ImageManagerJulius Härtl2018-04-191-0/+91
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix theming testsJulius Härtl2018-04-197-253/+186
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Make sure the custom favicon is usedJulius Härtl2018-04-191-2/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add typehintsJulius Härtl2018-04-193-3/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix background colorJulius Härtl2018-04-191-5/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Return valueJulius Härtl2018-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Remove unneeded preview image handlingJulius Härtl2018-04-191-3/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix undo preview and remove duplicate codeJulius Härtl2018-04-192-29/+28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add advanced theming options to frontendJulius Härtl2018-04-191-7/+37
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Use generic image upload in theming JSJulius Härtl2018-04-191-45/+17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Use SCSS for previewing images as wellJulius Härtl2018-04-191-6/+39
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Move theming settings to SCSSJulius Härtl2018-04-192-107/+120
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Move to more generic image handling and add extra imagesJulius Härtl2018-04-196-175/+187
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-04-252-0/+2
| | | | |
* | | | | Merge pull request #9248 from nextcloud/fix-files-ellipsisRoeland Jago Douma2018-04-242-84/+27
|\ \ \ \ \ | | | | | | | | | | | | Fix ellipsis in filename column
| * | | | | Add min-width to trick the table width calculation in safariJulius Härtl2018-04-221-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Use flex based layout inside the filename table cellJulius Härtl2018-04-192-84/+24
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #9282 from nextcloud/bugfix/9279/scrit_type_share_apiJoas Schilling2018-04-242-54/+55
|\ \ \ \ \ | | | | | | | | | | | | Make the ShareAPIController strict
| * | | | | Fix testsRoeland Jago Douma2018-04-242-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Make the ShareAPIController strictRoeland Jago Douma2018-04-231-40/+39
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #9279 With types we can force php to not cast a full nummeric user to an int. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / | | | [tx-robot] updated from transifexNextcloud bot2018-04-2410-0/+10
|/ / / /
* | | | Merge pull request #9278 from nextcloud/bug/noid/ldap-wizard-newaccessMorris Jobke2018-04-232-2/+2
|\ \ \ \ | | | | | | | | | | Access needs UserManager, missed to add in #8833
| * | | | Access needs UserManager, missed to add in #8833Arthur Schiwon2018-04-232-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Fix DI for federated file sharing controllerMorris Jobke2018-04-233-8/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #9245 from ↵Roeland Jago Douma2018-04-231-1/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix-race-condition-when-preparing-upload-folder Fix race condition when preparing upload folder
| * | | | | Fix race condition when preparing upload folderDaniel Calviño Sánchez2018-04-221-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before any upload is submitted the upload is registered in a list of known uploads; this is needed to retrieve the upload object at several points of the upload process. When a chunked upload is submitted first a directory to upload all the chunks is created and, once that is done, the chunks are sent; in order to send a chunk the upload object needs to be retrieved from the list of known uploads. When all the active uploads were finished the list of known uploads was cleared. However, an upload is not active until it actually starts sending the data, so while waiting for the upload directory to be created the upload is already in the list of known uploads yet not active. Due to all this, if the active uploads finished while another pending upload was waiting for the upload directory to be created that pending upload would be removed from the list of known uploads too, and once the directory was created and thus the chunks were sent a field of a null upload object would be accessed thus causing a failure. Instead of removing all the known uploads at once when the active uploads finish now each upload is explicitly removed when it finishes. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | Merge pull request #9255 from nextcloud/less-deprecated-callsRoeland Jago Douma2018-04-237-26/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | Less deprecated calls to OCP\Util::writeLog
| * | | | | | Less deprecated calls to OCP\Util::writeLogMorris Jobke2018-04-227-26/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2018-04-232-0/+2
| |/ / / / / |/| | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-04-2218-24/+28
| |/ / / / |/| | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2018-04-2110-2/+32
|/ / / /
* / / / [tx-robot] updated from transifexNextcloud bot2018-04-2010-0/+14
|/ / /
* | | Merge pull request #9224 from nextcloud/accessibility-improvementsMorris Jobke2018-04-193-9/+12
|\ \ \ | |/ / |/| | Add labels for Contacts menu and Settings, thanks to @MarcoZehe
| * | Ensure proper color contrast according to WCAG AAJan-Christoph Borchardt2018-04-183-9/+12
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>