summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Also send explicit cache hooks when calling file_put_contents with a resourceRobin Appelman2014-02-281-0/+3
* Manually triger the filecache update hooks before any other hookRobin Appelman2014-02-263-12/+20
* Merge pull request #7279 from owncloud/folderid-reuseicewind19912014-02-262-2/+13
|\
| * Remove fileid parameter for getFolderContentRobin Appelman2014-02-211-5/+2
| * Split getFolderContentByIdRobin Appelman2014-02-211-0/+10
| * Merge branch 'master' into folderid-reuseRobin Appelman2014-02-21339-3585/+2768
| |\
| * | Reuse the folder id in View->getFolderContentsRobin Appelman2014-02-192-4/+8
* | | Merge pull request #7399 from owncloud/themable-doc-linksJan-Christoph Borchardt2014-02-262-1/+8
|\ \ \
| * | | introduce new theme function to allow full creation of documentation links: b...Thomas Müller2014-02-252-1/+8
* | | | Merge pull request #7405 from owncloud/files-admin.js-styleVincent Petry2014-02-261-8/+11
|\ \ \ \
| * | | | coding style fixes, cut long lines, comments not on same lines, curly bracesJan-Christoph Borchardt2014-02-261-8/+11
| |/ / /
* | | | Merge pull request #7401 from owncloud/highlight_selected_app_settingsVincent Petry2014-02-262-1/+8
|\ \ \ \
| * | | | fix for coding styleJan-Christoph Borchardt2014-02-261-1/+6
| * | | | Highlight the selected app in app-settingskondou2014-02-262-1/+3
* | | | | Merge pull request #7328 from owncloud/McNetic-zipstreamerVincent Petry2014-02-262-112/+101
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'master' into McNetic-zipstreamerThomas Müller2014-02-2428-290/+361
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into McNetic-zipstreamerThomas Müller2014-02-2140-177/+504
| |\ \ \ \ \
| * | | | | | updating 3rdpartyThomas Müller2014-02-211-0/+0
| * | | | | | Merge branch 'zipstreamer' of https://github.com/McNetic/owncloud_core into M...Thomas Müller2014-02-202-112/+101
| |\ \ \ \ \ \
| | * | | | | | switched zip file creation to ZipStreamer to create zip files directly in memoryNicolai Ehemann2014-01-221-33/+9
| | * | | | | | refactored/cleaned up lib/files.phpNicolai Ehemann2014-01-221-77/+84
| | * | | | | | lib/files.php: make use of === instead of ==Nicolai Ehemann2014-01-181-4/+4
* | | | | | | | Merge pull request #7335 from owncloud/fix-7333Vincent Petry2014-02-252-3/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed mount config pathVincent Petry2014-02-241-3/+4
| * | | | | | | | Fix path to the mount fileLukas Reschke2014-02-201-1/+2
| * | | | | | | | Fix code to search for mount.json in custom data foldersLukas Reschke2014-02-201-1/+2
* | | | | | | | | Merge pull request #7371 from owncloud/core-storagemovedeleteallVincent Petry2014-02-252-38/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Removed unused deleteAll method on Common storage classVincent Petry2014-02-241-37/+0
| * | | | | | | | | Replace deleteAll call with unlink callVincent Petry2014-02-241-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6299 from leo-b/ldap_nested_groupsVicDeo2014-02-253-10/+72
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | replace spaces with tabsroot2014-02-211-5/+5
| * | | | | | | | | fix coding style to blizzz happy.. ;-)root2014-02-121-8/+10
| * | | | | | | | | fix indentationroot2013-12-111-42/+42
| * | | | | | | | | remove debug outputroot2013-12-101-3/+0
| * | | | | | | | | Merge remote branch 'upstream/master' into ldap_nested_groupsroot2013-12-10329-4807/+8676
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | move nested group checkbox to directory settingsroot2013-12-101-1/+1
| * | | | | | | | | | combineFilterWithAnd recently moved to Accessroot2013-12-081-3/+3
| * | | | | | | | | | add support for nested groupsroot2013-12-063-10/+73
* | | | | | | | | | | Merge pull request #7374 from owncloud/enc_dont_overwrite_keysBjörn Schießle2014-02-254-4/+140
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add test case if a file gets moved out from the shared folderBjoern Schiessle2014-02-242-0/+125
| * | | | | | | | | | | don't overwrite keys if rename was done by a stream copyBjoern Schiessle2014-02-242-4/+15
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Fix case where port is missingVincent Petry2014-02-251-1/+1
* | | | | | | | | | | Merge pull request #7285 from owncloud/mimeicons-svgMorris Jobke2014-02-246-31/+49
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rename url parameterRobin Appelman2014-02-242-2/+2
| * | | | | | | | | | | Add url parameter to control whether previews should return 404 when the mime...Robin Appelman2014-02-212-1/+3
| * | | | | | | | | | | Merge branch 'master' into mimeicons-svgRobin Appelman2014-02-2120-60/+272
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make unit tests expect the svg iconsRobin Appelman2014-02-201-2/+6
| * | | | | | | | | | | | Merge branch 'master' into mimeicons-svgRobin Appelman2014-02-20231-3412/+2134
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Fix svg icons for public shares and external/shared filesRobin Appelman2014-02-192-4/+5
| * | | | | | | | | | | | Show svg mime icons when no preview is availableRobin Appelman2014-02-194-26/+37