summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* some small fixesBjoern Schiessle2014-09-252-4/+4
|
* clear share table after each test runBjoern Schiessle2014-09-241-0/+3
|
* unit tests for grouping of shares pointing to the same sourceBjoern Schiessle2014-09-222-35/+74
|
* group shares and combine permissionsBjoern Schiessle2014-09-223-3/+29
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-178-2/+16
|
* Merge pull request #10745 from owncloud/fix-10708-doctrineLukas Reschke2014-09-162-9/+35
|\ | | | | Use Doctrine Platform to generate SQL query for table truncation.
| * adding unit test to truncate the tableThomas Müller2014-09-162-1/+32
| |
| * Use Doctrine Platform to generate SQL query for table truncation.Andreas Fischer2014-08-291-8/+3
| |
* | Merge pull request #10902 from owncloud/fix-ellepsisLukas Reschke2014-09-161-0/+2
|\ \ | | | | | | Adding link to ellipsis and fixing styling
| * | Adding link to ellipsis and fixing stylingClark Tomlinson2014-09-161-0/+2
| | |
* | | Merge pull request #11009 from owncloud/tobiasKaminsky-routeLukas Reschke2014-09-163-2/+93
|\ \ \ | | | | | | | | REST API for thumbnails
| * | | Route for thumbnail generationtobiasKaminsky2014-09-163-2/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thumbnail generation Removed Log Added requested changes Added requested changes. - Fix code style - Add exception if file does not exist - Switch route styling Replaces https://github.com/owncloud/core/pull/10805 Fix codestyle Fix codestyle Migrate to appframework Fix typo
* | | | Merge pull request #7254 from owncloud/core-sortalgoLukas Reschke2014-09-162-2/+2
|\ \ \ \ | | | | | | | | | | Fixed JS sort comparator to be consistent between JS and PHP
| * | | | Fixed file list sortingVincent Petry2014-08-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now using a natural sort algorithm that is more consistent between JS and PHP (although not perfect in some corner cases) - added OC.Util.naturalSortComparator that uses the same algo that was used for the user list - changed user list and files list to use OC.Util.naturalSortComparator - removed toLowerCase() and changed the comparator to use String.localeCompare() - added unit tests - added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()
* | | | | Merge pull request #10680 from helmutschneider/aws-2.6.15Lukas Reschke2014-09-16264-9790/+5917
|\ \ \ \ \ | |_|/ / / |/| | | | Update AWS sdk to 2.6.15
| * | | | Fix failing AmazonS3::touch on updated aws sdkJohan Björk2014-09-031-1/+2
| | | | |
| * | | | Update AWS sdk to 2.6.15Johan Björk2014-09-03263-9789/+5915
| | | | |
* | | | | Merge pull request #11081 from owncloud/trash_fix_expireLukas Reschke2014-09-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | also expire file if timestamp = limit, happens if trashbin_retention_obl...
| * | | | | also expire file if timestamp = limit, happens if ↵Bjoern Schiessle2014-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | trashbin_retention_obligation is set to zero
* | | | | | Merge pull request #10663 from owncloud/files_trashbin_original_pathMorris Jobke2014-09-165-5/+68
|\ \ \ \ \ \ | | | | | | | | | | | | | | Show original path information in trashbin and for shares
| * | | | | | Show original path information in trashbin and sharing viewsRobin McCorkell2014-09-115-5/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Path will only be shown if in subdirectory, not in root.
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-166-0/+15
| | | | | | |
* | | | | | | Merge pull request #11060 from owncloud/rmobslangLukas Reschke2014-09-156-39/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | remove obsolete language files
| * | | | | | remove obsolete language filesVolkan Gezer2014-09-136-39/+0
| | | | | | |
* | | | | | | Merge pull request #11021 from owncloud/do-not-double-decodeAndreas Fischer2014-09-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not double decode values * owncloud/do-not-double-decode: Do not double decode values
| * | | | | | | Do not double decode valuesLukas Reschke2014-09-111-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/11012
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-151-0/+3
| | | | | | |
* | | | | | | Merge pull request #11050 from owncloud/enc-flockfixLukas Reschke2014-09-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove passing by reference to allow for proper GC
| * | | | | | | Remove passing by reference to allow for proper GCVincent Petry2014-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The garbage collector in PHP 5.3.10 does not properly release the file handle when calling fclose() due to the fact that it is passed by reference. This has the side-effect of preventing file locks to be released as well when the files_locking app is enabled. This fix removes the useless passing by reference and now the file handle and file lock are freed properly.
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-141-0/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-131-0/+1
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-123-0/+8
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #9698 from owncloud/fix-9666Thomas Müller2014-09-111-3/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Load apps in tests, fixes #9666
| * | | | | | Fix mkdir error in mountconfig.phpRobin McCorkell2014-09-101-1/+1
| | | | | | |
| * | | | | | Load apps in test situationsRobin McCorkell2014-09-101-2/+0
| |/ / / / /
* / / / / / [tx-robot] updated from transifexJenkins for ownCloud2014-09-1110-47/+251
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1014-1/+34
| | | | |
* | | | | Merge pull request #10922 from owncloud/explicit-scan-transactionsLukas Reschke2014-09-092-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Use bigger transactions when doing explicit file system scans
| * | | | | Use bigger transactions when doing explicit file system scansRobin Appelman2014-09-082-2/+2
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-0939-40/+115
| | | | | |
* | | | | | Merge pull request #10739 from owncloud/eventsource-publicLukas Reschke2014-09-082-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add EventSource to the public API
| * | | | | | Better phpdoc and method namingRobin Appelman2014-09-042-2/+2
| | | | | | |
| * | | | | | Use the public api to get event sourcesRobin Appelman2014-09-032-4/+4
| | | | | | |
* | | | | | | Merge pull request #10885 from owncloud/swift-hasupdatedLukas Reschke2014-09-082-20/+52
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix hasUpdated for folders in openstack swift
| * | | | | | | Fix hasUpdated for folders in swift backendRobin Appelman2014-09-051-0/+22
| | | | | | | |
| * | | | | | | Fix configuration of rackspaceRobin Appelman2014-09-052-20/+30
| | | | | | | |
* | | | | | | | Merge pull request #10755 from owncloud/shorter_sharing_linksLukas Reschke2014-09-081-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Shorter sharing links
| * | | | | | | | Use a route instead of s.php and convert tokens asapkondou2014-09-041-0/+4
| | | | | | | | |
* | | | | | | | | Merge pull request #10938 from owncloud/useSecureMimetypeLukas Reschke2014-09-081-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use secure mimetype for content delivery
| * | | | | | | | | Use secure mimetype for content deliveryLukas Reschke2014-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds some hardening against potential CSP bypassed.