summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #24717 from owncloud/preview_psr4Vincent Petry2016-05-191-0/+0
|\ | | | | Move \OCP\Preview to PSR-4
| * Move \OCP\Preview to PSR-4Roeland Jago Douma2016-05-181-0/+0
| |
* | Merge pull request #24712 from owncloud/fix-test-namespacesVincent Petry2016-05-1939-74/+107
|\ \ | | | | | | Fix test namespaces [a-e]
| * | Fix file name in tests/lib/encryptionJoas Schilling2016-05-181-0/+0
| | |
| * | Fix filenames and class names in tests/lib/commentsJoas Schilling2016-05-182-5/+3
| | |
| * | Fix file name of command testJoas Schilling2016-05-181-0/+0
| | |
| * | Fix namespace of tests/cache/Joas Schilling2016-05-184-4/+6
| | |
| * | Fix missing namespaces in tests/lib/db/Joas Schilling2016-05-182-4/+8
| | |
| * | Fix namespace for archive testsJoas Schilling2016-05-183-23/+32
| | |
| * | Fix namespaces in AppFramework testsJoas Schilling2016-05-1826-38/+58
| | |
* | | Merge pull request #24710 from owncloud/lock_psr4Vincent Petry2016-05-192-0/+0
|\ \ \ | | | | | | | | Move \OCP\Lock to PSR-4
| * | | Move \OCP\Lock to PSR-4Roeland Jago Douma2016-05-182-0/+0
| | |/ | |/|
* | | Merge pull request #24686 from owncloud/query-user-authtokensVincent Petry2016-05-195-0/+82
|\ \ \ | | | | | | | | add method to query all user auth tokens
| * | | add method to query all user auth tokensChristoph Wurst2016-05-185-0/+82
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-1912-4/+62
|/ / /
* | | Merge pull request #24707 from owncloud/l10n_psr4Vincent Petry2016-05-181-0/+0
|\ \ \ | | | | | | | | Move \OCP\L10N to PSR-4
| * | | Move \OCP\L10N to PSR-4Roeland Jago Douma2016-05-181-0/+0
| | | |
* | | | Merge pull request #24701 from owncloud/federatedfilesharing-psr4Vincent Petry2016-05-1812-3/+1
|\ \ \ \ | | | | | | | | | | Move FederatedFileSharing to PSR-4
| * | | | Move FederatedFileSharing to PSR-4Joas Schilling2016-05-1812-3/+1
| | |_|/ | |/| |
* | | | Merge pull request #24691 from owncloud/fixchunkttlVincent Petry2016-05-181-1/+3
|\ \ \ \ | | | | | | | | | | Allow chunk GC mtime tolerance for unfinished part chunks
| * | | | Allow chunk GC mtime tolerance for unfinished part chunksVincent Petry2016-05-181-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever part chunks are written, every fwrite in the write loop will reset the mtime to the current mtime. Only at the end will the touch() operation set the mtime to now + ttl, in the future. However the GC code is expecting that every chunk with mtime < now are old and must be deleted. This causes the GC to sometimes delete part chunks in which the write loop is slow. To fix this, a tolerance value is added in the GC code to allow for more time before a part chunk gets deleted.
* | | | Merge pull request #24657 from owncloud/fix-libreoffice-templatesVincent Petry2016-05-183-0/+0
|\ \ \ \ | |_|_|/ |/| | | Remove author from libreoffice templates
| * | | Fix #24655Thomas Müller2016-05-173-0/+0
| | | |
* | | | Merge pull request #24706 from owncloud/http_psr4Vincent Petry2016-05-183-0/+0
|\ \ \ \ | |_|_|/ |/| | | Move \OCP\Http to PSR-4
| * | | Move \OCP\Http to PSR-4Roeland Jago Douma2016-05-183-0/+0
| | |/ | |/|
* | | Merge pull request #24677 from owncloud/single-token-providerVincent Petry2016-05-187-69/+96
|\ \ \ | | | | | | | | a single token provider suffices
| * | | a single token provider sufficesChristoph Wurst2016-05-187-69/+96
| |/ /
* | | Merge pull request #24685 from owncloud/files_psr4Vincent Petry2016-05-1844-0/+0
|\ \ \ | |/ / |/| | Move \OCP\Files to PSR-4
| * | Move \OCP\Files to PSR-4Roeland Jago Douma2016-05-1844-0/+0
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-1816-0/+30
| |
* | Fixed dynamic group ldap access (#23450)blizzz2016-05-171-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed dynamic group ldap access getUserGroups: Using $userDN instead of $uid to query LDAP Converting groupDN to group name using API instead of substring Removing cache processing at the end of the method * Fixing group handling added back the cache processing and fixed * fixed possible indention problem spaces -> tab conversion * formatting, white-space changes only
* | Move \OCP\Encryption to PSR-4 (#24680)Roeland Douma2016-05-175-0/+0
| |
* | use mount providers to setup home storages (#24567)Robin Appelman2016-05-177-33/+227
|/
* \OCP\DB to PSR-4 (#24650)Roeland Douma2016-05-176-2/+2
| | | | | | * Move \OCP\DB to PSR-4 * Fix PHP doc
* Merge pull request #24597 from owncloud/run-upgrade-in-incognito-modeVincent Petry2016-05-171-0/+3
|\ | | | | run upgrades in incognito mode
| * run upgrades in incognito modeChristoph Wurst2016-05-121-0/+3
| |
* | Group fixup (#24621)Roeland Douma2016-05-1715-514/+585
| | | | | | | | | | | | | | | | * Move used OC_Group_xx to \OC\Group * Add (deprecated) legacy wrapper in legacy, OC_Group_xx * Replace deprecated use of OC_Group_xx with \OC\Group\xx
* | Move \OCP\Diagnostics to PSR-4 (#24667)Roeland Douma2016-05-174-0/+0
| |
* | Move \OCP\Authentication to PSR-4 (#24632)Roeland Douma2016-05-171-0/+0
| |
* | Move \OCP\Console to PSR-4 (#24636)Roeland Douma2016-05-171-0/+0
| |
* | Move \OCP\Contacts to PSR-4 (#24645)Roeland Douma2016-05-171-0/+0
| |
* | Merge pull request #24634 from owncloud/sharesettings-sortVincent Petry2016-05-171-7/+7
|\ \ | | | | | | fix admin link share settings sorting, use same order as in sidebar
| * | fix admin share settings sorting, use same order as in sidebarJan-Christoph Borchardt2016-05-141-7/+7
| | |
* | | Merge pull request #24630 from owncloud/one-shall-adjust-the-pathVincent Petry2016-05-171-1/+1
|\ \ \ | | | | | | | | Use proper path
| * | | Use proper pathLukas Reschke2016-05-031-1/+1
| | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/24407
* | | | Merge pull request #24370 from owncloud/iclientservice-dicontainerJörn Friedrich Dreyer2016-05-171-0/+4
|\ \ \ \ | | | | | | | | | | add IClientService to DI container
| * | | | add IClientService to DI containerChristoph Wurst2016-05-011-0/+4
| | | | |
* | | | | Merge pull request #24083 from owncloud/fix-race-conditionJörn Friedrich Dreyer2016-05-172-2/+4
|\ \ \ \ \ | | | | | | | | | | | | Read only once
| * | | | | Read only onceLukas Reschke2016-05-022-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | This can lead to race conditions otherwise. Also depracted hasKey
* | | | | | Merge pull request #24006 from owncloud/audio_m4aJörn Friedrich Dreyer2016-05-171-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Adding mimetypes for m4a and m4b