summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12090 from AdamWill/google-rename-deleteMorris Jobke2014-12-101-0/+12
|\
| * google: delete original after successful renameAdam Williamson2014-11-301-0/+12
* | Merge pull request #12549 from owncloud/shared-cache-non-existingMorris Jobke2014-12-101-10/+12
|\ \
| * | Dont return cached date in shared cache when the file doesn't existRobin Appelman2014-12-021-10/+12
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-10130-8/+186
* | Merge pull request #11214 from owncloud/issue/10836Morris Jobke2014-12-092-0/+2
|\ \
| * | Add an option to disallow sending sharing emails to non-owncloud usersJoas Schilling2014-12-092-0/+2
* | | Merge pull request #12568 from owncloud/autoload-encryption-classesJoas Schilling2014-12-0940-704/+681
|\ \ \
| * | | Correctly namespace encryption testsJoas Schilling2014-12-0912-185/+181
| * | | Use self:: instead of the class name in encryption testsJoas Schilling2014-12-0910-361/+361
| * | | Update OCA\Encryption to OCA\Files_Encryption in the encryption app itselfJoas Schilling2014-12-0934-252/+248
| * | | Fix namespace of Files_Encryption outside of the appJoas Schilling2014-12-092-3/+3
| * | | Fix namespace of files_encryption classes and autoload themJoas Schilling2014-12-0913-27/+12
| |/ /
* | | Merge pull request #12708 from owncloud/l10nsavedThomas Müller2014-12-091-2/+2
|\ \ \
| * | | translated saved message in files externalVolkan Gezer2014-12-081-2/+2
* | | | Merge pull request #12688 from owncloud/rename-altLukas Reschke2014-12-091-0/+1
|\ \ \ \
| * | | | introduce alt text for rename icon - fixes #12067Morris Jobke2014-12-081-0/+1
* | | | | Merge pull request #12715 from owncloud/fix-broken-personal-pageLukas Reschke2014-12-091-1/+0
|\ \ \ \ \
| * | | | | remove duplicate loaded personal.js - fixes #12674Morris Jobke2014-12-091-1/+0
| | |/ / / | |/| | |
* | | | | Merge pull request #12709 from owncloud/fix-11955Morris Jobke2014-12-091-0/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Skip headers that can not be splitVictor Dubiniuk2014-12-081-0/+3
| |/ / /
* | | | Merge pull request #12406 from owncloud/drop-getApps-getUsersThomas Müller2014-12-095-12/+27
|\ \ \ \
| * | | | reduce OC_Preferences, OC_Config and \OCP\Config usageMorris Jobke2014-12-085-12/+27
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-09170-262/+34
* | | | Merge pull request #12577 from owncloud/public-mount-apiLukas Reschke2014-12-087-25/+56
|\ \ \ \ | |/ / / |/| | |
| * | | Use the mount config api for files_externalRobin Appelman2014-12-044-18/+48
| * | | Add public api for mount configurationsRobin Appelman2014-12-043-7/+8
* | | | Merge pull request #12704 from owncloud/fix-12647-2Lukas Reschke2014-12-082-3/+9
|\ \ \ \
| * | | | add docArthur Schiwon2014-12-081-0/+1
| * | | | preserve an asterisk at the start when escaping a search termArthur Schiwon2014-12-082-3/+8
| | |/ / | |/| |
* | | | Merge pull request #12696 from owncloud/trashbin-selected-deleteRobin Appelman2014-12-081-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Fix deleting selected files in the trashbinRobin Appelman2014-12-081-0/+4
* | | | Merge pull request #12452 from owncloud/server2server-ng-ocsMorris Jobke2014-12-0811-50/+575
|\ \ \ \
| * | | | OCS API for server-to-server sharingBjoern Schiessle2014-12-0411-50/+575
* | | | | Merge pull request #12394 from owncloud/files-fileactionsimprovementsLukas Reschke2014-12-083-128/+314
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Improve FileActions JS to allow for custom renderingVincent Petry2014-11-243-128/+314
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0874-68/+6
* | | | | Merge pull request #12668 from owncloud/keepspaceThomas Müller2014-12-071-1/+1
|\ \ \ \ \
| * | | | | Keep spaces out of the stringVolkan Gezer2014-12-071-1/+1
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0712-4/+12
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0614-0/+14
* | | | | Merge pull request #12166 from helmutschneider/aws-2.7.5Lukas Reschke2014-12-0551-254/+710
|\ \ \ \ \
| * | | | | Upgrade AWS sdk to 2.7.5Johan Björk2014-11-1351-254/+710
* | | | | | Merge pull request #11485 from brumsoel/masterLukas Reschke2014-12-052-3/+3
|\ \ \ \ \ \
| * | | | | | Modified filesort test cases to test for large sizes & timestampsbrumsel2014-12-031-2/+2
| * | | | | | Merge remote-tracking branch 'upstream/master'brumsel2014-12-032335-31221/+61241
| |\ \ \ \ \ \
| * | | | | | | Fix timestamp comparator return valuebrumsoel2014-10-081-1/+1
* | | | | | | | Merge pull request #12523 from owncloud/port-11747Vincent Petry2014-12-051-3/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | Only store user credentials when SMB_OC storage is enabledLukas Reschke2014-12-011-3/+28
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0580-84/+30