summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * make objectstore setup more robust, don't pass user to object store mounted a...Jörn Friedrich Dreyer2014-06-181-5/+7
| * allow configuring objectstore as home and root storageJörn Friedrich Dreyer2014-06-182-11/+55
* | Merge pull request #9254 from owncloud/fileactions-deferredMorris Jobke2014-06-2711-6/+168
|\ \
| * | Sync file list with file actionsVincent Petry2014-06-2711-6/+168
* | | Merge pull request #9174 from owncloud/breadcrumbfixJan-Christoph Borchardt2014-06-279-138/+168
|\ \ \ | |/ / |/| |
| * | Breadcrumb width calculation fixVincent Petry2014-06-275-128/+155
| * | Removed unused padding-right of the controls barVincent Petry2014-06-242-3/+0
| * | Test runner now loads CSS and hides testAreaVincent Petry2014-06-242-7/+13
* | | Merge pull request #9247 from owncloud/move-webdav-class-to-core-masterThomas Müller2014-06-273-3/+0
|\ \ \
| * | | remove pointless require - we should kill all require_once like that in our t...Thomas Müller2014-06-271-2/+0
| * | | fix autoloaderThomas Müller2014-06-272-1/+0
| * | | Move \OC\Files\Storage\DAV to core in order to reduce inter-app dependenciesThomas Müller2014-06-271-0/+0
* | | | Merge pull request #9215 from owncloud/officemimetypesupdatefixVincent Petry2014-06-274-59/+337
|\ \ \ \ | |/ / / |/| | |
| * | | Add missing quotes for OracleVincent Petry2014-06-261-2/+2
| * | | Fixed mime type repair stepVincent Petry2014-06-262-41/+133
| * | | Added test case for when target mime types already existVincent Petry2014-06-251-0/+46
| * | | Moved office mimetype update to a repair stepVincent Petry2014-06-254-59/+199
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-27360-4487/+4585
* | | | Merge pull request #9241 from owncloud/backgroundjob-checkicewind19912014-06-273-2/+10
|\ \ \ \
| * | | | Fix check if class existsRobin Appelman2014-06-271-1/+1
| * | | | Check if classes/method exists before trying to call them in background jobsRobin Appelman2014-06-263-2/+10
* | | | | Merge pull request #9051 from owncloud/Bagera-masterFrank Karlitschek2014-06-263-23/+36
|\ \ \ \ \
| * | | | | fix padding for last cell in summary of trashbinMorris Jobke2014-06-261-0/+4
| * | | | | Aligning in the table header as wellBagera2014-06-162-15/+26
| * | | | | Aligning with line heightBagera2014-06-161-10/+5
| * | | | | Fix delete action heightBagera2014-06-161-5/+8
* | | | | | Merge pull request #9236 from owncloud/sharing-settingswordingicewind19912014-06-261-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix wording for remote shares in settings pageVincent Petry2014-06-261-1/+1
* | | | | | Merge pull request #9234 from owncloud/fix-ellipsis-for-foldersRaghu Nayyar2014-06-261-2/+2
|\ \ \ \ \ \
| * | | | | | Fix ellipsis for folders on mobile screensMorris Jobke2014-06-261-2/+2
* | | | | | | Merge pull request #9230 from owncloud/fix-repair-step-php-53Thomas Müller2014-06-261-1/+10
|\ \ \ \ \ \ \
| * | | | | | | Redeclared as public to allow invocation from within the closure in php 5.3Thomas Müller2014-06-261-1/+10
| |/ / / / / /
* | | | | | | Merge pull request #9213 from owncloud/upgrade-donotloadappsinremoteVincent Petry2014-06-261-0/+9
|\ \ \ \ \ \ \
| * | | | | | | Prevent loading apps in remote when an upgrade is dueVincent Petry2014-06-251-0/+9
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #9206 from owncloud/occ-scan-userVincent Petry2014-06-262-14/+28
|\ \ \ \ \ \ \
| * | | | | | | Prevent running the files:scan command as the wrong userRobin Appelman2014-06-252-14/+28
* | | | | | | | Merge pull request #9223 from owncloud/occ-scan-argumentsicewind19912014-06-261-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Add error message when no users specified to files:scan commandVincent Petry2014-06-261-0/+5
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #9211 from owncloud/fix-hidden-share-buttonJan-Christoph Borchardt2014-06-262-3/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix hidden share button and checkbox layoutMorris Jobke2014-06-252-3/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #9210 from owncloud/better_validation_in_getAppPathVincent Petry2014-06-261-0/+4
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | better validation for OC_App::getAppPath()Georg Ehrke2014-06-251-0/+4
* | | | | | | | Merge pull request #9171 from owncloud/enc_always_use_oc_viewBjörn Schießle2014-06-265-109/+98
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | fix unit testsBjoern Schiessle2014-06-251-2/+2
| * | | | | | | always use a \OC\Files\ViewBjoern Schiessle2014-06-254-77/+59
| * | | | | | | always use oc filesystem for rename operationBjoern Schiessle2014-06-252-34/+41
* | | | | | | | Merge pull request #9193 from owncloud/sharing_etag_propagationBjörn Schießle2014-06-266-22/+261
|\ \ \ \ \ \ \ \
| * | | | | | | | make sure that hooks are registered for the testsBjoern Schiessle2014-06-253-14/+23
| * | | | | | | | make sure that during share and unshare the etags get propagated correctlyBjoern Schiessle2014-06-255-12/+242
| |/ / / / / / /
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-2630-239/+267