aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* allow streamed responses in http clientRobin Appelman2015-08-293-5/+15
|
* Merge pull request #18393 from owncloud/objectstore-check-classLukas Reschke2015-08-291-0/+3
|\ | | | | make sure we actually have an object store
| * make sure we actually have an object storeRobin Appelman2015-08-281-0/+3
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-08-29112-0/+236
| |
* | Merge pull request #18511 from owncloud/downgrad-sharing-error-logs-to-debugJoas Schilling2015-08-281-22/+22
|\ \ | | | | | | Change log level of debugging logs to debug
| * | Change log level of debugging logs to debugJoas Schilling2015-08-241-22/+22
| | |
* | | Merge pull request #18423 from owncloud/occ_encrypt_allBjörn Schießle2015-08-2815-84/+1101
|\ \ \ | | | | | | | | occ command line tool to encrypt all files
| * | | copy always file by file to encrypt/decrypt it if neededBjoern Schiessle2015-08-262-82/+23
| | | |
| * | | occ tool to encrypt all filesBjoern Schiessle2015-08-2614-2/+1078
| | | |
* | | | Merge pull request #18638 from ↵Jan-Christoph Borchardt2015-08-281-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/issue-18141-sort-languages-with-names-before-code-only Sort languages with a name before those with language code only
| * | | | Sort languages with a name before those with language code onlyJoas Schilling2015-08-281-0/+9
| | |_|/ | |/| |
* | | | Merge pull request #18636 from owncloud/fix-filepicker-filetype-iconsMorris Jobke2015-08-281-0/+1
|\ \ \ \ | | | | | | | | | | fix size of filetype icons in filepicker
| * | | | fix size of filetype icons in filepickerJan-Christoph Borchardt2015-08-281-0/+1
| | | | |
* | | | | Merge pull request #18598 from owncloud/proper-language-l10nJoas Schilling2015-08-282-28/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Add comment for language name and remove unneeded fallbacks
| * | | | remove language code fallbacks for properly translated language namesMorris Jobke2015-08-271-28/+0
| | | | |
| * | | | add comment for translatorsMorris Jobke2015-08-271-0/+1
| | | | |
* | | | | Merge pull request #18610 from owncloud/use-certificates-that-expire-in10-yearsVincent Petry2015-08-283-33/+48
|\ \ \ \ \ | |_|/ / / |/| | | | [master] Use certificates that expire in 10 years
| * | | | Use certificates that expire in 10 yearsLukas Reschke2015-08-273-33/+48
| |/ / / | | | | | | | | | | | | :speak_no_evil: :speak_no_evil: :speak_no_evil:
* | | | Merge pull request #18624 from owncloud/navigation-iconsVincent Petry2015-08-286-5/+5
|\ \ \ \ | | | | | | | | | | compress icons in navigation, move to monochrome again
| * | | | compress icons in navigation, move to monochrome againJan-Christoph Borchardt2015-08-286-5/+5
| | | | |
* | | | | Merge pull request #18623 from owncloud/controls-resize-sidebar-visibilityMorris Jobke2015-08-282-6/+12
|\ \ \ \ \ | |/ / / / |/| | | | Fix controls bar calculation
| * | | | Fix controls bar calculationVincent Petry2015-08-282-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Controls bar calculation needs to take the sidebar visibility into account. Recalculation is now triggered when sidebar is toggled, using a new app-content event "appresized".
* | | | | Merge pull request #18621 from owncloud/filetype-icons-elsewhereJan-Christoph Borchardt2015-08-2811-23/+10
|\ \ \ \ \ | |/ / / / |/| | | | fix filetype icons elsewhere, empty page, sidebar, apps menu
| * | | | fix filetype icons elsewhere, empty page, sidebar, apps menuJan-Christoph Borchardt2015-08-2811-23/+10
| | | | |
* | | | | Merge pull request #18606 from owncloud/fix-filename-overflow-sidebarMorris Jobke2015-08-281-1/+24
|\ \ \ \ \ | | | | | | | | | | | | fix right sidebar causing filename overflow, fix #18383
| * | | | | fix right sidebar causing filename overflow, fix #18383Jan-Christoph Borchardt2015-08-271-1/+24
| | |/ / / | |/| | |
* | | | | Merge pull request #18614 from owncloud/fix-favorites-displayVincent Petry2015-08-282-2/+10
|\ \ \ \ \ | | | | | | | | | | | | restore behavior where favorite stars only show up on hover, to not clutter the interface so much
| * | | | | restore behavior where favorite stars only show up on hover, to not clutter ↵Jan-Christoph Borchardt2015-08-272-2/+10
| | |/ / / | |/| | | | | | | | | | | | | the interface so much
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-28160-166/+200
| | | | |
* | | | | Merge pull request #18615 from owncloud/fix-triangle-pngsJan-Christoph Borchardt2015-08-285-0/+0
|\ \ \ \ \ | | | | | | | | | | | | fix png fallbacks of triangle icons
| * | | | | fix png fallbacks of triangle iconsJan-Christoph Borchardt2015-08-275-0/+0
| |/ / / /
* | | | | Merge pull request #18609 from owncloud/login-layoutLukas Reschke2015-08-274-12/+64
|\ \ \ \ \ | |/ / / / |/| | | | log in screen improvement & simplification
| * | | | use simpler logo for log in pageJan-Christoph Borchardt2015-08-271-1/+3
| | | | |
| * | | | position and style remember button on log in pageJan-Christoph Borchardt2015-08-271-2/+4
| | | | |
| * | | | show feedback spinner for log in processJan-Christoph Borchardt2015-08-272-1/+26
| | | | |
| * | | | move log in button into fields and use icon instead of textJan-Christoph Borchardt2015-08-272-8/+31
| |/ / /
* | | | Merge pull request #18608 from owncloud/filetype-iconsMorris Jobke2015-08-2767-1852/+69
|\ \ \ \ | |/ / / |/| | | simpler style for filetype icons
| * | | simpler style for filetype iconsJan-Christoph Borchardt2015-08-2767-1852/+69
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-2722-8/+122
| | | |
* | | | Merge pull request #18574 from owncloud/update-eventsource-errorsRobin McCorkell2015-08-271-6/+20
|\ \ \ \ | | | | | | | | | | Properly show update exception in web UI
| * | | | Properly show update exceptionVincent Petry2015-08-261-1/+7
| | | | |
| * | | | Properly show token errors in ajax/update.php event sourceVincent Petry2015-08-261-5/+13
| | | | |
* | | | | Merge pull request #18582 from owncloud/be-consistentThomas Müller2015-08-261-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Remove last occurence of `forcessl`
| * | | | Remove last occurence of `forcessl`Lukas Reschke2015-08-261-2/+2
| | | | | | | | | | | | | | | | | | | | This shoudl have been adjusted as well, now it's consistent with `setMagicInCookie`. While it does not have a security impact directly some automated scanners reported this all the time.
* | | | | Merge pull request #18587 from owncloud/list-highlightVincent Petry2015-08-261-15/+15
|\ \ \ \ \ | | | | | | | | | | | | reduce grey tones to one for list highlight
| * | | | | reduce grey tones to one for list highlightJan-Christoph Borchardt2015-08-261-15/+15
|/ / / / /
* | | | | Merge pull request #18514 from owncloud/app-navigation-styleMorris Jobke2015-08-2615-35/+30
|\ \ \ \ \ | | | | | | | | | | | | reduce grey tones in app navigation
| * | | | | reduce grey tones in app navigation, bubble menu and scrollbarJan-Christoph Borchardt2015-08-2615-35/+30
|/ / / / /
* | | | | Merge pull request #18573 from owncloud/search-styleJan-Christoph Borchardt2015-08-263-30/+14
|\ \ \ \ \ | | | | | | | | | | | | only show search icon on desktop, like on mobile
| * | | | | only show search icon on desktop, like on mobileJan-Christoph Borchardt2015-08-263-30/+14
| | |/ / / | |/| | |