summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Support different server ports - defined by EXECUTOR_NUMBERThomas Müller2015-09-293-8/+14
|
* added delete user testSergio Bertolin2015-09-291-0/+8
|
* Use ci profileThomas Müller2015-09-291-1/+1
|
* Use fixed port for nowThomas Müller2015-09-291-5/+6
|
* Test user creationThomas Müller2015-09-292-45/+110
|
* require autoload.phpThomas Müller2015-09-291-6/+1
|
* Adding phpunit for the assertionsThomas Müller2015-09-291-0/+1
|
* Adding missing filesThomas Müller2015-09-292-0/+94
|
* First integration tests for provisioning apiThomas Müller2015-09-295-0/+59
|
* Merge pull request #17601 from owncloud/publicwebdav-allowajaxwhendisabledThomas Müller2015-09-291-1/+2
|\ | | | | Allow ajax requests on public webdav interface
| * Allow ajax requests on public webdav interfaceVincent Petry2015-09-221-1/+2
| | | | | | | | | | | | | | | | | | | | Whenever outgoing shares are disabled, still allow ajax requests to make it possible to use the Webdav interface in the public link page. Please note that disabling outgoing shares isn't strong anyway as someone could abuse the ajax endpoints to access files anyway. To properly disable remote sharing, public link sharing must be disabled too.
* | Merge pull request #19418 from owncloud/fix-parsehashqueryThomas Müller2015-09-291-3/+1
|\ \ | | | | | | Consider both hash params and query when parsing URL
| * | Consider both hash params and query when parsing URLVincent Petry2015-09-281-3/+1
| | |
* | | Merge pull request #19367 from owncloud/lock-transaction-no-logThomas Müller2015-09-291-4/+0
|\ \ \ | | | | | | | | remove warning when trying to get a lock while in transaction
| * | | remove warning when trying to get a lock while in transactionRobin Appelman2015-09-251-4/+0
| | | |
* | | | Merge pull request #19411 from owncloud/files-sidebar-shareloadspinnerThomas Müller2015-09-292-5/+28
|\ \ \ \ | | | | | | | | | | Show loading spinner for first fetch of shares
| * | | | Show loading spinner for first fetch of sharesVincent Petry2015-09-282-5/+28
| | |/ / | |/| | | | | | | | | | | | | | Whenever the sidebar first loads shares, show a spinner instead of an empty content
* | | | Merge pull request #19417 from owncloud/files-upload-checkconflictbeforeuploadThomas Müller2015-09-292-22/+64
|\ \ \ \ | | | | | | | | | | Show conflict dialog before upload when possible
| * | | | Show conflict dialog before upload when possibleVincent Petry2015-09-282-22/+64
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When uploading files, first check if the files exist in the current file list. For the ones that do, show a conflict dialog. For the rest, upload directly. If the upload operation detects a conflict on the server side, it will also continue populating the conflict dialog. From now on, server side conflict can only occur if someone concurrently uploaded a file into the same folder but the current user hasn't refreshed the list yet.
* | | | Merge pull request #19409 from owncloud/files-sidebar-hiding-tabsThomas Müller2015-09-294-18/+136
|\ \ \ \ | | | | | | | | | | Hide sidebar tab headers conditionally
| * | | | Hide sidebar tab headers conditionallyVincent Petry2015-09-284-18/+136
| |/ / / | | | | | | | | | | | | | | | | Added canDisplay() in DetailsTabView that should return false if the tab header of this tab must be hidden
* | | | Merge pull request #19426 from owncloud/fix-legacy-CSP-for-imagesThomas Müller2015-09-291-1/+1
|\ \ \ \ | | | | | | | | | | Whitelist "data:" in legacy CSP headers
| * | | | Fix CSP for images for legacy appsOlivier Paroz2015-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes #19425
* | | | | Merge pull request #19431 from phil-davis/r2Lukas Reschke2015-09-293-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Session closed exception wording
| * | | | | Session closed exception wordingPhil Davis2015-09-293-3/+3
|/ / / / / | | | | | | | | | | | | | | | and a small comment typo
* / / / / [tx-robot] updated from transifexJenkins for ownCloud2015-09-2918-4/+32
|/ / / /
* | | | Merge pull request #19408 from owncloud/fix-trashbin-checkboxRobin Appelman2015-09-281-1/+1
|\ \ \ \ | | | | | | | | | | Fix checkbox in trashbin
| * | | | fix checkbox in trashbinHendrik Leppelsack2015-09-281-1/+1
| | | | |
* | | | | Merge pull request #19413 from owncloud/share-nopermission-linkVincent Petry2015-09-282-30/+13
|\ \ \ \ \ | |_|/ / / |/| | | | Still show share link when recipient but no share permission
| * | | | Still show share link when recipient but no share permissionVincent Petry2015-09-282-30/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible for the recipient to still trigger the sidebar and share tab to see information about the share. In the case where the file is not shared and no permissions exists, no action icon will be displayed.
* | | | Merge pull request #18548 from owncloud/repair-mimetype-limitversionThomas Müller2015-09-283-25/+54
|\ \ \ \ | | | | | | | | | | Repair mime types only when upgrading from OC 8.0
| * | | | Repair mime types only when upgrading from OC 8.0Vincent Petry2015-09-233-25/+54
| | | | |
* | | | | Merge pull request #19404 from owncloud/files-sidebar-sorttabsThomas Müller2015-09-286-3/+31
|\ \ \ \ \ | | | | | | | | | | | | Fix tabs order in files sidebar
| * | | | | Fix tabs order in files sidebarVincent Petry2015-09-286-3/+31
| | | | | |
* | | | | | Merge pull request #19402 from owncloud/public-recognizeauthsessionThomas Müller2015-09-281-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow public webdav auth to recognize sesssion
| * | | | | | Allow public auth to recognize sesssionVincent Petry2015-09-281-1/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a public link password has been input, its auth is stored in the session. This fix makes it possible to recognize the session when using public webdav from the files UI.
* | | | | | Merge pull request #19401 from owncloud/files-actionsorderThomas Müller2015-09-284-0/+50
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix order of actions in the files actions menu
| * | | | | Fix order of actions in the files actions menuVincent Petry2015-09-284-0/+50
| |/ / / /
* | | | | Merge pull request #19318 from owncloud/tarstreamerThomas Müller2015-09-283-63/+158
|\ \ \ \ \ | | | | | | | | | | | | Stream zip or tar
| * | | | | Updating submoduleThomas Müller2015-09-281-0/+0
| | | | | |
| * | | | | Updating TarStreamer to v0.1-beta3Thomas Müller2015-09-281-0/+0
| | | | | |
| * | | | | Adding ownCloud/TarStreamerThomas Müller2015-09-282-1/+1
| | | | | |
| * | | | | Uniform behavour for tar and zipVictor Dubiniuk2015-09-281-1/+6
| | | | | |
| * | | | | More correctionsVictor Dubiniuk2015-09-282-11/+7
| | | | | |
| * | | | | Add namespace. Fix broken zipVictor Dubiniuk2015-09-282-5/+8
| | | | | |
| * | | | | Add PHpdocVictor Dubiniuk2015-09-281-6/+40
| | | | | |
| * | | | | Introduce streamerVictor Dubiniuk2015-09-282-63/+120
| | | | | |
| * | | | | Add submodule dependencyVictor Dubiniuk2015-09-281-0/+0
|/ / / / /
* | | | | Merge pull request #18469 from owncloud/ldap-batch-read-attrs-ngThomas Müller2015-09-2810-101/+516
|\ \ \ \ \ | | | | | | | | | | | | read all relevant user attributes on login and user search, in one qu…
| * | | | | do not throw exception when no attribute is specifiedArthur Schiwon2015-09-232-1/+107
| | | | | |