summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Yo-ho-oh - Murder all band 'o piratesThomas Müller2016-05-1114-72/+0
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-1112-6/+100
|
* Merge pull request #24379 from owncloud/remove-unneeded-codeLukas Reschke2016-05-102-35/+2
|\ | | | | Remove unneeded private wrapper methods
| * Remove unneeded private wrapper methodsMorris Jobke2016-05-022-35/+2
| |
* | Merge pull request #24397 from owncloud/sort-share-linksMorris Jobke2016-05-101-9/+9
|\ \ | | | | | | Reordered share link settings
| * | Reordered share link settingsVincent Chan2016-05-021-9/+9
| | | | | | | | | | | | closes #24122
* | | Merge pull request #24401 from owncloud/trash-list-cacheVincent Petry2016-05-101-46/+38
|\ \ \ | | | | | | | | use the cache for trash listing
| * | | use the cache for trash listingRobin Appelman2016-05-031-46/+38
| | | |
* | | | Merge pull request #24534 from owncloud/fix_phpdocThomas Müller2016-05-101-2/+1
|\ \ \ \ | | | | | | | | | | Fix phpdoc
| * | | | Fix phpdocRoeland Jago Douma2016-05-101-2/+1
|/ / / /
* | | | Merge pull request #24434 from owncloud/permalinksLukas Reschke2016-05-1015-52/+367
|\ \ \ \ | | | | | | | | | | Permalinks
| * | | | Do not encode slashes in "dir" URL param in files JSVincent Petry2016-05-063-17/+39
| | | | |
| * | | | Send permalink in internal share notification emailsVincent Petry2016-05-062-24/+5
| | | | |
| * | | | Add anchor icon in sidebar to copy permalinkVincent Petry2016-05-063-3/+53
| | | | |
| * | | | Auto-add fileid in URL for currently displayed folderVincent Petry2016-05-066-15/+111
| | | | |
| * | | | Add route to resolve fileid to files app URLVincent Petry2016-05-064-3/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following routes will redirect to the files app and display the matching folder. If the fileid is a file, it will scroll to it. - http://localhost/owncloud/index.php/f/$fileid - http://localhost/owncloud/index.php/files/?dir=somedir&fileid=$fileid
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-10260-738/+670
| | | | |
* | | | | Merge pull request #24500 from owncloud/updater-server-configurableThomas Müller2016-05-093-65/+38
|\ \ \ \ \ | | | | | | | | | | | | Make update server URL configurable
| * | | | | Make update server URL configurableLukas Reschke2016-05-093-65/+38
| | | | | | | | | | | | | | | | | | | | | | | | Currently testing the updates is a big problem and not really super easy possible. Since we now have a new updater server we should also make this configurable so that people can properly test updates.
* | | | | | Merge pull request #24491 from owncloud/new-animated-full-css-spinnerThomas Müller2016-05-098-12/+88
|\ \ \ \ \ \ | |/ / / / / |/| | | | | New animated loader: full css
| * | | | | New animated loaderskjnldsv2016-05-098-12/+88
| | | | | |
* | | | | | Merge pull request #24419 from owncloud/allow-di-for-migration-stepsThomas Müller2016-05-091-7/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow migration steps to use automatic DI
| * | | | | | Allow migration steps to use automatic DIJoas Schilling2016-05-031-7/+12
| | | | | | |
* | | | | | | Merge pull request #24473 from owncloud/fix-oracle-ciMorris Jobke2016-05-091-2/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Wait a while even after successful conect ...
| * | | | | | | Use docker for mysql as well - optionallyThomas Müller2016-05-061-1/+27
| | | | | | | |
| * | | | | | | Wait a while even after successful conect ...Thomas Müller2016-05-061-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #24492 from owncloud/fix_unit_tests_24457Thomas Müller2016-05-091-14/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix unit tests broken after #24457
| * | | | | | | | Fix unit tests broken after #24457Roeland Jago Douma2016-05-091-14/+14
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Timeout was increased but tests were not updated.
* | | | | | | | Merge pull request #24466 from owncloud/issue_13936_wording_ldapMorris Jobke2016-05-091-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | wording in LDAP wizard
| * | | | | | | | wording in LDAP wizarddavicente2016-05-041-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #24457 from JetUni/patch-1Thomas Müller2016-05-091-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Set higher timeout limit
| * | | | | | | | Set higher timeout limitJarrett2016-05-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Set the timeout limit to be 20 instead of 5 for machines that take longer to load the apps from apps.owncloud.org so that it doesn't show up blank.
* | | | | | | | | Merge pull request #24490 from owncloud/capability_psr4Thomas Müller2016-05-091-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Move \OCP\Capabilities to PSR-4
| * | | | | | | | | Move \OCP\Capabilities to PSR-4Roeland Jago Douma2016-05-091-0/+0
| | | | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0914-16/+98
|/ / / / / / / / /
* | | | | | | | | Merge pull request #24483 from owncloud/backgroundjob_psr4Thomas Müller2016-05-092-0/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Move \OCP\BackgroundJob to PSR-4
| * | | | | | | | Move \OCP\BackgroundJob to PSR-4Roeland Jago Douma2016-05-072-0/+0
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0818-2/+124
|/ / / / / / / /
* | | | | | | | Merge pull request #24475 from owncloud/appframework_psr4Morris Jobke2016-05-0730-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Move \OCP\AppFramework to PSR-4
| * | | | | | | | Move \OCP\AppFramework to PSR-4Roeland Jago Douma2016-05-0630-0/+0
| | |_|/ / / / / | |/| | | | | |
* / | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0726-8/+240
|/ / / / / / /
* | | | | | | Merge pull request #24468 from owncloud/app_psr4Lukas Reschke2016-05-062-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move \OCP\App to PSR-4
| * | | | | | | Move \OCP\App to PSR-4Roeland Jago Douma2016-05-062-0/+0
| | | | | | | |
* | | | | | | | Merge pull request #24400 from owncloud/cache_shareManagerVincent Petry2016-05-061-4/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Cache shareManager
| * | | | | | | Cache shareManagerRoeland Jago Douma2016-05-021-4/+5
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to call \OC::$server->getShareManager for each Node. We have it available so better pass it around.
* | | | | | | Merge pull request #24455 from owncloud/activity_psr4Thomas Müller2016-05-065-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move \OCP\Activity to PSR-4
| * | | | | | | Update .mention-bot for lib/public/ActivityRoeland Jago Douma2016-05-061-1/+1
| | | | | | | |
| * | | | | | | Move \OCP\Activity to PSR-4Roeland Jago Douma2016-05-054-0/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0628-22/+184
| |_|/ / / / |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0564-30/+284
|/ / / / /