Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #18543 from owncloud/remove-lines | Jan-Christoph Borchardt | 2015-08-25 | 1 | -2/+6 |
|\ | | | | | Remove some lines | ||||
| * | reduce files table header line | Jan-Christoph Borchardt | 2015-08-25 | 1 | -2/+6 |
| | | |||||
* | | Merge pull request #18538 from owncloud/sidebar-improvements | Vincent Petry | 2015-08-25 | 7 | -6/+54 |
|\ \ | |/ |/| | Fix sidebar for trashbin and others | ||||
| * | Fix row highlight in other file lists | Vincent Petry | 2015-08-25 | 1 | -0/+1 |
| | | |||||
| * | Fix trashbin sidebar | Vincent Petry | 2015-08-25 | 4 | -4/+47 |
| | | | | | | | | | | Do not display size as it is not available. Use display name instead of name to remove the ".d123456" suffix. | ||||
| * | Properly hide sidebar when switching between files app sections | Vincent Petry | 2015-08-25 | 2 | -2/+6 |
| | | | | | | | | | | Since there are multiple sidebars, one for each files app section, we need to hide the correct ones. | ||||
* | | Merge pull request #18440 from owncloud/ext-backends.customjs | Morris Jobke | 2015-08-25 | 16 | -308/+529 |
|\ \ | |/ |/| | Migrate custom JS external storage backends to new registration API [part 2] | ||||
| * | Migrate Google external storage to new API | Robin McCorkell | 2015-08-25 | 8 | -147/+201 |
| | | |||||
| * | Migrate Dropbox external storage to new API | Robin McCorkell | 2015-08-25 | 8 | -130/+189 |
| | | |||||
| * | Migrate AmazonS3 external storage to new API | Robin McCorkell | 2015-08-25 | 4 | -27/+109 |
| | | |||||
| * | Add on-backend and on-auth-mechanism events to JS | Robin McCorkell | 2015-08-25 | 1 | -4/+30 |
| | | |||||
* | | Merge pull request #18523 from owncloud/crazy-scanner | Thomas Müller | 2015-08-25 | 2 | -4/+11 |
|\ \ | | | | | | | Prevent bkg scanner going crazy with unavailable storages (ajax/scan.php) | ||||
| * | | Prevent scanner going crazy with unavailable storages | Vincent Petry | 2015-08-24 | 2 | -4/+11 |
| | | | |||||
* | | | Merge pull request #18445 from owncloud/ext-only-setuservars-string | Morris Jobke | 2015-08-25 | 11 | -22/+83 |
|\ \ \ | |_|/ |/| | | setUserVars() should only attempt substitution with strings | ||||
| * | | Convert string booleans to real booleans | Robin McCorkell | 2015-08-20 | 7 | -17/+76 |
| | | | | | | | | | | | | | | | Legacy compatibility, from the days in stable8 when checkbox boolean values were stored as the strings 'true' and 'false'. | ||||
| * | | setUserVars() should only attempt substitution with strings | Robin McCorkell | 2015-08-20 | 4 | -5/+7 |
| | | | |||||
* | | | Merge pull request #18528 from owncloud/files-sidebar-mtime | Morris Jobke | 2015-08-24 | 2 | -0/+30 |
|\ \ \ | | | | | | | | | Parse mtime from the data attributes | ||||
| * | | | Parse mtime from the data attributes | Vincent Petry | 2015-08-24 | 2 | -0/+30 |
| | |/ | |/| | |||||
* | | | Merge pull request #18525 from owncloud/app-sidebar-style | Morris Jobke | 2015-08-24 | 2 | -6/+7 |
|\ \ \ | | | | | | | | | Right sidebar style improvements | ||||
| * | | | bigger file thumbnail in app sidebar | Jan-Christoph Borchardt | 2015-08-24 | 2 | -6/+7 |
| |/ / | |||||
* / / | Remove DEBUG constant and use config value | Morris Jobke | 2015-08-24 | 2 | -1/+10 |
|/ / | | | | | | | | | * introduces config.php option 'debug' that defaults to false * migrate DEBUG constant to config value | ||||
* | | Merge pull request #18244 from owncloud/fix-issue-17677 | blizzz | 2015-08-24 | 6 | -20/+12 |
|\ \ | | | | | | | Fix 17677 - Remove LDAP case sensitive checkbox | ||||
| * | | Spaces -> tabs | Lennart Rosam | 2015-08-22 | 1 | -6/+6 |
| | | | |||||
| * | | Remove if-block as the helper does return the empty prefix | Lennart Rosam | 2015-08-21 | 1 | -5/+0 |
| | | | |||||
| * | | Add database update routine and bump version to 0.6.2 | Lennart Rosam | 2015-08-19 | 2 | -1/+16 |
| | | | |||||
| * | | Remove another occurance of ldap_nocase | Lennart Rosam | 2015-08-19 | 1 | -14/+0 |
| | | | |||||
| * | | Fix 17677 | Lennart Rosam | 2015-08-12 | 3 | -5/+1 |
| | | | |||||
* | | | Merge pull request #18477 from owncloud/fed-alwaysdetectremotechanges | Vincent Petry | 2015-08-24 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Always detect remote changes for fed sharing | ||||
| * | | | Always detect remote changes for fed sharing | Vincent Petry | 2015-08-21 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | This is even more important now that filesystem_check_changes is 0 by default. | ||||
* | | | | Merge pull request #18121 from owncloud/enc_improve_privkey_encryption | Lukas Reschke | 2015-08-24 | 11 | -37/+343 |
|\ \ \ \ | | | | | | | | | | | use password hash to encrypt private key | ||||
| * | | | | use uid as additional information for salt | Bjoern Schiessle | 2015-08-07 | 5 | -17/+17 |
| | | | | | |||||
| * | | | | use password hash instead of the plain password to encrypt the private key | Bjoern Schiessle | 2015-08-07 | 11 | -29/+335 |
| | | | | | |||||
* | | | | | Merge pull request #18486 from owncloud/use-client-service-to-work-behind-proxy | Vincent Petry | 2015-08-24 | 5 | -53/+247 |
|\ \ \ \ \ | | | | | | | | | | | | | Use client service to work behind proxy for checks for remote ownCloud instances | ||||
| * | | | | | Use IClientService to check for remote ownCloud instances | Lukas Reschke | 2015-08-22 | 5 | -53/+247 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Allows to set a timeout (though still not perfect but way better than before) 2. Allows to have unit tests 3. I also added unit tests for the existing controller code 4. Corrected PHPDoc on IClient | ||||
* | | | | | Merge pull request #18505 from owncloud/fix-personal-scrollbar | Morris Jobke | 2015-08-24 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | fix horizontal scrollbar in personal settings caused by federated cloud ID section | ||||
| * | | | | | fix horizontal scrollbar in personal settings caused by federated cloud ID ↵ | Jan-Christoph Borchardt | 2015-08-24 | 1 | -0/+1 |
| |/ / / / | | | | | | | | | | | | | | | | section | ||||
* | | | | | Merge pull request #17501 from tbartenstein/patch-1 | Vincent Petry | 2015-08-24 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Update fileinfo.php | ||||
| * | | | | fix unit test for folder renaming (icon) | tbartenstein | 2015-08-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | fix unit test to go with #17501 and check for the new icon | ||||
* | | | | | Replace array_filter() with foreach for PHP <5.6 | Robin McCorkell | 2015-08-21 | 1 | -10/+15 |
| | | | | | | | | | | | | | | | | | | | | ARRAY_FILTER_USE_KEY is PHP 5.6+ | ||||
* | | | | | Add availability methods to files_external FailedStorage | Robin McCorkell | 2015-08-20 | 1 | -0/+8 |
| | | | | | |||||
* | | | | | Prevent shares being added to oc_storages via availability | Robin McCorkell | 2015-08-20 | 1 | -0/+18 |
| | | | | | |||||
* | | | | | Add namespace in case the file is loaded individually | Vincent Petry | 2015-08-20 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Some apps might load this file in JS unit tests and need the OCA.Files namespace to exist. | ||||
* | | | | | Merge pull request #18372 from ↵ | Joas Schilling | 2015-08-20 | 1 | -6/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-18358-object-type-and-id-for-activities Issue 18358 object type and id for activities | ||||
| * | | | | | Use an IEvent object instead of a huge parameter list | Joas Schilling | 2015-08-19 | 1 | -6/+16 |
| | | | | | | |||||
| * | | | | | Send the file id when dealing with remote share responses | Joas Schilling | 2015-08-19 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #18408 from owncloud/ext-ocp | Robin McCorkell | 2015-08-20 | 12 | -32/+46 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use OCP classes as much as possible in files_external v2 | ||||
| * | | | | | | Use OCP classes as much as possible in files_external | Robin McCorkell | 2015-08-19 | 12 | -32/+46 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #18380 from owncloud/files-sidebar-selectbar | Robin McCorkell | 2015-08-20 | 1 | -0/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix files select bar width when app sidebar is visible | ||||
| * | | | | | | Fix files select bar width when app sidebar is visible | Vincent Petry | 2015-08-18 | 1 | -0/+5 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #18437 from owncloud/ext-auth-trigger | Vincent Petry | 2015-08-20 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Trigger storage recheck on auth mechanism change |