summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3497 from nextcloud/mount-shared-lastMorris Jobke2017-03-224-4/+52
|\ | | | | mount shared mounts last
| * add integration test to ensure that shares dont overwrite external storagesRobin Appelman2017-03-222-2/+18
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * mount shared mounts lastRobin Appelman2017-03-222-2/+34
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #3990 from nextcloud/remove-owncloud-root-cert-as-per-todoRoeland Jago Douma2017-03-221-66/+0
|\ \ | | | | | | Remove the ownCloud Root Authority file as well
| * | Remove the cert as wellJoas Schilling2017-03-221-66/+0
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #3992 from nextcloud/revert-3795-bundle_vendor_jsMorris Jobke2017-03-227-42634/+16
|\ \ \ | | | | | | | | Revert "Bundle vendor js"
| * | | Revert "Bundle vendor js"Roeland Jago Douma2017-03-227-42634/+16
|/ / /
* | | Merge pull request #3977 from nextcloud/di_ng2blizzz2017-03-227-19/+65
|\ \ \ | | | | | | | | Make DI work for all apps
| * | | Register the namespace with the autoloading to allow reverse recoveryJoas Schilling2017-03-222-7/+26
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Also cache the namespace from appinfoJoas Schilling2017-03-221-3/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Add the AppContainerRoeland Jago Douma2017-03-221-0/+8
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Don't do a recursive searchJoas Schilling2017-03-224-3/+24
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | buildAppNamespace already has the fallbackJoas Schilling2017-03-221-11/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Make DI work for all appsRoeland Jago Douma2017-03-211-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As stated in https://github.com/nextcloud/server/pull/3901#issuecomment-288135309 appid's don't have to match the namespace. Work around this Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #3795 from nextcloud/bundle_vendor_jsRoeland Jago Douma2017-03-227-16/+42634
|\ \ \ \ | |_|_|/ |/| | | Bundle vendor js
| * | | Handlebars is already loaded by core.jsRoeland Jago Douma2017-03-221-2/+0
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | When debug don't load the bundled fileRoeland Jago Douma2017-03-221-2/+19
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | No need to exitRoeland Jago Douma2017-03-221-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Bump core.jsRoeland Jago Douma2017-03-221-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Add CI step to verify merged vendor jsRoeland Jago Douma2017-03-222-0/+34
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Bundle more default vendor jsRoeland Jago Douma2017-03-223-5/+4236
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Merge vendor jsRoeland Jago Douma2017-03-223-14/+38352
| |/ / | | | | | | | | | | | | | | | | | | | | | There is a bunch of javascript we always load from vendors. This combines this into 1 javascript file. Which reduces the number of request by ~10. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #3983 from nextcloud/remove-owncloud-root-cert-as-per-todoRoeland Jago Douma2017-03-221-8/+1
|\ \ \ | | |/ | |/| Remove ownCloud Root Authority as per todo
| * | Remove ownCloud Root Authority as per todoJoas Schilling2017-03-221-8/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #3982 from nextcloud/hide-systemtag-delete-tooltipRoeland Jago Douma2017-03-221-0/+1
|\ \ \ | |/ / |/| | Remove tooltip of delete button for systemtags
| * | Remove tooltip of delete button for systemtagsMorris Jobke2017-03-211-0/+1
| | | | | | | | | | | | | | | | | | * fixes #3967 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | 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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 02:46:25 +0000