Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-19 | 12 | -4/+62 |
| | |||||
* | Merge pull request #24707 from owncloud/l10n_psr4 | Vincent Petry | 2016-05-18 | 1 | -0/+0 |
|\ | | | | | Move \OCP\L10N to PSR-4 | ||||
| * | Move \OCP\L10N to PSR-4 | Roeland Jago Douma | 2016-05-18 | 1 | -0/+0 |
| | | |||||
* | | Merge pull request #24701 from owncloud/federatedfilesharing-psr4 | Vincent Petry | 2016-05-18 | 12 | -3/+1 |
|\ \ | | | | | | | Move FederatedFileSharing to PSR-4 | ||||
| * | | Move FederatedFileSharing to PSR-4 | Joas Schilling | 2016-05-18 | 12 | -3/+1 |
| | | | |||||
* | | | Merge pull request #24691 from owncloud/fixchunkttl | Vincent Petry | 2016-05-18 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Allow chunk GC mtime tolerance for unfinished part chunks | ||||
| * | | | Allow chunk GC mtime tolerance for unfinished part chunks | Vincent Petry | 2016-05-18 | 1 | -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-templates | Vincent Petry | 2016-05-18 | 3 | -0/+0 |
|\ \ \ | | | | | | | | | Remove author from libreoffice templates | ||||
| * | | | Fix #24655 | Thomas Müller | 2016-05-17 | 3 | -0/+0 |
| | | | | |||||
* | | | | Merge pull request #24706 from owncloud/http_psr4 | Vincent Petry | 2016-05-18 | 3 | -0/+0 |
|\ \ \ \ | |_|_|/ |/| | | | Move \OCP\Http to PSR-4 | ||||
| * | | | Move \OCP\Http to PSR-4 | Roeland Jago Douma | 2016-05-18 | 3 | -0/+0 |
| | |/ | |/| | |||||
* | | | Merge pull request #24677 from owncloud/single-token-provider | Vincent Petry | 2016-05-18 | 7 | -69/+96 |
|\ \ \ | | | | | | | | | a single token provider suffices | ||||
| * | | | a single token provider suffices | Christoph Wurst | 2016-05-18 | 7 | -69/+96 |
| |/ / | |||||
* | | | Merge pull request #24685 from owncloud/files_psr4 | Vincent Petry | 2016-05-18 | 44 | -0/+0 |
|\ \ \ | |/ / |/| | | Move \OCP\Files to PSR-4 | ||||
| * | | Move \OCP\Files to PSR-4 | Roeland Jago Douma | 2016-05-18 | 44 | -0/+0 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-18 | 16 | -0/+30 |
| | | |||||
* | | Fixed dynamic group ldap access (#23450) | blizzz | 2016-05-17 | 1 | -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 Douma | 2016-05-17 | 5 | -0/+0 |
| | | |||||
* | | use mount providers to setup home storages (#24567) | Robin Appelman | 2016-05-17 | 7 | -33/+227 |
|/ | |||||
* | \OCP\DB to PSR-4 (#24650) | Roeland Douma | 2016-05-17 | 6 | -2/+2 |
| | | | | | | * Move \OCP\DB to PSR-4 * Fix PHP doc | ||||
* | Merge pull request #24597 from owncloud/run-upgrade-in-incognito-mode | Vincent Petry | 2016-05-17 | 1 | -0/+3 |
|\ | | | | | run upgrades in incognito mode | ||||
| * | run upgrades in incognito mode | Christoph Wurst | 2016-05-12 | 1 | -0/+3 |
| | | |||||
* | | Group fixup (#24621) | Roeland Douma | 2016-05-17 | 15 | -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 Douma | 2016-05-17 | 4 | -0/+0 |
| | | |||||
* | | Move \OCP\Authentication to PSR-4 (#24632) | Roeland Douma | 2016-05-17 | 1 | -0/+0 |
| | | |||||
* | | Move \OCP\Console to PSR-4 (#24636) | Roeland Douma | 2016-05-17 | 1 | -0/+0 |
| | | |||||
* | | Move \OCP\Contacts to PSR-4 (#24645) | Roeland Douma | 2016-05-17 | 1 | -0/+0 |
| | | |||||
* | | Merge pull request #24634 from owncloud/sharesettings-sort | Vincent Petry | 2016-05-17 | 1 | -7/+7 |
|\ \ | | | | | | | fix admin link share settings sorting, use same order as in sidebar | ||||
| * | | fix admin share settings sorting, use same order as in sidebar | Jan-Christoph Borchardt | 2016-05-14 | 1 | -7/+7 |
| | | | |||||
* | | | Merge pull request #24630 from owncloud/one-shall-adjust-the-path | Vincent Petry | 2016-05-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Use proper path | ||||
| * | | | Use proper path | Lukas Reschke | 2016-05-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/24407 | ||||
* | | | | Merge pull request #24370 from owncloud/iclientservice-dicontainer | Jörn Friedrich Dreyer | 2016-05-17 | 1 | -0/+4 |
|\ \ \ \ | | | | | | | | | | | add IClientService to DI container | ||||
| * | | | | add IClientService to DI container | Christoph Wurst | 2016-05-01 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge pull request #24083 from owncloud/fix-race-condition | Jörn Friedrich Dreyer | 2016-05-17 | 2 | -2/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Read only once | ||||
| * | | | | | Read only once | Lukas Reschke | 2016-05-02 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | This can lead to race conditions otherwise. Also depracted hasKey | ||||
* | | | | | | Merge pull request #24006 from owncloud/audio_m4a | Jörn Friedrich Dreyer | 2016-05-17 | 1 | -0/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Adding mimetypes for m4a and m4b | ||||
| * | | | | | | Adding mimetypes for m4a and m4b | Martin | 2016-04-14 | 1 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-17 | 24 | -6/+194 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-16 | 34 | -2/+128 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-15 | 158 | -42/+384 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-14 | 256 | -262/+24 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #24617 from owncloud/autoloader_no_private | Vincent Petry | 2016-05-13 | 2 | -36/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | our autoloader should not load classes in \OC | ||||
| * | | | | | | | Fix unit tests | Roeland Jago Douma | 2016-05-13 | 1 | -18/+4 |
| | | | | | | | | |||||
| * | | | | | | | All \OC\ classes are handled by the composer autoloader | Roeland Jago Douma | 2016-05-13 | 1 | -17/+0 |
| | | | | | | | | |||||
| * | | | | | | | OC_xx all live in the legacy folder | Roeland Jago Douma | 2016-05-13 | 1 | -1/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #22341 from ↵ | Vincent Petry | 2016-05-13 | 2 | -0/+19 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/pellaeon-pr-breadcrumb-filelist-overlap-drop Handle case when breadcrumb and filelist item overlap and both receive a drop | ||||
| * | | | | | | | | Handle case when breadcrumb and filelist item overlap | Pellaeon Lin | 2016-03-17 | 2 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and both receive a drop. Build breadcrumb over and out callback in filelist.js and pass them as options to utilize local selectors of filelist Re-enable td elements after drop to bread crumb Fix# drop handler still being called after enable, it seems that waiting for a short time before re-enabling solves the problem * Add explanations for setTimeout re-enable td.filename drop handler | ||||
* | | | | | | | | | Merge pull request #22214 from owncloud/ext-better-dropbox-gdrive | Vincent Petry | 2016-05-13 | 15 | -29/+111 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Direct links to Google Drive/Dropbox configuration pages from external storage config | ||||
| * | | | | | | | | | Move Dropbox/GDrive link to icon | Robin McCorkell | 2016-05-03 | 3 | -8/+17 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Change colour of input fields instead of printing 'Access granted' | Robin McCorkell | 2016-05-03 | 3 | -11/+16 |
| | | | | | | | | | |