summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* increase version number to trigger db migrationChristoph Wurst2016-05-111-1/+1
* Add fallback to allow user:token basic authChristoph Wurst2016-05-111-0/+7
* Add token auth for OCS APIsChristoph Wurst2016-05-118-44/+73
* Add index on 'last_activity'Christoph Wurst2016-05-117-8/+42
* Add controller to generate client tokensChristoph Wurst2016-05-114-1/+94
* Check if session token is valid and log user out if the check failsChristoph Wurst2016-05-117-25/+107
* invalidate (delete) session token on logoutChristoph Wurst2016-05-119-8/+139
* token based authChristoph Wurst2016-05-1116-250/+596
* Merge pull request #24493 from owncloud/command_psr4Thomas Müller2016-05-112-0/+0
|\
| * Move \OCP\Command to PSR-4Roeland Jago Douma2016-05-102-0/+0
* | Merge pull request #24433 from owncloud/user_psr4Thomas Müller2016-05-1119-107/+152
|\ \
| * | fix usage of legacy class in LDAPMorris Jobke2016-05-101-5/+5
| * | Add \OC\User\BackendRoeland Jago Douma2016-05-1010-185/+228
| * | Move OC_User_Database to \OC\User\DatabaseRoeland Jago Douma2016-05-106-24/+26
| * | Move \OC\User to PSR-4Roeland Jago Douma2016-05-105-0/+0
| * | Move OC_User_XX to legacy folderRoeland Jago Douma2016-05-103-0/+0
| |/
* | Merge pull request #24550 from owncloud/kill-en@pirateThomas Müller2016-05-1114-72/+0
|\ \
| * | 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 methodsMorris Jobke2016-05-022-35/+2
* | Merge pull request #24397 from owncloud/sort-share-linksMorris Jobke2016-05-101-9/+9
|\ \
| * | Reordered share link settingsVincent Chan2016-05-021-9/+9
* | | Merge pull request #24401 from owncloud/trash-list-cacheVincent Petry2016-05-101-46/+38
|\ \ \
| * | | 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 phpdocRoeland Jago Douma2016-05-101-2/+1
|/ / / /
* | | | Merge pull request #24434 from owncloud/permalinksLukas Reschke2016-05-1015-52/+367
|\ \ \ \
| * | | | 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
* | | | | [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 configurableLukas Reschke2016-05-093-65/+38
* | | | | | Merge pull request #24491 from owncloud/new-animated-full-css-spinnerThomas Müller2016-05-098-12/+88
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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 DIJoas Schilling2016-05-031-7/+12
* | | | | | | Merge pull request #24473 from owncloud/fix-oracle-ciMorris Jobke2016-05-091-2/+28
|\ \ \ \ \ \ \
| * | | | | | | 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 #24457Roeland Jago Douma2016-05-091-14/+14
|/ / / / / / / /
* | | | | | | | Merge pull request #24466 from owncloud/issue_13936_wording_ldapMorris Jobke2016-05-091-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 limitJarrett2016-05-051-4/+4
* | | | | | | | | Merge pull request #24490 from owncloud/capability_psr4Thomas Müller2016-05-091-0/+0
|\ \ \ \ \ \ \ \ \