Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-05 | 2 | -2/+37 |
* | Merge pull request #1449 from owncloud/fixing-namespace-local-storage-master | Thomas Müller | 2013-02-04 | 1 | -2/+2 |
|\ | |||||
| * | fixing namespace | Thomas Mueller | 2013-02-04 | 1 | -2/+2 |
* | | Merge pull request #1234 from owncloud/fix-issue-192 | Thomas Müller | 2013-02-04 | 1 | -1/+2 |
|\ \ | |/ |/| | |||||
| * | Fix sharing issue with collection and children mismatches | Michael Gapczynski | 2013-01-19 | 1 | -1/+2 |
* | | Merge pull request #1444 from owncloud/writable-temp-folder-for-session-data-... | Thomas Müller | 2013-02-04 | 1 | -0/+11 |
|\ \ | |||||
| * | | in case file based session handling in enabled - we need to make sure the con... | Thomas Mueller | 2013-02-04 | 1 | -0/+11 |
* | | | Merge pull request #1445 from owncloud/CSP_font | Thomas Müller | 2013-02-04 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Also allow local files | Lukas Reschke | 2013-02-04 | 1 | -1/+1 |
| * | | | Allow the loading of local font files embedded via data: | Lukas Reschke | 2013-02-04 | 1 | -1/+1 |
| * | | | Allow loading of external fonts | Lukas Reschke | 2013-02-04 | 1 | -1/+1 |
* | | | | Merge pull request #1427 from TheSFReader/master | Thomas Müller | 2013-02-04 | 1 | -1/+7 |
|\ \ \ \ | |||||
| * | | | | translate the mimtype/mimepart to readable in the searchByMime function | TheSFReader | 2013-02-03 | 1 | -1/+7 |
| |/ / / | |||||
* | | | | Merge pull request #1436 from owncloud/cache_check_path | Thomas Müller | 2013-02-04 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | Cache: fix copy-paste errors | Robin Appelman | 2013-02-04 | 1 | -2/+2 |
| * | | | | Cache: check for invalid paths in getFileInfo/getDirectoryContent | Robin Appelman | 2013-02-03 | 1 | -0/+6 |
* | | | | | Merge pull request #1423 from owncloud/getowner | Thomas Müller | 2013-02-04 | 2 | -0/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Add getOwner to Filesystem and View classes | Michael Gapczynski | 2013-02-02 | 2 | -0/+20 |
* | | | | | | Make fileblacklist configurable | Lukas Reschke | 2013-02-03 | 1 | -1/+1 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #1416 from herbrechtsmeier/set_include_path_early | Thomas Müller | 2013-02-03 | 1 | -6/+7 |
|\ \ \ \ \ | |||||
| * | | | | | initPaths: set include path before any owncloud function is called | herbrechtsmeier | 2013-02-02 | 1 | -6/+7 |
| |/ / / / | |||||
* | | | | | Merge pull request #1422 from TheSFReader/master | Thomas Müller | 2013-02-03 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Remove a warning by making sure the renamed file is a dir before trying and o... | TheSFReader | 2013-02-02 | 1 | -1/+1 |
| |/ / / / | |||||
* | / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-03 | 1 | -1/+12 |
| |/ / / |/| | | | |||||
* | | | | Dav: update etag in filecache when doing a PROPSET | Robin Appelman | 2013-02-02 | 1 | -1/+3 |
* | | | | Dav: don't overwrite etag from filecache with old etag from properties table | Robin Appelman | 2013-02-02 | 1 | -1/+3 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-02 | 1 | -4/+4 |
* | | | Merge pull request #1413 from owncloud/enable_removing_search_providers | Frank Karlitschek | 2013-02-01 | 1 | -0/+16 |
|\ \ \ | |||||
| * | | | add function to remove a search provider | Jörn Friedrich Dreyer | 2013-02-01 | 1 | -0/+16 |
* | | | | Merge pull request #1384 from owncloud/upgrade_fix | Bart Visscher | 2013-02-01 | 1 | -70/+53 |
|\ \ \ \ | |||||
| * | | | | Still load js files in maintance mode | Robin Appelman | 2013-01-30 | 1 | -2/+6 |
| * | | | | Check for upgrade/maintance mode before trying to load an app | Robin Appelman | 2013-01-30 | 1 | -70/+49 |
| |/ / / | |||||
* | | | | Merge pull request #1171 from owncloud/move-datadirectory-checks | Thomas Müller | 2013-01-31 | 1 | -30/+28 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into move-datadirectory-checks | Michael Gapczynski | 2013-01-18 | 56 | -934/+963 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Move permissions check to new function checkDataDirectoryPermissions() | Michael Gapczynski | 2013-01-18 | 1 | -28/+27 |
| * | | | | Move data directory permission checks after data directory existence checks | Michael Gapczynski | 2013-01-12 | 1 | -29/+28 |
* | | | | | Merge pull request #1287 from owncloud/ocs_xml_attributes | Thomas Müller | 2013-01-31 | 1 | -2/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Simpler method for getting the first char | Tom Needham | 2013-01-24 | 1 | -1/+1 |
| * | | | | | Remove some whitespace | Tom Needham | 2013-01-24 | 1 | -4/+0 |
| * | | | | | API: If key begins with '@' treat it as an xml attribute | Tom Needham | 2013-01-24 | 1 | -2/+9 |
* | | | | | | Merge pull request #1099 from herbrechtsmeier/ssl-proxy | Thomas Müller | 2013-01-31 | 6 | -7/+120 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add SSL proxy support | herbrechtsmeier | 2013-01-31 | 1 | -4/+13 |
| * | | | | | | add multiple domains reverse proxy support | Stefan Herbrechtsmeier | 2013-01-31 | 6 | -5/+109 |
| | |_|_|_|/ | |/| | | | | |||||
* / | | | | | Case insensitive Lang Detection fix #1328 | Brice Maron | 2013-01-31 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #1379 from owncloud/improved_appsmanagement | Lukas Reschke | 2013-01-31 | 3 | -20/+125 |
|\ \ \ \ \ | |||||
| * | | | | | just return "true" for now | Frank Karlitschek | 2013-01-31 | 1 | -0/+1 |
| * | | | | | style fixes | Thomas Mueller | 2013-01-31 | 1 | -21/+21 |
| * | | | | | style fixes | Thomas Mueller | 2013-01-31 | 1 | -10/+11 |
| * | | | | | remove spaces | Frank Karlitschek | 2013-01-31 | 1 | -1/+1 |
| * | | | | | merge master | Frank Karlitschek | 2013-01-30 | 84 | -993/+1462 |
| |\ \ \ \ \ |