summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19723 from owncloud/strip-directoryThomas Müller2015-10-132-5/+49
|\ | | | | Strip directory from scriptName
| * Strip directory from scriptNameLukas Reschke2015-10-122-5/+49
| | | | | | | | `\OCP\IRequest::getScriptName` will also return the directory, so if ownCloud is installed in a subfolder such as `owncloud/` it will resolve to `/owncloud/ocs/v2.php`. This made this check fail and also made it return invalid status codes.
* | Merge pull request #19719 from owncloud/edit-iconThomas Müller2015-10-133-0/+8
|\ \ | |/ |/| add specific edit icon
| * add specific edit iconJan-Christoph Borchardt2015-10-133-0/+8
|/
* Merge pull request #19683 from owncloud/repair-donotrepairfoldermimetypesThomas Müller2015-10-122-2/+28
|\ | | | | Do not update mime types for folders with extension
| * Do not update mime types for folders with extensionVincent Petry2015-10-092-2/+28
| | | | | | | | | | | | Some folders might have an extension like "test.conf". This fix prevents to overwrite the folder's mime type with another mime type while running the mimetype repair step.
* | Merge pull request #19708 from owncloud/revert-19628-files-canceluploaddebounceThomas Müller2015-10-121-5/+6
|\ \ | | | | | | Revert "Debounce cancel upload message"
| * | Revert "Debounce cancel upload message"Thomas Müller2015-10-121-5/+6
| | |
* | | Merge pull request #19703 from owncloud/revert-19702-trash-deletesectionpositionThomas Müller2015-10-123-18/+14
|\ \ \ | | | | | | | | Revert "Move trashbin specific CSS that modifies sidebar"
| * | | Revert "Move trashbin specific CSS that modifies sidebar"Thomas Müller2015-10-123-18/+14
| | | |
* | | | Merge pull request #19704 from owncloud/fix_17997Björn Schießle2015-10-122-0/+27
|\ \ \ \ | |/ / / |/| | | also detect files in a .part folder as part file
| * | | also detect files in a .part folder as part fileBjoern Schiessle2015-10-122-0/+27
|/ / /
* | | Merge pull request #19657 from owncloud/setup-transportThomas Müller2015-10-122-2/+5
|\ \ \ | | | | | | | | Setup sendmail transport
| * | | Setup sendmail transportLukas Reschke2015-10-082-2/+5
| | | | | | | | | | | | | | | | Replaces https://github.com/owncloud/core/pull/19047 and fixes https://github.com/owncloud/enterprise/issues/854 and https://github.com/owncloud/core/issues/19110
* | | | Merge pull request #19702 from owncloud/trash-deletesectionpositionRaghu Nayyar2015-10-123-14/+18
|\ \ \ \ | |_|/ / |/| | | Move trashbin specific CSS that modifies sidebar
| * | | Move trashbin specific CSS that modifies sidebarVincent Petry2015-10-123-14/+18
|/ / / | | | | | | | | | | | | Only when trashbin is enabled, its sidebar nav element must be fixed at the bottom.
* | | Merge pull request #19628 from owncloud/files-canceluploaddebounceRobin Appelman2015-10-121-6/+5
|\ \ \ | | | | | | | | Debounce cancel upload message
| * | | Debounce cancel upload messageVincent Petry2015-10-071-6/+5
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-1212-22/+36
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-1120-26/+182
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-1064-188/+94
| | | |
* | | | Merge pull request #19585 from owncloud/enc_improve_introductionJörn Friedrich Dreyer2015-10-091-4/+4
|\ \ \ \ | | | | | | | | | | improved initial explanation/warning if the admin enabled encryptrion
| * | | | improved explanation of server side encryptionBjoern Schiessle2015-10-061-4/+4
| | | | |
* | | | | Merge pull request #19670 from owncloud/objectstore_filesystem_testsJörn Friedrich Dreyer2015-10-091-3/+12
|\ \ \ \ \ | | | | | | | | | | | | adjust filesystem tests to objectstore
| * | | | | adjust filesystem tests to objectstoreJörn Friedrich Dreyer2015-10-091-3/+12
| | | | | |
* | | | | | Merge pull request #19643 from owncloud/public-download-spinnerThomas Müller2015-10-091-1/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Set download cookie on public download
| * | | | | | Set download cookie on public downloadVincent Petry2015-10-081-1/+15
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #19654 from owncloud/db-locking-no-scan-transactionRobin Appelman2015-10-091-2/+8
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Dont use a transaction in the scanner while using db based locking
| * | | | | Dont use a transaction in the scanner while using db based lockingRobin Appelman2015-10-081-2/+8
| |/ / / /
* | | | | Merge pull request #18586 from owncloud/ie8-uploadavatarThomas Müller2015-10-098-34/+111
|\ \ \ \ \ | | | | | | | | | | | | Fix uploading avatar and root certs in IE8
| * | | | | Use injected requestVincent Petry2015-10-092-2/+2
| | | | | |
| * | | | | fix IE8 user agent detectionMorris Jobke2015-10-094-16/+3
| | | | | |
| * | | | | Fix uploading avatar and root certs in IE8Vincent Petry2015-10-098-34/+124
|/ / / / /
* | / / / [tx-robot] updated from transifexJenkins for ownCloud2015-10-0924-2/+66
| |/ / / |/| | |
* | | | Merge pull request #19034 from owncloud/http-request-warningThomas Müller2015-10-082-1/+24
|\ \ \ \ | | | | | | | | | | Prevent warning decoding content
| * | | | Unit test for preventing warning decoding contentRobin McCorkell2015-09-231-0/+21
| | | | |
| * | | | Merge branch 'master' into http-request-warningLukas Reschke2015-09-1510-0/+64
| |\ \ \ \
| * | | | | Prevent warning decoding contentRobin McCorkell2015-09-141-1/+3
| | | | | |
* | | | | | Merge pull request #19651 from owncloud/recursive_mkdir_for_objectstoresThomas Müller2015-10-082-18/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | make mkdir recursive, add phpdoc to api
| * | | | | | make mkdir recursive, add phpdoc to apiJörn Friedrich Dreyer2015-10-082-18/+22
| | | | | | |
* | | | | | | Merge pull request #19664 from owncloud/check-only-if-s2s-or-appstore-is-enabledThomas Müller2015-10-082-17/+127
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't perform checks for outdated TLS libs when no internet connection
| * | | | | | | Don't perform checks for outdated TLS libs when no internet connectionLukas Reschke2015-10-082-15/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes the check return a positive result when: - The instance has been configured to not use the internet AND/OR - S2S AND the appstore is disabled
| * | | | | | | Fix comment syntaxLukas Reschke2015-10-081-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #19655 from owncloud/integration-whitespace-fixesThomas Müller2015-10-081-15/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix whitespace issues in integration tests
| * | | | | | | Fix whitespace issues in integration testsMorris Jobke2015-10-081-15/+15
|/ / / / / / /
* | | | | | | Merge pull request #19616 from owncloud/ocs_provisioning_api_checking_listsThomas Müller2015-10-082-1/+64
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Ocs provisioning api checking lists
| * | | | | | changing indentation, vertical elements and previous existance of users and ↵Sergio Bertolin2015-10-072-23/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | groups
| * | | | | | ordering arrays before comparingSergio Bertolin2015-10-071-2/+2
| | | | | | |
| * | | | | | checking users and groupsSergio Bertolin2015-10-072-10/+23
| | | | | | |
| * | | | | | lists getting readySergio Bertolin2015-10-062-0/+44
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-09 23:45:02 +0000