summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make sure the CSS rules apply to the activityTabView as wellJoas Schilling2016-10-051-5/+9
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Register a ActivityTabView pluginJoas Schilling2016-10-052-0/+58
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Remove resolved FIXMEJoas Schilling2016-10-051-1/+0
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Do not shorten comments in the activity sidebarJoas Schilling2016-10-051-11/+2
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* [tx-robot] updated from transifexNextcloud bot2016-10-0530-20/+34
|
* Merge pull request #1617 from ↵Morris Jobke2016-10-043-18/+30
|\ | | | | | | | | nextcloud/issue-1605-update-notification-readable-version Update notification readable version (10.0.1 instead of 9.1.1.5)
| * Use new URL schemaJoas Schilling2016-10-042-2/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Use the readable version for notificationsJoas Schilling2016-10-043-16/+28
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #1613 from nextcloud/2fa-backup-codes-psr4Joas Schilling2016-10-0412-30/+28
|\ \ | |/ |/| Do not use underscores in PSR4 namespaces of the backup codes app
| * Do not use underscores in PSR4 namespaces of the backup codes appChristoph Wurst2016-10-0312-30/+28
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | [tx-robot] updated from transifexNextcloud bot2016-10-04142-172/+176
|/
* Merge pull request #1595 from nextcloud/fix-avatar-usernameMorris Jobke2016-10-032-19/+67
|\ | | | | Use proper casing of username in avatar filesystem setup
| * Remove database requirement from testLukas Reschke2016-10-032-19/+65
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Use proper casing of username in avatar filesystem setupMorris Jobke2016-10-031-0/+2
| | | | | | | | | | | | | | | | | | * before you could request an avatar for User instead of user which sets up the filesystem for that user twice causing the sharing codes collision detection to detect a lot of collisions Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #1590 from ↵Morris Jobke2016-10-032-2/+6
|\ \ | | | | | | | | | | | | nextcloud/issue-1432-special-chars-on-name-conflict Fix special characters when renaming to a conflict
| * | Fix special characters when renaming to a conflictJoas Schilling2016-09-302-2/+6
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #607 from nextcloud/sharing-popover-menuLukas Reschke2016-10-034-63/+123
|\ \ \ | |_|/ |/| | Move sharing options into popover menu
| * | fix sharing icon's alignment and add padding to the unshare iconChristoph Wurst2016-10-032-1/+11
| | |
| * | Move options to the rightRoeland Jago Douma2016-10-032-3/+11
| | |
| * | can share => can reshareRoeland Jago Douma2016-10-031-1/+1
| | |
| * | Make can edit checkbox work for file sharesRoeland Jago Douma2016-10-032-12/+22
| | |
| * | move unshare button out of popover menu; keep menu opened on re-renderChristoph Wurst2016-10-032-9/+15
| | |
| * | move sharing options into popover menuChristoph Wurst2016-10-031-45/+71
| | |
* | | Merge pull request #1546 from nextcloud/integration-tests-qa-222Lukas Reschke2016-10-033-0/+44
|\ \ \ | | | | | | | | Integration tests qa 222
| * | | Fix sizeRoeland Jago Douma2016-10-021-2/+2
| | | | | | | | | | | | | | | | Nextcloud has a letter (byte) more than ownCloud. So update test
| * | | Added quota calculation test when a file is recievedSergio Bertolin2016-10-023-2/+15
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Added test checking quota after usageSergio Bertolin2016-10-023-0/+31
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #1547 from nextcloud/files-translate-filesummaryChristoph Wurst2016-10-031-2/+4
|\ \ \ \ | |_|/ / |/| | | Translate file summary connector (#26221)
| * | | Translate file summary connector (#26221)Vincent Petry2016-09-271-2/+4
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | [tx-robot] updated from transifexNextcloud bot2016-10-0322-12/+196
| |/ / |/| |
* | | [tx-robot] updated from transifexNextcloud bot2016-10-0222-82/+96
| | |
* | | Merge pull request #1578 from nextcloud/use-more-magic-diLukas Reschke2016-10-0110-367/+44
|\ \ \ | | | | | | | | Use magic DI for core controllers
| * | | Remove unused endpointJoas Schilling2016-09-307-245/+14
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Use magic DI for core controllersJoas Schilling2016-09-305-127/+35
| | |/ | |/| | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / | [tx-robot] updated from transifexNextcloud bot2016-10-0130-72/+304
|/ /
* | [tx-robot] updated from transifexNextcloud bot2016-09-3030-10/+118
| |
* | Merge pull request #1582 from nextcloud/make-comments-100-testedLukas Reschke2016-09-301-0/+4
|\ \ | | | | | | Add test for setTopmostParentId and getTopmostParentId
| * | Add test for setTopmostParentId and getTopmostParentIdLukas Reschke2016-09-291-0/+4
| | | | | | | | | | | | | | | | | | This wasn't tested before as proven by the coverage data. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #1558 from nextcloud/remove-notifications-upon-user-deletionMorris Jobke2016-09-302-15/+83
|\ \ \ | |/ / |/| | Remove notifications upon user deletion
| * | Only trigger postDelete hooks when the user was deleted...Joas Schilling2016-09-292-7/+8
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Make sure that comments, notifications and preferences are deletedJoas Schilling2016-09-291-11/+74
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Remove notifications upon user deletionJoas Schilling2016-09-291-0/+4
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #1580 from nextcloud/downstream-26243Lukas Reschke2016-09-291-0/+1
|\ \ \ | | | | | | | | Unset user PHOTO before setting new one in OCA\DAV\CardDAV\Converter:…
| * | | Unset user PHOTO before setting new one in ↵Olivier Mehani2016-09-291-0/+1
| |/ / | | | | | | | | | | | | | | | | | | OCA\DAV\CardDAV\Converter::updateCard (#26243) Signed-off-by: Olivier Mehani <shtrom@ssji.net> #26242
* | | Merge pull request #1577 from nextcloud/add_alias_descriptionMorris Jobke2016-09-291-5/+7
|\ \ \ | | | | | | | | add alias description
| * | | add alias descriptionAndreas Hechenberger2016-09-291-5/+7
| |/ / | | | | | | | | | Signed-off-by: Andreas Hechenberger <world@greenstation.de>
* | | Merge pull request #1476 from nextcloud/autocomplete-for-occ-app-commandsMorris Jobke2016-09-2929-35/+557
|\ \ \ | |/ / |/| | Autocomplete for occ app commands
| * | Do not break the output when running _completionJoas Schilling2016-09-291-5/+9
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Update autoloader mapJoas Schilling2016-09-292-0/+6
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Autocomplete for l10n:* and twofactorauth:*Joas Schilling2016-09-294-11/+99
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>