summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12577 from owncloud/public-mount-apiLukas Reschke2014-12-087-25/+56
|\ | | | | Add a public api for apps to add mounts
| * 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
|\ \ | | | | | | preserve an asterisk at the start when escaping a search term
| * | 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 trashbin
| * | 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 sharing
| * | | 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 rendering
| * | | Improve FileActions JS to allow for custom renderingVincent Petry2014-11-243-128/+314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the OCA.Files.FileActions class to support passing a "render" function in the action object. The default function "_defaultRenderFunction" is used by default and renders actions in the usual actions container. Moved "Rename" and "Delete" to custom render functions.
* | | | [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 string
| * | | | Keep spaces out of the stringVolkan Gezer2014-12-071-1/+1
| | | | | | | | | | | | | | | Otherwise translators cannot notice them on Transifex.
* | | | | [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.5. Fixes #12023
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Fix timestamp comparator return value
| * | | | | 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 enabled
| * | | | | | | Only store user credentials when SMB_OC storage is enabledLukas Reschke2014-12-011-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/lib/smb_oc.php
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0580-84/+30
| | | | | | | |
* | | | | | | | cache total user countArthur Schiwon2014-12-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/user_ldap/user_ldap.php
* | | | | | | | Forward port of #12493Arthur Schiwon2014-12-043-1/+152
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add ldap-search command to occ Conflicts: apps/user_ldap/appinfo/register_command.php LDAP search filter creation changes: 1. do not prepend * wildcard to search terms. Will result in faster search, but you don't find "foobar" when looking for "bar" 2. advanced behaviour when search string contains a space and multiple search attributes are present. The search string is split into single words. The resulting filter requires that each word at least appears once in any search attribute. This is supposed to return better results in big LDAPs. trim search string before passing it on
* | | | | | | Merge pull request #12596 from owncloud/remove-travis-tracesMorris Jobke2014-12-041-40/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove last traces of travis integration
| * | | | | | | Remove last traces of travis integrationMorris Jobke2014-12-041-40/+0
| | | | | | | |
* | | | | | | | update error messageBjoern Schiessle2014-12-041-1/+1
| | | | | | | |
* | | | | | | | OC8 and later requires PHP >= 5.4, so we can remove the check from the ↵Bjoern Schiessle2014-12-041-5/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | encryption app
* | | / / / / [tx-robot] updated from transifexJenkins for ownCloud2014-12-044-2/+12
| |_|/ / / / |/| | | | |
* | | | | | fix typoBjoern Schiessle2014-12-031-1/+1
| | | | | |
* | | | | | Merge pull request #12382 from owncloud/enc_reorganize_folders2Morris Jobke2014-12-0325-1674/+1172
|\ \ \ \ \ \ | | | | | | | | | | | | | | [encryption] reorganize folder structure (second try to make Jenkins happy)
| * | | | | | small fixesBjoern Schiessle2014-12-021-2/+2
| | | | | | |
| * | | | | | delete old keys if file was moved to a different mount pointBjoern Schiessle2014-12-021-4/+10
| | | | | | |
| * | | | | | upgrade to new folder structureBjoern Schiessle2014-12-0218-341/+483
| | | | | | |
| * | | | | | change private/public key names for consistency reasonsBjoern Schiessle2014-11-2611-226/+202
| | | | | | |
| * | | | | | harmonize copyright noticeBjoern Schiessle2014-11-267-18/+28
| | | | | | |
| * | | | | | new folder structure for keysBjoern Schiessle2014-11-2615-1162/+526
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all keys are now in files_encryption/key/path_to_file/filename/ share keys are named: user.shareKey file key is named: fileKey
* | | | | | | Merge pull request #12556 from owncloud/add-route-for-versionsThomas Müller2014-12-032-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add route for download of versions
| * | | | | | | Add route for download of versionsLukas Reschke2014-12-022-1/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise on master it was not possible anymore to download older versions. Fixes itself.
* | | | | | | Merge pull request #12554 from owncloud/versions-app-autoloadLukas Reschke2014-12-035-8/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Autoload lib files of versions app
| * | | | | | | Autoload exception from files_trashbinJoas Schilling2014-12-022-2/+0
| | | | | | | |
| * | | | | | | Autoload lib files of versions appJoas Schilling2014-12-023-6/+0
| |/ / / / / /
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-032-2/+2
| | | | | | |
* | | | | | | Merge pull request #12333 from owncloud/delete-selected-filesMorris Jobke2014-12-023-10/+42
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix deleting non deletable files by selecting them
| * | | | | | Add js unit testRobin Appelman2014-11-261-7/+27
| | | | | | |
| * | | | | | Dont show the delete button for selected files if one of the selected files ↵Robin Appelman2014-11-261-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | is not deletable
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 18:59:06 +0000