Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9259 from owncloud/fix-rename-icon | Morris Jobke | 2014-06-27 | 1 | -2/+2 |
|\ | |||||
| * | fix rename icon, fix #9257 | Jan-Christoph Borchardt | 2014-06-27 | 1 | -2/+2 |
* | | Merge pull request #8383 from owncloud/object_storage | Vincent Petry | 2014-06-27 | 139 | -8074/+117 |
|\ \ | |/ |/| | |||||
| * | update files_external swift to php-opencloud v1.9.2 | Jörn Friedrich Dreyer | 2014-06-25 | 2 | -116/+113 |
| * | remove rackspace opencloud libs from files_external 3rdparty | Jörn Friedrich Dreyer | 2014-06-25 | 136 | -7958/+0 |
| * | Allow adding object stores with the files_external mount config | Robin Appelman | 2014-06-24 | 1 | -0/+4 |
* | | Merge pull request #9254 from owncloud/fileactions-deferred | Morris Jobke | 2014-06-27 | 11 | -6/+168 |
|\ \ | |||||
| * | | Sync file list with file actions | Vincent Petry | 2014-06-27 | 11 | -6/+168 |
* | | | Merge pull request #9174 from owncloud/breadcrumbfix | Jan-Christoph Borchardt | 2014-06-27 | 5 | -128/+155 |
|\ \ \ | |/ / |/| | | |||||
| * | | Breadcrumb width calculation fix | Vincent Petry | 2014-06-27 | 5 | -128/+155 |
* | | | Merge pull request #9247 from owncloud/move-webdav-class-to-core-master | Thomas Müller | 2014-06-27 | 3 | -456/+0 |
|\ \ \ | |||||
| * | | | remove pointless require - we should kill all require_once like that in our t... | Thomas Müller | 2014-06-27 | 1 | -2/+0 |
| * | | | fix autoloader | Thomas Müller | 2014-06-27 | 1 | -1/+0 |
| * | | | Move \OC\Files\Storage\DAV to core in order to reduce inter-app dependencies | Thomas Müller | 2014-06-27 | 1 | -453/+0 |
* | | | | Merge pull request #9215 from owncloud/officemimetypesupdatefix | Vincent Petry | 2014-06-27 | 1 | -57/+0 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Moved office mimetype update to a repair step | Vincent Petry | 2014-06-25 | 1 | -57/+0 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-27 | 34 | -31/+87 |
* | | | | Merge pull request #9051 from owncloud/Bagera-master | Frank Karlitschek | 2014-06-26 | 3 | -23/+36 |
|\ \ \ \ | |||||
| * | | | | fix padding for last cell in summary of trashbin | Morris Jobke | 2014-06-26 | 1 | -0/+4 |
| * | | | | Aligning in the table header as well | Bagera | 2014-06-16 | 2 | -15/+26 |
| * | | | | Aligning with line height | Bagera | 2014-06-16 | 1 | -10/+5 |
| * | | | | Fix delete action height | Bagera | 2014-06-16 | 1 | -5/+8 |
* | | | | | Merge pull request #9236 from owncloud/sharing-settingswording | icewind1991 | 2014-06-26 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix wording for remote shares in settings page | Vincent Petry | 2014-06-26 | 1 | -1/+1 |
* | | | | | | Merge pull request #9234 from owncloud/fix-ellipsis-for-folders | Raghu Nayyar | 2014-06-26 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix ellipsis for folders on mobile screens | Morris Jobke | 2014-06-26 | 1 | -2/+2 |
* | | | | | | | Merge pull request #9206 from owncloud/occ-scan-user | Vincent Petry | 2014-06-26 | 1 | -13/+18 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Prevent running the files:scan command as the wrong user | Robin Appelman | 2014-06-25 | 1 | -13/+18 |
* | | | | | | | | Merge pull request #9223 from owncloud/occ-scan-arguments | icewind1991 | 2014-06-26 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Add error message when no users specified to files:scan command | Vincent Petry | 2014-06-26 | 1 | -0/+5 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #9171 from owncloud/enc_always_use_oc_view | Björn Schießle | 2014-06-26 | 5 | -109/+98 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | fix unit tests | Bjoern Schiessle | 2014-06-25 | 1 | -2/+2 |
| * | | | | | | always use a \OC\Files\View | Bjoern Schiessle | 2014-06-25 | 4 | -77/+59 |
| * | | | | | | always use oc filesystem for rename operation | Bjoern Schiessle | 2014-06-25 | 2 | -34/+41 |
* | | | | | | | Merge pull request #9193 from owncloud/sharing_etag_propagation | Björn Schießle | 2014-06-26 | 4 | -10/+191 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | make sure that hooks are registered for the tests | Bjoern Schiessle | 2014-06-25 | 3 | -14/+23 |
| * | | | | | | | make sure that during share and unshare the etags get propagated correctly | Bjoern Schiessle | 2014-06-25 | 3 | -0/+172 |
| |/ / / / / / | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-26 | 3 | -10/+19 |
* | | | | | | | Merge pull request #9205 from owncloud/remoteshare-fixurlpath | Vincent Petry | 2014-06-25 | 2 | -2/+93 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix parsing of remote URL when mounting remote shares | Vincent Petry | 2014-06-25 | 2 | -2/+93 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #9202 from owncloud/urlhashfix | Morris Jobke | 2014-06-25 | 1 | -23/+23 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Do not clear URL hash when no external mount params given | Vincent Petry | 2014-06-25 | 1 | -23/+23 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #9189 from owncloud/sharing_fix_permissions | icewind1991 | 2014-06-25 | 3 | -6/+36 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | add/update unit tests | Bjoern Schiessle | 2014-06-24 | 2 | -3/+33 |
| * | | | | | | make sure that we always return the correct permissions | Bjoern Schiessle | 2014-06-24 | 1 | -3/+3 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-25 | 7 | -14/+48 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | adjust access constructor to master | Arthur Schiwon | 2014-06-25 | 2 | -2/+10 |
* | | | | | | Port of LDAP Wizard: get correct total no of users, groups and complete list... | Arthur Schiwon | 2014-06-25 | 4 | -70/+130 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #9168 from owncloud/files-phpwarningondelete | Vincent Petry | 2014-06-24 | 1 | -5/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Merge if statements | Joas Schilling | 2014-06-23 | 1 | -6/+2 |