aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3972 from nextcloud/merge-some-more-cssRoeland Jago Douma2017-03-2215-13/+13
|\ | | | | Merge some CSS files using our SCSS compiler
| * fix pathMorris Jobke2017-03-212-1/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Merge some CSS files using our SCSS compilerLukas Reschke2017-03-2115-13/+13
| | | | | | | | | | | | This saves around 4 requests on the average page load. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #3980 from nextcloud/fix-app-menu-triangleChristoph Wurst2017-03-221-1/+1
|\ \ | | | | | | Fix position of triangle in app menu
| * | Fix position of triangle in app menuMorris Jobke2017-03-211-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-03-2262-52/+272
| | |
* | | Merge pull request #3974 from nextcloud/fix-reshare-activity-messageMorris Jobke2017-03-211-1/+1
|\ \ \ | |/ / |/| | Fix reshare with user activity message
| * | Fix reshare with user activity messageJoas Schilling2017-03-211-1/+1
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #3937 from nextcloud/downstream-27234Morris Jobke2017-03-211-1/+1
|\ \ | | | | | | fix typo in sftp public key
| * | fix typo in sftp public keyMartin2017-03-191-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3975 from nextcloud/remove-dead-codeMorris Jobke2017-03-211-1/+0
|\ \ \ | | | | | | | | Remove test code
| * | | Remove test codeLukas Reschke2017-03-211-1/+0
|/ / / | | | | | | | | | | | | | | | This seems to have been commited by mistake with https://github.com/nextcloud/server/commit/6dbe417c51125419516dd29ebe4e529926c41a0f Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #3844 from nextcloud/unshare_eventJoas Schilling2017-03-216-209/+298
|\ \ \ | | | | | | | | Unshare event
| * | | Update autoloaderRoeland Jago Douma2017-03-172-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Add LegacyHooksRoeland Jago Douma2017-03-174-210/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a helper class to listen to the eventDispatcher calls from the share manager to emit the old \OC_Hooks Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Add unshare eventRoeland Jago Douma2017-03-171-0/+5
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #3968 from nextcloud/fix-brandingLukas Reschke2017-03-211-1/+1
|\ \ \ \ | |_|_|/ |/| | | [master] Fix branding and show Nextcloud
| * | | [master] Fix brandingLukas Reschke2017-03-211-1/+1
|/ / / | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #3955 from nextcloud/downstream-27113Roeland Jago Douma2017-03-215-5/+17
|\ \ \ | | | | | | | | Can we get some faster phpunit execution?
| * | | [CI] Can we get some faster phpunit execution? (#27113)Thomas Müller2017-03-205-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't backup globals and static attributes * Unset global variable to remove impact on followup tests Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #3901 from nextcloud/di_ngLukas Reschke2017-03-215-288/+376
|\ \ \ \ | | | | | | | | | | Move Interface Definitions to the ServerContainer
| * | | | Core is also a special appRoeland Jago Douma2017-03-211-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Move a lot of stuff over to the ServerContainerRoeland Jago Douma2017-03-212-246/+156
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Fix NODB tests etcRoeland Jago Douma2017-03-211-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Fix settings testsRoeland Jago Douma2017-03-212-15/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Add DI intergration testsRoeland Jago Douma2017-03-213-9/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moved some interface definitions to Server.php (more to come) * Build/Query only for existing classes in the AppContainer * Build/Query only for classes of the App in the AppContainer * Offload other stuff to the servercontainer Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Extend DI testsRoeland Jago Douma2017-03-212-9/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | More elegant handling of recursionRoeland Jago Douma2017-03-212-4/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | PoC of moving the interface classes to the servercontainerRoeland Jago Douma2017-03-212-10/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Update query method for DIContainerRoeland Jago Douma2017-03-212-5/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | To align with https://github.com/nextcloud/server/issues/2043#issuecomment-287348294 This would mean that AppContainers only hold the AppSpecific services Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-2144-14/+130
| | | |
* | | | Merge pull request #3963 from nextcloud/logs-access-to-previewsRoeland Jago Douma2017-03-203-13/+56
|\ \ \ \ | | | | | | | | | | Log access to preview images
| * | | | Log access to preview imagesLukas Reschke2017-03-203-13/+56
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #3530 from nextcloud/scss-variablesLukas Reschke2017-03-2015-263/+528
|\ \ \ \ \ | |/ / / / |/| | | | Implement scss variables
| * | | | Fix testsJulius Härtl2017-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix sass compile testsJulius Härtl2017-03-201-1/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add tests for SCSSCacherJulius Härtl2017-03-204-54/+205
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add variables.scss to sass compile testJulius Haertl2017-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | Add tests for SCSSCacherJulius Haertl2017-03-203-7/+116
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Replace old color occurences with calculationsJulius Haertl2017-03-205-84/+75
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | Make remaining colors depending on $color-main-text and $color-main-backgroundJulius Haertl2017-03-203-21/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | Remove legacy CSSJulius Haertl2017-03-202-45/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | Merge color tones aaaaaa, bebebe, cccccc in bbbbbbJulius Haertl2017-03-204-14/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | Remove grey tintsJulius Haertl2017-03-202-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | Remove separate error colorsJulius Haertl2017-03-202-4/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | Extra variable for loading iconsJulius Haertl2017-03-202-8/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | Merge #666 and #777 to #555Julius Haertl2017-03-203-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | Use one box-shadow colorJulius Haertl2017-03-203-5/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | Replace #222 with #333Julius Haertl2017-03-202-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | Remove unused old #999Julius Haertl2017-03-201-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-21 22:25:19 +0000