summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11109 from owncloud/nstamm-patch-1Jan-Christoph Borchardt2014-09-231-1/+8
|\
| * adjust text size and opacity of drag'n'drop upload text styleJan-Christoph Borchardt2014-09-231-0/+4
| * DragnDrop Upload text styleNicolas Stamm2014-09-161-1/+4
* | Merge pull request #11222 from owncloud/store-users-timezone-masterThomas Müller2014-09-238-20/+417
|\ \
| * | enhance formatDate function to accept an optional argument containing the tim...Thomas Müller2014-09-223-9/+45
| * | date printed in the admin section regarding last execution time is already di...Thomas Müller2014-09-221-1/+1
| * | send browsers timezone back tp the server on loginThomas Müller2014-09-224-10/+371
* | | Merge pull request #11234 from owncloud/fix-icon-classesJan-Christoph Borchardt2014-09-238-14/+23
|\ \ \
| * | | force show the loading icon in list for deletion, not only on hoverJan-Christoph Borchardt2014-09-221-0/+9
| * | | correct progress-icon to icon-loading-smallJan-Christoph Borchardt2014-09-224-10/+10
| * | | correct delete-icon to icon-delete, fix #11128Jan-Christoph Borchardt2014-09-227-14/+14
* | | | Merge pull request #11137 from owncloud/enc-pregfixVincent Petry2014-09-2310-113/+384
|\ \ \ \
| * | | | Fix share key finding algorithm in various casesVincent Petry2014-09-2310-113/+384
| | |_|/ | |/| |
* | | | Merge pull request #11241 from owncloud/use-lower-caseThomas Müller2014-09-232-2/+5
|\ \ \ \
| * | | | Use only lower-case lettersLukas Reschke2014-09-222-2/+5
| | |/ / | |/| |
* | | | Merge pull request #11032 from owncloud/harden-redirectLukas Reschke2014-09-238-96/+302
|\ \ \ \
| * | | | Do only follow HTTP and HTTPS redirectsLukas Reschke2014-09-228-96/+302
* | | | | Merge pull request #11226 from owncloud/kill-postsetupcheck-masterVincent Petry2014-09-233-30/+4
|\ \ \ \ \
| * | | | | remove post setup checkThomas Müller2014-09-223-30/+4
* | | | | | Merge pull request #11224 from owncloud/fix_recovery_admin_userLukas Reschke2014-09-231-5/+4
|\ \ \ \ \ \
| * | | | | | first check if a private key exists, if not it is always a recovery szenarioBjoern Schiessle2014-09-221-5/+4
| |/ / / / /
* | | | | | Merge pull request #11242 from owncloud/fix-10284Lukas Reschke2014-09-231-1/+1
|\ \ \ \ \ \
| * | | | | | Use non-empty defaultsVictor Dubiniuk2014-09-221-1/+1
| | |_|/ / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2321-17/+45
* | | | | | Merge pull request #11227 from owncloud/fix-windows-pathThomas Müller2014-09-235-9/+12
|\ \ \ \ \ \
| * | | | | | ignoring writedata test in windows.Clark Tomlinson2014-09-221-0/+3
| * | | | | | fixing cache routesClark Tomlinson2014-09-223-7/+7
| * | | | | | fixing directory seperatorsClark Tomlinson2014-09-221-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #11221 from owncloud/fix-autotestThomas Müller2014-09-231-14/+14
|\ \ \ \ \ \
| * | | | | | Fix autotest.sh for whitespace in pathsRobin McCorkell2014-09-221-14/+14
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #11215 from owncloud/dav-throwwhendeletefailedMorris Jobke2014-09-234-7/+131
|\ \ \ \ \ \
| * | | | | | WebDAV now throws 403 when deletion did not workVincent Petry2014-09-224-7/+131
* | | | | | | Merge pull request #11211 from owncloud/previewProviderSwitchMorris Jobke2014-09-237-84/+63
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Remove unneeded unit testsLukas Reschke2014-09-223-23/+0
| * | | | | | Add a configuration switch for enabled preview mimetypesLukas Reschke2014-09-224-61/+63
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #11228 from owncloud/drop-travisMorris Jobke2014-09-224-274/+0
|\ \ \ \ \ \
| * | | | | | Revert "Travis support"Morris Jobke2014-09-224-274/+0
* | | | | | | Merge pull request #11186 from owncloud/trash-fixdoubledeleteraceconditionVincent Petry2014-09-221-0/+26
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Added extra check to avoid deleting key foldersVincent Petry2014-09-191-0/+26
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #11167 from owncloud/env-movetomountreenableproxyMorris Jobke2014-09-221-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Reenable file proxy when renaming between mount pointsVincent Petry2014-09-181-0/+1
* | | | | | Merge pull request #11204 from owncloud/fix_oc_stream_seekMorris Jobke2014-09-224-3/+13
|\ \ \ \ \ \
| * | | | | | in quota wrapper use === instead of ! for better readability and as in other ...Jörn Friedrich Dreyer2014-09-221-1/+1
| * | | | | | return boolean in Ciose::stream_seekJörn Friedrich Dreyer2014-09-221-1/+1
| * | | | | | return boolean in OC::stream_seekJörn Friedrich Dreyer2014-09-221-1/+1
| * | | | | | add seek and tell to streamwrapper testJörn Friedrich Dreyer2014-09-211-0/+10
* | | | | | | Merge pull request #11212 from owncloud/occ-catching-errorsMorris Jobke2014-09-222-23/+30
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | no loner use deprecated class \OC_ConfigThomas Müller2014-09-222-3/+16
| * | | | | | remove bootstrapping - occ can by definition only be executed if ownCloud is ...Thomas Müller2014-09-221-8/+0
| * | | | | | show upgrade errors as error in the console and report back that the upgrade ...Thomas Müller2014-09-221-12/+14