summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #18523 from owncloud/crazy-scannerThomas Müller2015-08-253-8/+25
|\ \ \
| * | | Prevent scanner going crazy with unavailable storagesVincent Petry2015-08-243-8/+25
* | | | Merge pull request #18445 from owncloud/ext-only-setuservars-stringMorris Jobke2015-08-2511-22/+83
|\ \ \ \ | |_|/ / |/| | |
| * | | Convert string booleans to real booleansRobin McCorkell2015-08-207-17/+76
| * | | setUserVars() should only attempt substitution with stringsRobin McCorkell2015-08-204-5/+7
* | | | Merge pull request #18532 from owncloud/fix-regressionMorris Jobke2015-08-241-1/+1
|\ \ \ \
| * | | | Fix regressionMorris Jobke2015-08-241-1/+1
* | | | | Merge pull request #18528 from owncloud/files-sidebar-mtimeMorris Jobke2015-08-242-0/+30
|\ \ \ \ \
| * | | | | Parse mtime from the data attributesVincent Petry2015-08-242-0/+30
| | |_|/ / | |/| | |
* | | | | Merge pull request #18525 from owncloud/app-sidebar-styleMorris Jobke2015-08-243-26/+13
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | bigger file thumbnail in app sidebarJan-Christoph Borchardt2015-08-242-6/+7
| * | | | lighter style for app sidebar, new switcher styleJan-Christoph Borchardt2015-08-241-20/+6
* | | | | Merge pull request #18510 from owncloud/proper-debug-settingMorris Jobke2015-08-248-22/+28
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove DEBUG constant and use config valueMorris Jobke2015-08-248-22/+28
| |/ / /
* | | | Merge pull request #18521 from owncloud/search-styleMorris Jobke2015-08-242-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | adjust search box styleJan-Christoph Borchardt2015-08-242-4/+4
|/ / /
* | | Merge pull request #18491 from owncloud/expire-token-after-12h-or-loginLukas Reschke2015-08-243-15/+142
|\ \ \
| * | | Expire token after 12h and if user logged-in againLukas Reschke2015-08-223-15/+142
* | | | Merge pull request #18244 from owncloud/fix-issue-17677blizzz2015-08-246-20/+12
|\ \ \ \
| * | | | Spaces -> tabsLennart Rosam2015-08-221-6/+6
| * | | | Remove if-block as the helper does return the empty prefixLennart Rosam2015-08-211-5/+0
| * | | | Add database update routine and bump version to 0.6.2Lennart Rosam2015-08-192-1/+16
| * | | | Remove another occurance of ldap_nocaseLennart Rosam2015-08-191-14/+0
| * | | | Fix 17677Lennart Rosam2015-08-123-5/+1
* | | | | Merge pull request #18513 from owncloud/fix-master-againVincent Petry2015-08-241-0/+1
|\ \ \ \ \
| * | | | | Fix master againLukas Reschke2015-08-241-0/+1
* | | | | | Merge pull request #18477 from owncloud/fed-alwaysdetectremotechangesVincent Petry2015-08-241-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Always detect remote changes for fed sharingVincent Petry2015-08-211-0/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #18482 from owncloud/encrypt-session-dataMorris Jobke2015-08-248-7/+430
|\ \ \ \ \
| * | | | | Handle failures gracefully, remove switchLukas Reschke2015-08-214-25/+101
| * | | | | Add a session wrapper to encrypt the data before storing it on diskJoas Schilling2015-08-218-34/+381
| |/ / / /
* | | | | Merge pull request #18121 from owncloud/enc_improve_privkey_encryptionLukas Reschke2015-08-2411-37/+343
|\ \ \ \ \
| * | | | | use uid as additional information for saltBjoern Schiessle2015-08-075-17/+17
| * | | | | use password hash instead of the plain password to encrypt the private keyBjoern Schiessle2015-08-0711-29/+335
* | | | | | Merge pull request #18486 from owncloud/use-client-service-to-work-behind-proxyVincent Petry2015-08-248-53/+258
|\ \ \ \ \ \
| * | | | | | Add CORS header to status.php so that we can migrate to a JS based check in t...Lukas Reschke2015-08-221-0/+1
| * | | | | | Use IClientService to check for remote ownCloud instancesLukas Reschke2015-08-227-53/+257
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #18505 from owncloud/fix-personal-scrollbarMorris Jobke2015-08-241-0/+1
|\ \ \ \ \ \
| * | | | | | fix horizontal scrollbar in personal settings caused by federated cloud ID se...Jan-Christoph Borchardt2015-08-241-0/+1
* | | | | | | Merge pull request #18498 from owncloud/remove-csrf-check-for-avatarVincent Petry2015-08-243-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Remove requesttoken for avatarsLukas Reschke2015-08-233-3/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #17501 from tbartenstein/patch-1Vincent Petry2015-08-242-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | fix unit test for folder renaming (icon)tbartenstein2015-08-211-1/+1
| * | | | | | Update fileinfo.phptbartenstein2015-07-081-1/+1
* | | | | | | Merge pull request #18254 from owncloud/mitigate-breachMorris Jobke2015-08-2417-32/+160
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Remove search box $_POST since it is unusedLukas Reschke2015-08-141-1/+1
| * | | | | | Add mitigation against BREACHLukas Reschke2015-08-1416-31/+159
* | | | | | | Merge pull request #18472 from owncloud/ext-array-filterRobin McCorkell2015-08-211-10/+15
|\ \ \ \ \ \ \
| * | | | | | | Replace array_filter() with foreach for PHP <5.6Robin McCorkell2015-08-211-10/+15
* | | | | | | | Merge pull request #18395 from owncloud/hide-empty-security-warningRobin McCorkell2015-08-213-0/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |