summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-14142-128/+174
|
* Merge pull request #12639 from owncloud/bad_mtime_formatMorris Jobke2014-12-132-3/+29
|\ | | | | Fix formatting of bad dates from external storages
| * Return ? if mtime is 0 or -1Robin McCorkell2014-12-122-3/+29
| | | | | | | | Tooltip contains 'Unable to determine date'. Fixes #6395
* | Merge pull request #12795 from owncloud/files-layoutchangesMorris Jobke2014-12-135-45/+66
|\ \ | | | | | | Move file thumbnail element into the label tag
| * | Replace input checkbox CSS selector with .electCheckBoxVincent Petry2014-12-112-22/+18
| | |
| * | Move file thumbnail into the label elementVincent Petry2014-12-115-24/+49
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-1324-68/+2
| | |
* | | Merge pull request #12778 from owncloud/searchbytags2Vincent Petry2014-12-122-0/+74
|\ \ \ | | | | | | | | Added searchByTags to view, storage and cache
| * | | Make $userId mandatory for searchByTagsVincent Petry2014-12-122-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | $userId is now a mandatory parameter for searchByTags. Also fixed some places in the code where the argument was missing (Node API and View)
| * | | Added searchByTags to view, storage and cacheVincent Petry2014-12-112-0/+73
| | | |
* | | | Merge pull request #12812 from owncloud/remove-53-workaroundThomas Müller2014-12-121-6/+1
|\ \ \ \ | | | | | | | | | | Remove conditional check for 5.3 compatibility
| * | | | Remove conditional check for 5.3 compatibilityLukas Reschke2014-12-121-6/+1
| | | | |
* | | | | Merge pull request #12808 from owncloud/add-special-parameterlist-to-managerJoas Schilling2014-12-121-3/+34
|\ \ \ \ \ | | | | | | | | | | | | Add special parameterlist to manager
| * | | | | Specify list of activity parameters for sharing extensionJoas Schilling2014-12-121-3/+34
| | |_|/ / | |/| | |
* | | | | Merge pull request #12789 from owncloud/external-iconVincent Petry2014-12-121-210/+2
|\ \ \ \ \ | | | | | | | | | | | | fix and compress files_external icon
| * | | | | fix and compress files_external iconJan-Christoph Borchardt2014-12-111-210/+2
| |/ / / /
* | | | | Merge pull request #12527 from owncloud/js-pluginsystemRobin Appelman2014-12-129-66/+57
|\ \ \ \ \ | |_|/ / / |/| | | | Simple Plugin system for Javascript
| * | | | Remove obsoleted filelist prototype backup in testsVincent Petry2014-12-043-24/+3
| | | | |
| * | | | Simple Plugin system for JavascriptVincent Petry2014-12-018-42/+54
| | | | |
* | | | | Check for share by link enabledGadzy2014-12-121-9/+12
| | | | | | | | | | | | | | | Display "Shared by link" section only if sharing by link is enabled.
* | | | | Merge pull request #12698 from owncloud/handle_readonly_shared_filesMorris Jobke2014-12-124-8/+54
|\ \ \ \ \ | | | | | | | | | | | | Handle readonly shared files
| * | | | | show readonly message in file conflict dialog, make it always selectedJörn Friedrich Dreyer2014-12-114-8/+54
| | |_|_|/ | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-1212-0/+44
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-112-0/+10
| | | |
* | | | Merge pull request #11892 from owncloud/remove_triggerupdateThomas Müller2014-12-102-34/+32
|\ \ \ \ | |_|_|/ |/| | | Remove triggerupdate.php & add quiet option for CLI scanner
| * | | make path absoluteJörn Friedrich Dreyer2014-12-101-7/+11
| | | |
| * | | add quiet option, ref #8794Jörn Friedrich Dreyer2014-12-041-9/+18
| | | |
| * | | remove triggerupdate, ref #11872Jörn Friedrich Dreyer2014-12-042-26/+11
| | | |
* | | | Merge pull request #12090 from AdamWill/google-rename-deleteMorris Jobke2014-12-101-0/+12
|\ \ \ \ | | | | | | | | | | google: delete original after successful rename
| * | | | google: delete original after successful renameAdam Williamson2014-11-301-0/+12
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In GDrive, filenames aren't unique, and directories are just special files - so you can have multiple files with the same name, multiple directories with the same name, and even files with the same names as directories. OC doesn't handle this at all, though, and just wants to act as if file and directory names *are* unique. So when renaming, we must check if there's an existing object with the same file or directory name before we commit the rename, and explicitly delete it if the rename is successful. (Other providers like dropbox do the same for files, but intentionally don't do it for directories; we really need to do it for directories too.) A good way to observe this is to run the storage unit tests and look at the state of the Drive afterwards. Without this commit, there will be several copies of all the test files and directories. After this commit, there's just one of each. We can't just say "hey, Drive lets us do this, what's the problem?" because we don't handle multiple-objects, same-name cases - getDriveFile() just bails and prints an error if it searches for the file or directory with a given name and gets multiple results.
* | | | 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 exist
| * | | | 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 users
| * | | | Add an option to disallow sending sharing emails to non-owncloud usersJoas Schilling2014-12-092-0/+2
| | | | | | | | | | | | | | | | | | | | Fix #10836
* | | | | Merge pull request #12568 from owncloud/autoload-encryption-classesJoas Schilling2014-12-0940-704/+681
|\ \ \ \ \ | | | | | | | | | | | | Fix namespaces of encryption classes and encryption tests
| * | | | | 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 external
| * | | | | 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 #12067
| * | | | | | 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 #12674
| * | | | | | | 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 split
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Config cleanup - OC_Preferences refactoring