Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #18523 from owncloud/crazy-scanner | Thomas Müller | 2015-08-25 | 3 | -8/+25 | |
|\ \ \ | ||||||
| * | | | Prevent scanner going crazy with unavailable storages | Vincent Petry | 2015-08-24 | 3 | -8/+25 | |
* | | | | Merge pull request #18445 from owncloud/ext-only-setuservars-string | Morris Jobke | 2015-08-25 | 11 | -22/+83 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Convert string booleans to real booleans | Robin McCorkell | 2015-08-20 | 7 | -17/+76 | |
| * | | | setUserVars() should only attempt substitution with strings | Robin McCorkell | 2015-08-20 | 4 | -5/+7 | |
* | | | | Merge pull request #18532 from owncloud/fix-regression | Morris Jobke | 2015-08-24 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Fix regression | Morris Jobke | 2015-08-24 | 1 | -1/+1 | |
* | | | | | Merge pull request #18528 from owncloud/files-sidebar-mtime | Morris Jobke | 2015-08-24 | 2 | -0/+30 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | 3 | -26/+13 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | bigger file thumbnail in app sidebar | Jan-Christoph Borchardt | 2015-08-24 | 2 | -6/+7 | |
| * | | | | lighter style for app sidebar, new switcher style | Jan-Christoph Borchardt | 2015-08-24 | 1 | -20/+6 | |
* | | | | | Merge pull request #18510 from owncloud/proper-debug-setting | Morris Jobke | 2015-08-24 | 8 | -22/+28 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Remove DEBUG constant and use config value | Morris Jobke | 2015-08-24 | 8 | -22/+28 | |
| |/ / / | ||||||
* | | | | Merge pull request #18521 from owncloud/search-style | Morris Jobke | 2015-08-24 | 2 | -4/+4 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | adjust search box style | Jan-Christoph Borchardt | 2015-08-24 | 2 | -4/+4 | |
|/ / / | ||||||
* | | | Merge pull request #18491 from owncloud/expire-token-after-12h-or-login | Lukas Reschke | 2015-08-24 | 3 | -15/+142 | |
|\ \ \ | ||||||
| * | | | Expire token after 12h and if user logged-in again | Lukas Reschke | 2015-08-22 | 3 | -15/+142 | |
* | | | | Merge pull request #18244 from owncloud/fix-issue-17677 | blizzz | 2015-08-24 | 6 | -20/+12 | |
|\ \ \ \ | ||||||
| * | | | | 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 #18513 from owncloud/fix-master-again | Vincent Petry | 2015-08-24 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix master again | Lukas Reschke | 2015-08-24 | 1 | -0/+1 | |
* | | | | | | Merge pull request #18477 from owncloud/fed-alwaysdetectremotechanges | Vincent Petry | 2015-08-24 | 1 | -0/+2 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Always detect remote changes for fed sharing | Vincent Petry | 2015-08-21 | 1 | -0/+2 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #18482 from owncloud/encrypt-session-data | Morris Jobke | 2015-08-24 | 8 | -7/+430 | |
|\ \ \ \ \ | ||||||
| * | | | | | Handle failures gracefully, remove switch | Lukas Reschke | 2015-08-21 | 4 | -25/+101 | |
| * | | | | | Add a session wrapper to encrypt the data before storing it on disk | Joas Schilling | 2015-08-21 | 8 | -34/+381 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #18121 from owncloud/enc_improve_privkey_encryption | Lukas Reschke | 2015-08-24 | 11 | -37/+343 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | 8 | -53/+258 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add CORS header to status.php so that we can migrate to a JS based check in t... | Lukas Reschke | 2015-08-22 | 1 | -0/+1 | |
| * | | | | | | Use IClientService to check for remote ownCloud instances | Lukas Reschke | 2015-08-22 | 7 | -53/+257 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | 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 se... | Jan-Christoph Borchardt | 2015-08-24 | 1 | -0/+1 | |
* | | | | | | | Merge pull request #18498 from owncloud/remove-csrf-check-for-avatar | Vincent Petry | 2015-08-24 | 3 | -3/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove requesttoken for avatars | Lukas Reschke | 2015-08-23 | 3 | -3/+4 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #17501 from tbartenstein/patch-1 | Vincent Petry | 2015-08-24 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | fix unit test for folder renaming (icon) | tbartenstein | 2015-08-21 | 1 | -1/+1 | |
| * | | | | | | Update fileinfo.php | tbartenstein | 2015-07-08 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #18254 from owncloud/mitigate-breach | Morris Jobke | 2015-08-24 | 17 | -32/+160 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Remove search box $_POST since it is unused | Lukas Reschke | 2015-08-14 | 1 | -1/+1 | |
| * | | | | | | Add mitigation against BREACH | Lukas Reschke | 2015-08-14 | 16 | -31/+159 | |
* | | | | | | | Merge pull request #18472 from owncloud/ext-array-filter | Robin McCorkell | 2015-08-21 | 1 | -10/+15 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Replace array_filter() with foreach for PHP <5.6 | Robin McCorkell | 2015-08-21 | 1 | -10/+15 | |
* | | | | | | | | Merge pull request #18395 from owncloud/hide-empty-security-warning | Robin McCorkell | 2015-08-21 | 3 | -0/+12 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | |