Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | test encryptAll() and decryptAll() to make sure that mtime and etag stay the ... | Bjoern Schiessle | 2013-11-14 | 1 | -0/+64 | |
| * | | | | | | Merge branch 'master' into encryption_fixes | Bjoern Schiessle | 2013-11-13 | 10 | -75/+138 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | fixPartialFilePath() is now stripPartialFileExtension() | Bjoern Schiessle | 2013-11-12 | 1 | -1/+1 | |
| * | | | | | | | only update file cache if the file is already indexed to avoid that we create... | Bjoern Schiessle | 2013-11-12 | 1 | -11/+14 | |
| * | | | | | | | make sure that we keep the correct timestamp and etag after encryoption/decry... | Bjoern Schiessle | 2013-11-12 | 1 | -11/+11 | |
* | | | | | | | | Merge pull request #5880 from owncloud/replace_etmp_files | Vincent Petry | 2013-11-15 | 4 | -16/+64 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | tests added | Bjoern Schiessle | 2013-11-15 | 1 | -1/+14 | |
| * | | | | | | | | instead of writing etmp files we write the dummy file to data/user/cache to a... | Bjoern Schiessle | 2013-11-14 | 3 | -15/+50 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #5889 from owncloud/extstorage-smb-brokenfseek | Frank Karlitschek | 2013-11-15 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | Fix for smb4php fseek | Vincent Petry | 2013-11-15 | 1 | -1/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #5789 from ogasser/db_fix_default_for_numeric | Bart Visscher | 2013-11-15 | 3 | -1/+48 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | treat numeric as an alias for decimal | Oliver Gasser | 2013-11-12 | 1 | -0/+3 | |
| * | | | | | | | changed type to decimal | Oliver Gasser | 2013-11-12 | 1 | -1/+1 | |
| * | | | | | | | Add DB tests for default numeric | Oliver Gasser | 2013-11-12 | 2 | -0/+44 | |
| * | | | | | | | DB: Set correct default value for numeric types | Oliver Gasser | 2013-11-10 | 1 | -1/+1 | |
* | | | | | | | | increase version number to trigger a DB migration to get more testers for the... | Frank Karlitschek | 2013-11-15 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #5814 from owncloud/add-indexes | Frank Karlitschek | 2013-11-15 | 1 | -0/+30 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add some more indexes to tables to improve db queries | Bart Visscher | 2013-11-11 | 1 | -0/+30 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #5700 from owncloud/ldapWizSetDisplayNames | Thomas Müller | 2013-11-15 | 1 | -0/+13 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | LDAP Wizard: do not forget to set display name attributes for user and group,... | Arthur Schiwon | 2013-11-05 | 1 | -0/+13 | |
* | | | | | | | | | Merge pull request #5813 from owncloud/fix-4736-master | Thomas Müller | 2013-11-15 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | fix DB schema test - no default value | Morris Jobke | 2013-11-12 | 1 | -2/+2 | |
| * | | | | | | | | Don't set a default value when there isn't a default specified | Bart Visscher | 2013-11-11 | 1 | -1/+1 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #5767 from owncloud/moviepreviewfallback | Morris Jobke | 2013-11-14 | 1 | -12/+48 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into moviepreviewfallback | Thomas Müller | 2013-11-14 | 535 | -4152/+8674 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Added missing escaping | Vincent Petry | 2013-11-11 | 1 | -1/+1 | |
| * | | | | | | | | | Fixed undefined variable error when using avconv | Vincent Petry | 2013-11-10 | 1 | -0/+2 | |
| * | | | | | | | | | Fixed the rebellous space, replaced with a tab | Vincent Petry | 2013-11-08 | 1 | -1/+1 | |
| * | | | | | | | | | Added ffmpeg fallback when avconv is not available | Vincent Petry | 2013-11-08 | 1 | -11/+45 | |
* | | | | | | | | | | Merge pull request #5867 from owncloud/users-groupadmindropdown | Morris Jobke | 2013-11-14 | 2 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Added min-height in case of empty multi-select | Vincent Petry | 2013-11-14 | 1 | -0/+1 | |
| * | | | | | | | | | Fixed multiselect to not set the button's height on itself after select | Vincent Petry | 2013-11-14 | 1 | -2/+0 | |
* | | | | | | | | | | Merge pull request #5824 from owncloud/fix-publicshare-non-existing | Thomas Müller | 2013-11-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix fatal error when trying to open a non existing public link | Robin Appelman | 2013-11-12 | 1 | -1/+1 | |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5862 from owncloud/files-singledotdirs | Thomas Müller | 2013-11-14 | 4 | -6/+76 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Added missing test with leading backslash | Vincent Petry | 2013-11-14 | 1 | -0/+2 | |
| * | | | | | | | | | | Files app backend now normalizes paths before rendering templates | Vincent Petry | 2013-11-14 | 2 | -2/+3 | |
| * | | | | | | | | | | Fixed normalizePath() to strip out single dot dirs | Vincent Petry | 2013-11-14 | 2 | -4/+71 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5850 from owncloud/oc_api_tests | Thomas Müller | 2013-11-14 | 2 | -17/+174 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | make use of data providers | Thomas Müller | 2013-11-14 | 1 | -111/+80 | |
| * | | | | | | | | | | Merge multiple failed third party responses when returning the result | tomneedham | 2013-11-14 | 1 | -3/+10 | |
| * | | | | | | | | | | Merge multiple shipped failures before responding. | tomneedham | 2013-11-14 | 1 | -2/+10 | |
| * | | | | | | | | | | Return failed shipped responses over succedded shipped responses | tomneedham | 2013-11-14 | 1 | -3/+3 | |
| * | | | | | | | | | | Fix type in unit test | tomneedham | 2013-11-14 | 1 | -1/+1 | |
| * | | | | | | | | | | Return result object when only one successful response is returned | tomneedham | 2013-11-14 | 1 | -2/+2 | |
| * | | | | | | | | | | Update lib/private/api.php after merge conflict | tomneedham | 2013-11-14 | 1 | -1/+1 | |
| * | | | | | | | | | | Merge branch 'ocs_api_fix_success_code' into oc_api_tests | tomneedham | 2013-11-14 | 1 | -2/+13 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Pick any none 100 status code before defaulting to 100 | Tom Needham | 2013-11-13 | 1 | -2/+13 | |
| * | | | | | | | | | | | Merge branch 'master' into oc_api_tests | tomneedham | 2013-11-14 | 25 | -217/+531 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Add tests for OC_API::mergeResponses() | tomneedham | 2013-11-14 | 1 | -0/+159 |