summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-2734-31/+87
* 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 #9206 from owncloud/occ-scan-userVincent Petry2014-06-261-13/+18
|\ \ \ \
| * | | | Prevent running the files:scan command as the wrong userRobin Appelman2014-06-251-13/+18
* | | | | 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 #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-264-10/+191
|\ \ \ \
| * | | | 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-253-0/+172
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-263-10/+19
* | | | Merge pull request #9205 from owncloud/remoteshare-fixurlpathVincent Petry2014-06-252-2/+93
|\ \ \ \
| * | | | Fix parsing of remote URL when mounting remote sharesVincent Petry2014-06-252-2/+93
* | | | | Merge pull request #9202 from owncloud/urlhashfixMorris Jobke2014-06-251-23/+23
|\ \ \ \ \
| * | | | | Do not clear URL hash when no external mount params givenVincent Petry2014-06-251-23/+23
| |/ / / /
* | | | | Merge pull request #9189 from owncloud/sharing_fix_permissionsicewind19912014-06-253-6/+36
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | add/update unit testsBjoern Schiessle2014-06-242-3/+33
| * | | | make sure that we always return the correct permissionsBjoern Schiessle2014-06-241-3/+3
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-257-14/+48
| |_|/ / |/| | |
* | | | adjust access constructor to masterArthur Schiwon2014-06-252-2/+10
* | | | Port of LDAP Wizard: get correct total no of users, groups and complete list...Arthur Schiwon2014-06-254-70/+130
| |/ / |/| |
* | | Merge pull request #9168 from owncloud/files-phpwarningondeleteVincent Petry2014-06-241-5/+2
|\ \ \
| * | | Merge if statementsJoas Schilling2014-06-231-6/+2
| * | | Remove warning when deleting all entriesVincent Petry2014-06-231-1/+2
* | | | add unit testsBjoern Schiessle2014-06-242-2/+30
* | | | always use '/' as directory seperatorBjoern Schiessle2014-06-241-1/+1
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-246-3/+34
* | | Merge pull request #9074 from geez0x1/masterMorris Jobke2014-06-231-1/+1
|\ \ \
| * | | Update the modified date in UI on file reversiongeez0x12014-06-171-1/+1
* | | | Merge pull request #9170 from owncloud/files-renamevalidationblurLukas Reschke2014-06-232-4/+53
|\ \ \ \
| * | | | Fix blurring of invalid file name on renameVincent Petry2014-06-232-4/+53
| | |/ / | |/| |
* | | | Merge pull request #9124 from owncloud/move-permissionsVincent Petry2014-06-231-0/+6
|\ \ \ \
| * | | | Dont allow opening writable streams on a read only dav mountRobin Appelman2014-06-231-0/+6
* | | | | Merge pull request #8931 from owncloud/filelist-usepathforactionVincent Petry2014-06-234-4/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use actual file path on rename/deleteVincent Petry2014-06-064-4/+9
* | | | | Merge pull request #9153 from owncloud/files-unselectafterdeleteicewind19912014-06-232-1/+35
|\ \ \ \ \
| * | | | | Clear file selection when list is repopulatedVincent Petry2014-06-232-1/+35
| | |/ / / | |/| | |
* / | | | Setup the external share manager in a hookVincent Petry2014-06-232-9/+12
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-234-4/+12