Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add memcached backend | Robin Appelman | 2013-03-17 | 3 | -1/+103 |
| | |||||
* | Seperate memory based cache from OC_Cache | Robin Appelman | 2013-03-17 | 8 | -171/+210 |
| | |||||
* | Merge pull request #2204 from owncloud/chache_updater_rename | Frank Karlitschek | 2013-03-17 | 2 | -12/+36 |
|\ | | | | | Cache: better rename hook for cache updater | ||||
| * | Cache: better rename hook for cache updater | Robin Appelman | 2013-03-08 | 2 | -12/+36 |
| | | |||||
* | | Merge pull request #2387 from owncloud/cron-session-close | Thomas Müller | 2013-03-16 | 1 | -0/+2 |
|\ \ | | | | | | | Close sessions when doing background jobs | ||||
| * | | Close sessions when doing background jobs | Robin Appelman | 2013-03-17 | 1 | -0/+2 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-17 | 11 | -11/+11 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-16 | 89 | -1453/+1524 |
| | | |||||
* | | Merge pull request #2380 from ↵ | Bernhard Posselt | 2013-03-16 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | henningoschwald/76bb5221c7a1b71f0d617c55e844c51e889a2c70 Fixes keyboard accessibility of expandable settings | ||||
| * | | Restores keyboard accessibility for expandable settings area. | Henning Oschwald | 2013-03-16 | 1 | -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-upgrade | Bernhard Posselt | 2013-03-16 | 1 | -16/+24 |
|\ \ \ | |/ / |/| | | Add error handling to the file cache upgrade | ||||
| * | | Add error handling to the file cache upgrade | Michael Gapczynski | 2013-03-16 | 1 | -16/+24 |
| | | | |||||
* | | | Merge pull request #2322 from PHLAK/master | Jan-Christoph Borchardt | 2013-03-16 | 3 | -1/+3 |
|\ \ \ | | | | | | | | | Added 3rdparty folder as a git submodule | ||||
| * | | | Added 3rdparty folder as a git submodule | Chris Kankiewicz | 2013-03-14 | 3 | -1/+3 |
| | | | | |||||
* | | | | Merge pull request #2360 from sherbrecher/master | Lukas Reschke | 2013-03-15 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | files_external: fix for overlap if input controls | ||||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' | sherbrecher | 2013-03-15 | 3353 | -381397/+213437 |
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | Conflicts: apps/files_external/templates/settings.php | ||||
* | | | | | Merge pull request #2350 from aschoenebeck/ignore_blacklisted_files | Bernhard Posselt | 2013-03-15 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Filter display of blacklisted files | ||||
| * | | | | | Filter display of blacklisted files | Andreas Schönebeck | 2013-03-15 | 1 | -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/master | Frank Karlitschek | 2013-03-15 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix erroneous email when folders are shared | ||||
| * | | | | | | Correct emails when folders are shared. | Ceri Davies | 2013-03-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | itemType is never "dir"; it's either "file" or "folder". | ||||
* | | | | | | | remove backticks around table names | Björn Schießle | 2013-03-15 | 1 | -3/+3 |
| | | | | | | | |||||
* | | | | | | | add backtick for db queries to prevent postgresql errors | Björn Schießle | 2013-03-15 | 1 | -3/+3 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #2336 from eMerzh/fix_trashpg | Björn Schießle | 2013-03-15 | 2 | -12/+12 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add backtick for trash app to prevent pg errors | ||||
| * | | | | | | Add backtick for trash app to prevent pg errors | Brice Maron | 2013-03-15 | 2 | -12/+12 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #2317 from owncloud/create_version_on_upload | Frank Karlitschek | 2013-03-15 | 1 | -3/+10 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | create new version if the same file is uploaded again over the web interface | ||||
| * | | | | | | | fix var name | Björn Schießle | 2013-03-14 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | fix var name | Björn Schießle | 2013-03-14 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | create new version if the same file is uploaded again over the web interface | Björn Schießle | 2013-03-14 | 1 | -3/+10 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-15 | 51 | -484/+620 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #2318 from owncloud/unkown-freespace | Bernhard Posselt | 2013-03-14 | 1 | -1/+5 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Return unknown freespace if the free_space call failed | ||||
| * | | | | | Return unknown freespace if the free_space call failed | Robin Appelman | 2013-03-14 | 1 | -1/+5 |
|/ / / / / | | | | | | | | | | | | | | | | Fixes #2312 | ||||
* | | | | | replace \MDB with \OC_DB, approved in #2278 | Björn Schießle | 2013-03-14 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | use display name as sender for private link mails, approved in #2294 | Björn Schießle | 2013-03-14 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-14 | 33 | -473/+617 |
| | | | | |||||
* | | | | Merge pull request #2277 from owncloud/fix_sharing_hooks | Bernhard Posselt | 2013-03-13 | 1 | -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 gone | Björn Schießle | 2013-03-13 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #2265 from owncloud/no_share_option_for_shared_folder | Björn Schießle | 2013-03-13 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | don't add share action to the Shared folder | ||||
| * | | | | only prevent shared action for the Shared folder in the root dir | Björn Schießle | 2013-03-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | don't add share action to the Shared folder | Björn Schießle | 2013-03-12 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-13 | 26 | -129/+143 |
| | | | | | |||||
* | | | | | Fix file sharing via public link for one particular file. | Olivier Tétard | 2013-03-12 | 1 | -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üller | 2013-03-12 | 2 | -3/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fixing-mssql-utf8-and-insert-empty-string-master Fixing mssql utf8 and insert empty string master | ||||
| * | | | | | enable UTF-8 charset on mssql | Thomas Mueller | 2013-03-12 | 1 | -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 Mueller | 2013-03-12 | 1 | -1/+4 |
| |/ / / / | | | | | | | | | | | | | | | | hours to find that the insert failed :-( | ||||
* | | | | | Merge pull request #2253 from owncloud/fixing-windows-file-mapper-master | Thomas Müller | 2013-03-12 | 5 | -14/+20 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixing windows file mapper master | ||||
| * | | | | | fixing various filesystem/storage unit tests on windows | Thomas Mueller | 2013-03-12 | 3 | -8/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | fixing copy operation on mapper | ||||
| * | | | | | skip archive tests for now | Thomas Mueller | 2013-03-12 | 2 | -0/+4 |
| | | | | | | |||||
| * | | | | | adding //IGNORE to iconv to prevent nasty php warnings | Thomas Mueller | 2013-03-12 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | slug generates uniqid in case the file/folder name contains not one single ↵ | Thomas Mueller | 2013-03-12 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | valid character | ||||
| * | | | | | indexed slug should be created based on logic path | Thomas Mueller | 2013-03-12 | 1 | -1/+1 |
| |/ / / / |