summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19215 from owncloud/fix_trashbin_previewsThomas Müller2015-09-211-0/+4
|\ | | | | fix trashbin previews for text files
| * make sure to add the correct file size to the file info, otherwise we will ↵Bjoern Schiessle2015-09-211-0/+4
| | | | | | | | not show the preview for every filetype
* | Merge pull request #18481 from owncloud/fix-apache-login-masterThomas Müller2015-09-211-4/+6
|\ \ | | | | | | Repeated calls to loginWithApache() should not not try to set user in…
| * | Repeated calls to loginWithApache() should not not try to set user ↵Thomas Müller2015-09-211-4/+6
| |/ | | | | | | information in the session again
* | Merge pull request #18709 from owncloud/cleanup-login-semanticsThomas Müller2015-09-212-5/+4
|\ \ | | | | | | Pushes input inside the bottom group - login.
| * | Squashing all commits in one, remove typos.Raghu Nayyar2015-09-122-5/+4
| | |
* | | Merge pull request #19221 from owncloud/improved_error_messagesThomas Müller2015-09-212-0/+20
|\ \ \ | | | | | | | | decrypt-all: improved error message if user doesn't exists
| * | | improved error message if user doesn't existsBjoern Schiessle2015-09-212-0/+20
| | |/ | |/|
* | | Merge pull request #17347 from owncloud/dav-fopen-overwriteRobin Appelman2015-09-211-2/+7
|\ \ \ | | | | | | | | dont download the existing file for webdav if we're going to overwrite it
| * | | dont download the existing file for webdav if we're going to overwrite itRobin Appelman2015-09-211-2/+7
| | | |
* | | | Merge pull request #19081 from owncloud/prevent0bytedownloadsRobin Appelman2015-09-212-2/+22
|\ \ \ \ | |/ / / |/| | | prevent 0 byte downloads when storage returns false
| * | | add unit testRobin Appelman2015-09-171-0/+17
| | | |
| * | | prevent 0 byte downloads when storage returns falseJörn Friedrich Dreyer2015-09-171-2/+5
| | | |
* | | | Merge pull request #19189 from owncloud/fix-19135Hendrik Leppelsack2015-09-213-4/+15
|\ \ \ \ | |_|/ / |/| | | Fix missing checkboxes in file comparator
| * | | fix missing checkboxes in file comparatorHendrik Leppelsack2015-09-213-4/+15
|/ / /
* | | Merge pull request #19122 from owncloud/discardexpirationdatefornonlinksharesThomas Müller2015-09-211-0/+5
|\ \ \ | | | | | | | | Discard expiration date from result for non-link shares
| * | | Discard expiration date from result for non-link sharesVincent Petry2015-09-171-0/+5
| |/ /
* | | Merge pull request #19176 from owncloud/fix-19118Thomas Müller2015-09-212-11/+12
|\ \ \ | | | | | | | | Fix checkboxes in files_external
| * | | fix checkboxes in files_externalHendrik Leppelsack2015-09-192-11/+12
| | | |
* | | | Merge pull request #19197 from radarhere/patch-1Thomas Müller2015-09-211-1/+1
|\ \ \ \ | | | | | | | | | | Fixed typo
| * | | | Fixed typoAndrew Murray2015-09-211-1/+1
| | | | |
* | | | | Merge pull request #19183 from owncloud/oparoz-sharejs-typoThomas Müller2015-09-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Typo
| * | | | | TypoOlivier Paroz2015-09-191-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #19148 from ↵Thomas Müller2015-09-214-10/+43
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-19113-stop-setting-single-user-in-constructor Do not set single user in constructor of encryption occ commands
| * | | | | Also catch exceptions on encryptAll and reset trashbin and singleUser modeJoas Schilling2015-09-181-2/+7
| | | | | |
| * | | | | Do not set single user in constructorJoas Schilling2015-09-184-8/+36
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-216-8/+8
| |_|/ / / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-2018-0/+46
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-194-0/+6
| | | |
* | | | 8.2 beta1v8.2beta1C Montero-Luque2015-09-181-2/+2
| | | |
* | | | Merge pull request #19008 from owncloud/jquery_avatar_testsThomas Müller2015-09-182-1/+241
|\ \ \ \ | | | | | | | | | | JS tests for jquery.avatar
| * | | | Added js tests for jquery.avatarRoeland Jago Douma2015-09-142-1/+241
| | | | | | | | | | | | | | | | | | | | * Ceil avatar request size
* | | | | Merge pull request #19028 from owncloud/McNetic-zipstreamer-0.7Thomas Müller2015-09-182-4/+1
|\ \ \ \ \ | | | | | | | | | | | | [jenkins] changed ZipStreamer to use composer for updates, update to 0.7
| * \ \ \ \ Merge branch 'zipstreamer-0.7' of https://github.com/McNetic/owncloud_core ↵Thomas Müller2015-09-182-4/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into McNetic-zipstreamer-0.7
| | * | | | | adapted to changed subproject commitNicolai Ehemann2015-09-181-0/+0
| | | | | | |
| | * | | | | use zipstreamer via composerNicolai Ehemann2015-09-142-3/+0
| | | | | | |
| | * | | | | lib/private/files.php: adapted to minimally changed ZipStreamer APINicolai Ehemann2015-09-142-2/+2
| | | | | | |
* | | | | | | Merge pull request #19098 from owncloud/db-lock-no-transactionThomas Müller2015-09-183-17/+90
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove the need for the transaction in the database locking backend
| * | | | | | | improve docRobin Appelman2015-09-171-1/+1
| | | | | | | |
| * | | | | | | expire old lock rowsRobin Appelman2015-09-173-13/+101
| | | | | | | |
| * | | | | | | Remove the need for the transaction in the database locking backendRobin Appelman2015-09-171-16/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #19058 from owncloud/multiselect-bar-styleThomas Müller2015-09-181-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | adjust multiselect bar to controls bar, fix #18989
| * | | | | | | adjust multiselect bar to controls bar, fix #18989Jan-Christoph Borchardt2015-09-151-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #18901 from owncloud/encryption-dav-testsThomas Müller2015-09-185-9/+143
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Add tests for doing dav requests with encryption enabled
| * | | | | | | reuse the same datadirRobin Appelman2015-09-181-1/+2
| | | | | | | |
| * | | | | | | Add tests for doing dav requests with encryption enabledRobin Appelman2015-09-181-0/+25
| | | | | | | |
| * | | | | | | Add trait to enable encryption for a unit testRobin Appelman2015-09-181-0/+104
| | | | | | | |
| * | | | | | | create new mounts every time the mount provider is calledRobin Appelman2015-09-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | important for storage wrappers
| * | | | | | | clear up tests a bitRobin Appelman2015-09-181-6/+8
| | | | | | | |
* | | | | | | | Merge pull request #17689 from owncloud/repair-ocs-idsThomas Müller2015-09-184-2/+198
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add repair step for outdated OCS IDs
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-24 07:16:28 +0000