summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add memcached backendRobin Appelman2013-03-173-1/+103
|
* Seperate memory based cache from OC_CacheRobin Appelman2013-03-178-171/+210
|
* Merge pull request #2204 from owncloud/chache_updater_renameFrank Karlitschek2013-03-172-12/+36
|\ | | | | Cache: better rename hook for cache updater
| * Cache: better rename hook for cache updaterRobin Appelman2013-03-082-12/+36
| |
* | Merge pull request #2387 from owncloud/cron-session-closeThomas Müller2013-03-161-0/+2
|\ \ | | | | | | Close sessions when doing background jobs
| * | Close sessions when doing background jobsRobin Appelman2013-03-171-0/+2
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-1711-11/+11
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-1689-1453/+1524
| |
* | Merge pull request #2380 from ↵Bernhard Posselt2013-03-161-1/+1
|\ \ | | | | | | | | | | | | henningoschwald/76bb5221c7a1b71f0d617c55e844c51e889a2c70 Fixes keyboard accessibility of expandable settings
| * | Restores keyboard accessibility for expandable settings area.Henning Oschwald2013-03-161-1/+1
| | | | | | | | | | | | | | | | | | Tabindex="0" makes the element focussable with the keyboard and role="link" tells assistive technologies that this clickable span element is supposed to be presented as a hyperlink.
* | | Merge pull request #2383 from owncloud/error-handling-upgradeBernhard Posselt2013-03-161-16/+24
|\ \ \ | |/ / |/| | Add error handling to the file cache upgrade
| * | Add error handling to the file cache upgradeMichael Gapczynski2013-03-161-16/+24
| | |
* | | Merge pull request #2322 from PHLAK/masterJan-Christoph Borchardt2013-03-163-1/+3
|\ \ \ | | | | | | | | Added 3rdparty folder as a git submodule
| * | | Added 3rdparty folder as a git submoduleChris Kankiewicz2013-03-143-1/+3
| | | |
* | | | Merge pull request #2360 from sherbrecher/masterLukas Reschke2013-03-151-1/+1
|\ \ \ \ | | | | | | | | | | files_external: fix for overlap if input controls
| * \ \ \ Merge remote-tracking branch 'upstream/master'sherbrecher2013-03-153353-381397/+213437
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Conflicts: apps/files_external/templates/settings.php
* | | | | Merge pull request #2350 from aschoenebeck/ignore_blacklisted_filesBernhard Posselt2013-03-151-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Filter display of blacklisted files
| * | | | | Filter display of blacklisted filesAndreas Schönebeck2013-03-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blacklisted files like ".htaccess" and ".git" should not only be blacklisted for upload and rename, but they should also not be displayed in the directory listings. I needed this personally to hide ".git" folders in shared folders. Its also a simple implementation of feature requests like http://forum.owncloud.org/viewtopic.php?f=4&t=3279 and http://forum.owncloud.org/viewtopic.php?f=3&t=5708
* | | | | | Merge pull request #2320 from ceri/masterFrank Karlitschek2013-03-151-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix erroneous email when folders are shared
| * | | | | | Correct emails when folders are shared.Ceri Davies2013-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | itemType is never "dir"; it's either "file" or "folder".
* | | | | | | remove backticks around table namesBjörn Schießle2013-03-151-3/+3
| | | | | | |
* | | | | | | add backtick for db queries to prevent postgresql errorsBjörn Schießle2013-03-151-3/+3
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #2336 from eMerzh/fix_trashpgBjörn Schießle2013-03-152-12/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add backtick for trash app to prevent pg errors
| * | | | | | Add backtick for trash app to prevent pg errorsBrice Maron2013-03-152-12/+12
| | | | | | |
* | | | | | | Merge pull request #2317 from owncloud/create_version_on_uploadFrank Karlitschek2013-03-151-3/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | create new version if the same file is uploaded again over the web interface
| * | | | | | | fix var nameBjörn Schießle2013-03-141-2/+2
| | | | | | | |
| * | | | | | | fix var nameBjörn Schießle2013-03-141-1/+1
| | | | | | | |
| * | | | | | | create new version if the same file is uploaded again over the web interfaceBjörn Schießle2013-03-141-3/+10
| | |_|_|/ / / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-1551-484/+620
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #2318 from owncloud/unkown-freespaceBernhard Posselt2013-03-141-1/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Return unknown freespace if the free_space call failed
| * | | | | Return unknown freespace if the free_space call failedRobin Appelman2013-03-141-1/+5
|/ / / / / | | | | | | | | | | | | | | | Fixes #2312
* | | | | replace \MDB with \OC_DB, approved in #2278Björn Schießle2013-03-141-1/+1
| | | | |
* | | | | use display name as sender for private link mails, approved in #2294Björn Schießle2013-03-141-1/+1
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-1433-473/+617
| | | |
* | | | Merge pull request #2277 from owncloud/fix_sharing_hooksBernhard Posselt2013-03-131-1/+1
|\ \ \ \ | | | | | | | | | | listen to the pre delete hook in the sharing app [master]
| * | | | we need to listen to the pre delete hook, otherwise the file is already goneBjörn Schießle2013-03-131-1/+1
| | | | |
* | | | | Merge pull request #2265 from owncloud/no_share_option_for_shared_folderBjörn Schießle2013-03-131-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | don't add share action to the Shared folder
| * | | | only prevent shared action for the Shared folder in the root dirBjörn Schießle2013-03-131-1/+1
| | | | |
| * | | | don't add share action to the Shared folderBjörn Schießle2013-03-121-1/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-1326-129/+143
| | | | |
* | | | | Fix file sharing via public link for one particular file.Olivier Tétard2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Fix OC_Files::get() to not return the first character of the filename if only one file is requested.
* | | | | Merge pull request #2254 from ↵Thomas Müller2013-03-122-3/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fixing-mssql-utf8-and-insert-empty-string-master Fixing mssql utf8 and insert empty string master
| * | | | | enable UTF-8 charset on mssqlThomas Mueller2013-03-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | disable MDB2_PORTABILITY_EMPTY_TO_NULL for mssql to allow insert of empty string to no null fields
| * | | | | write error message to log file in case insert to file cache failed - took ↵Thomas Mueller2013-03-121-1/+4
| |/ / / / | | | | | | | | | | | | | | | hours to find that the insert failed :-(
* | | | | Merge pull request #2253 from owncloud/fixing-windows-file-mapper-masterThomas Müller2013-03-125-14/+20
|\ \ \ \ \ | | | | | | | | | | | | Fixing windows file mapper master
| * | | | | fixing various filesystem/storage unit tests on windowsThomas Mueller2013-03-123-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | fixing copy operation on mapper
| * | | | | skip archive tests for nowThomas Mueller2013-03-122-0/+4
| | | | | |
| * | | | | adding //IGNORE to iconv to prevent nasty php warningsThomas Mueller2013-03-121-1/+1
| | | | | |
| * | | | | slug generates uniqid in case the file/folder name contains not one single ↵Thomas Mueller2013-03-121-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | valid character
| * | | | | indexed slug should be created based on logic pathThomas Mueller2013-03-121-1/+1
| |/ / / /