Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2380 from henningoschwald/76bb5221c7a1b71f0d617c55e844c51... | Bernhard Posselt | 2013-03-16 | 1 | -1/+1 |
|\ | |||||
| * | Restores keyboard accessibility for expandable settings area. | Henning Oschwald | 2013-03-16 | 1 | -1/+1 |
* | | 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 | 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 | Chris Kankiewicz | 2013-03-14 | 3 | -1/+3 |
* | | | Merge pull request #2360 from sherbrecher/master | Lukas Reschke | 2013-03-15 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'upstream/master' | sherbrecher | 2013-03-15 | 3353 | -381397/+213437 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #2350 from aschoenebeck/ignore_blacklisted_files | Bernhard Posselt | 2013-03-15 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Filter display of blacklisted files | Andreas Schönebeck | 2013-03-15 | 1 | -0/+1 |
* | | | | | Merge pull request #2320 from ceri/master | Frank Karlitschek | 2013-03-15 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Correct emails when folders are shared. | Ceri Davies | 2013-03-14 | 1 | -2/+2 |
* | | | | | | 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 | 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 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 | Robin Appelman | 2013-03-14 | 1 | -1/+5 |
|/ / / / | |||||
* | | | | 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 |
|\ \ \ | |||||
| * | | | 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 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | 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 |
* | | | | Merge pull request #2254 from owncloud/fixing-mssql-utf8-and-insert-empty-str... | Thomas Müller | 2013-03-12 | 2 | -3/+8 |
|\ \ \ \ | |||||
| * | | | | enable UTF-8 charset on mssql | Thomas Mueller | 2013-03-12 | 1 | -2/+4 |
| * | | | | write error message to log file in case insert to file cache failed - took ho... | Thomas Mueller | 2013-03-12 | 1 | -1/+4 |
| |/ / / | |||||
* | | | | Merge pull request #2253 from owncloud/fixing-windows-file-mapper-master | Thomas Müller | 2013-03-12 | 5 | -14/+20 |
|\ \ \ \ | |||||
| * | | | | fixing various filesystem/storage unit tests on windows | Thomas Mueller | 2013-03-12 | 3 | -8/+12 |
| * | | | | 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 va... | Thomas Mueller | 2013-03-12 | 1 | -4/+2 |
| * | | | | indexed slug should be created based on logic path | Thomas Mueller | 2013-03-12 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #2145 from eMerzh/preserve_debug | Jan-Christoph Borchardt | 2013-03-12 | 1 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | Preserve Debug flag accross config writes | Brice Maron | 2013-03-06 | 1 | -1/+5 |
* | | | | | Merge pull request #2234 from owncloud/fix_ldap_edirectory | Frank Karlitschek | 2013-03-12 | 1 | -2/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | LDAP: compatibility with Novell eDirectory UUID | Arthur Schiwon | 2013-03-11 | 1 | -2/+2 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-12 | 28 | -277/+311 |
* | | | | | this is now 6.0 pre alpha | Frank Karlitschek | 2013-03-09 | 1 | -2/+2 |
* | | | | | 5.0.0v5.0.0 | Frank Karlitschek | 2013-03-09 | 1 | -2/+2 |
* | | | | | Merge pull request #2236 from owncloud/fix-migration | Bernhard Posselt | 2013-03-11 | 1 | -0/+9 |
|\ \ \ \ \ | |/ / / / |/| | | | |