summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-104-0/+15
* Merge pull request #9460 from owncloud/versions-localVincent Petry2014-07-101-5/+4
|\
| * Dont delete versions as local filesRobin Appelman2014-07-071-5/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-0978-12/+130
* | Merge pull request #9385 from owncloud/fix-7052blizzz2014-07-088-44/+516
|\ \
| * | support for AD primary groupsArthur Schiwon2014-07-088-44/+516
* | | Merge pull request #9515 from owncloud/update-sharecleanupfixVincent Petry2014-07-082-10/+24
|\ \ \
| * | | Fix update cleanup to only affect file and foldersVincent Petry2014-07-082-10/+24
* | | | Merge pull request #9507 from owncloud/fix-9302-masterThomas Müller2014-07-082-2/+0
|\ \ \ \
| * | | | Upload abortion is now detected within the OC_Connector_Sabre_File::put()Thomas Müller2014-07-082-2/+0
| |/ / /
* | | | port of #9500Arthur Schiwon2014-07-081-1/+0
* | | | Fix Signiture Does Not Match when mounting Amazon S3 external storageChristopher T. Johnson2014-07-081-13/+17
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-0862-116/+69
* | | Merge pull request #9495 from owncloud/remove-moved-mountVincent Petry2014-07-073-8/+21
|\ \ \
| * | | When changing the mountpoint of an external storage, ensure the old one is re...Robin Appelman2014-07-073-8/+21
| | |/ | |/|
* | | Merge pull request #9499 from owncloud/shares-hidetokenrecipientMorris Jobke2014-07-072-1/+45
|\ \ \
| * | | Do not show recipient for link shares in file listVincent Petry2014-07-072-1/+45
| |/ /
* | | Merge pull request #9502 from owncloud/add_ocsidsMorris Jobke2014-07-0714-7/+14
|\ \ \
| * | | add ocsids to info.xmlGeorg Ehrke2014-07-0714-7/+14
| |/ /
* | | Merge pull request #9415 from owncloud/external-sharedialogMorris Jobke2014-07-071-4/+31
|\ \ \
| * | | Improved external share dialogVincent Petry2014-07-071-4/+31
| |/ /
* / / Fixed shared list sortingVincent Petry2014-07-071-3/+2
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-072-0/+3
* | Merge pull request #9453 from owncloud/enc_fix_wrong_file_sizeFrank Karlitschek2014-07-062-6/+10
|\ \
| * | improved unit testsBjoern Schiessle2014-07-041-4/+8
| * | always take unencrypted sizeBjoern Schiessle2014-07-041-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-062-0/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-0599-99/+33
* | | Merge pull request #9357 from owncloud/sharing_unshare_on_deleteBjörn Schießle2014-07-047-46/+52
|\ \ \
| * | | add owner as parameter for delShareKeyBjoern Schiessle2014-07-043-11/+18
| * | | make sure that the umount hook always contains the path relative to data/user...Bjoern Schiessle2014-07-041-1/+1
| * | | if a folder gets deleted we unshare all shared files/folders belowBjoern Schiessle2014-07-044-34/+33
| |/ /
* | | Merge pull request #9445 from owncloud/filelist-auth-erroricewind19912014-07-042-2/+35
|\ \ \
| * | | Add machine readable error messages to OC\JSONRobin Appelman2014-07-042-2/+35
* | | | Merge pull request #9434 from owncloud/files-reloadpromiseissueMorris Jobke2014-07-043-15/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Fix reload call for all subclassesVincent Petry2014-07-043-15/+7
| |/ /
* | | Merge pull request #9269 from owncloud/fix_versions_previewThomas Müller2014-07-041-3/+3
|\ \ \
| * | | change order of registering api and capabilities to fix file version previewsJörn Friedrich Dreyer2014-07-011-3/+3
* | | | Merge pull request #9440 from owncloud/files-fileactionsdeepcopyMorris Jobke2014-07-042-10/+156
|\ \ \ \
| * | | | Fix FileActions merging overrideVincent Petry2014-07-042-10/+156
| | |/ / | |/| |
* | | | Merge pull request #9426 from owncloud/design-remoteshare-confirmMorris Jobke2014-07-043-8/+35
|\ \ \ \
| * | | | IE8 fixesMorris Jobke2014-07-041-1/+10
| * | | | use icon-confirm instead of text for accepting remote share, works better wit...Jan-Christoph Borchardt2014-07-043-8/+26
* | | | | Return and use isPreviewAvailable for share previewsVincent Petry2014-07-042-5/+10
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-0470-4/+126
|/ / /
* | | Merge pull request #9420 from owncloud/trashbin-hidesummarysizeMorris Jobke2014-07-031-0/+3
|\ \ \
| * | | Hide the size in the trashbin summary rowVincent Petry2014-07-031-0/+3
* | | | Merge pull request #9407 from owncloud/fix-share-logoMorris Jobke2014-07-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | for shared links, use wide logo on desktop and icon on mobileJan-Christoph Borchardt2014-07-031-1/+1
| | |/ | |/|
* | | Merge pull request #9403 from owncloud/design-fix-fileslistbottomMorris Jobke2014-07-032-3/+7
|\ \ \