summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-27360-4487/+4585
|
* Merge pull request #9241 from owncloud/backgroundjob-checkicewind19912014-06-273-2/+10
|\ | | | | Check if classes/method exists before trying to call them in background jobs
| * 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 delete action height
| * | 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 the columns and in the rows
| * | Aligning with line heightBagera2014-06-161-10/+5
| | | | | | | | | | | | | | | Remove "top:" in favour of setting "line-height" and fixing the resulting problem with the input field being positioned wrongly.
| * | Fix delete action heightBagera2014-06-161-5/+8
| | | | | | | | | | | | Fix #8530 and align the all actions in the row
* | | Merge pull request #9236 from owncloud/sharing-settingswordingicewind19912014-06-261-1/+1
|\ \ \ | |_|/ |/| | Fix wording for remote shares in settings page
| * | 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 screens
| * | | Fix ellipsis for folders on mobile screensMorris Jobke2014-06-261-2/+2
| | | | | | | | | | | | | | | | * fixes #9162
* | | | 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 ...
| * | | | 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 due
| * | | | 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 user
| * | | | | 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 command
| * | | | | | 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 layout
| * | | | | | Fix hidden share button and checkbox layoutMorris Jobke2014-06-252-3/+5
| | |/ / / / | |/| | | | | | | | | | | | | | | | fixes #9101
* | | | | | Merge pull request #9210 from owncloud/better_validation_in_getAppPathVincent Petry2014-06-261-0/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | better validation for OC_App::getAppPath()
| * | | | | 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
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | [encryption] always use oc view
| * | | | | 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 the etags get propagated correctly
| * | | | | | 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
| | | | | |
* | | | | | 7.0 beta 1v7.0.0beta1Frank Karlitschek2014-06-251-2/+2
| | | | | |
* | | | | | Merge pull request #9205 from owncloud/remoteshare-fixurlpathVincent Petry2014-06-252-2/+93
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix parsing of remote URL when mounting remote shares
| * | | | | | Fix parsing of remote URL when mounting remote sharesVincent Petry2014-06-252-2/+93
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix allows for having the remote ownCloud instance live in a subpath like "http://example.com/basedir/subdir/owncloud". Such URLs are now parsed correctly. Added unit test for URL parsing.
* | | | | | Merge pull request #9194 from owncloud/revertloadappsVicDeo2014-06-251-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bring back loadApps() in base.php
| * | | | | | Bring back loadApps() in base.phpVincent Petry2014-06-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loadApps() had been deleted by mistake in 799205488cf82312586f99185e13df6015caa2ff
* | | | | | | Merge pull request #9202 from owncloud/urlhashfixMorris Jobke2014-06-252-23/+27
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Do not clear URL hash when no external mount params given
| * | | | | | Fix parsing URL hash when no "?" was specifiedVincent Petry2014-06-251-0/+4
| | | | | | |
| * | | | | | Do not clear URL hash when no external mount params givenVincent Petry2014-06-251-23/+23
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever external share parameters were passed through the URL hash, the URL hash will now be cleared. In other cases, the hash needs to be left alone because it is used as workaround for the lack of history API in IE8 / IE9 Removed getParamterByName() and use OC.Util.History.parseUrlQuery() that does the same, including replacing the "+" with spaces.
* | | | | | Merge pull request #9123 from owncloud/webdav-move-permissionsicewind19912014-06-252-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix permissions check when moving a file to a different directory over webdav
| * | | | | | Fix unit testsRobin Appelman2014-06-201-0/+4
| | | | | | |
| * | | | | | Fix permissions check when moving a file to a different directory over webdavRobin Appelman2014-06-201-4/+1
| | | | | | |
* | | | | | | Merge pull request #9189 from owncloud/sharing_fix_permissionsicewind19912014-06-254-7/+37
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Sharing fix permissions
| * | | | | | really always take root of the substorageRobin Appelman2014-06-251-1/+1
| | | | | | |
| * | | | | | always take root of the substorageBjoern Schiessle2014-06-241-1/+1
| | | | | | |
| * | | | | | add/update unit testsBjoern Schiessle2014-06-242-3/+33
| | | | | | |
| * | | | | | only the mount point has delete and update permissions to enable rename ↵Bjoern Schiessle2014-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | operation
| * | | | | | make sure that we always return the correct permissionsBjoern Schiessle2014-06-242-5/+5
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-27 04:34:35 +0000