]>
source.dussan.org Git - nextcloud-server.git/log
Piotr M [Tue, 14 Mar 2017 23:59:48 +0000 (00:59 +0100)]
Ensure that FileInfo return values as required by its phpdoc.Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Nextcloud bot [Wed, 22 Mar 2017 21:14:04 +0000 (21:14 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Wed, 22 Mar 2017 19:12:54 +0000 (13:12 -0600)]
Merge pull request #3497 from nextcloud/mount-shared-last
Roeland Jago Douma [Wed, 22 Mar 2017 19:10:05 +0000 (20:10 +0100)]
Merge pull request #3990 from nextcloud/remove-owncloud-root-cert-as-per-todo
Morris Jobke [Wed, 22 Mar 2017 18:11:45 +0000 (12:11 -0600)]
Merge pull request #3992 from nextcloud/revert-3795-bundle_vendor_js
Robin Appelman [Wed, 22 Mar 2017 17:00:12 +0000 (18:00 +0100)]
add integration test to ensure that shares dont overwrite external storagesSigned-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Wed, 15 Feb 2017 14:00:21 +0000 (15:00 +0100)]
mount shared mounts lastSigned-off-by: Robin Appelman <robin@icewind.nl>
Roeland Jago Douma [Wed, 22 Mar 2017 16:01:54 +0000 (17:01 +0100)]
Revert "Bundle vendor js"
blizzz [Wed, 22 Mar 2017 14:36:52 +0000 (15:36 +0100)]
Merge pull request #3977 from nextcloud/di_ng2
Joas Schilling [Wed, 22 Mar 2017 14:17:19 +0000 (15:17 +0100)]
Remove the cert as wellSigned-off-by: Joas Schilling <coding@schilljs.com>
Roeland Jago Douma [Wed, 22 Mar 2017 12:34:21 +0000 (13:34 +0100)]
Merge pull request #3795 from nextcloud/bundle_vendor_js
Roeland Jago Douma [Wed, 22 Mar 2017 11:33:24 +0000 (12:33 +0100)]
Merge pull request #3983 from nextcloud/remove-owncloud-root-cert-as-per-todo
Joas Schilling [Wed, 22 Mar 2017 10:50:58 +0000 (11:50 +0100)]
Register the namespace with the autoloading to allow reverse recoverySigned-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 22 Mar 2017 10:50:31 +0000 (11:50 +0100)]
Also cache the namespace from appinfoSigned-off-by: Joas Schilling <coding@schilljs.com>
Roeland Jago Douma [Wed, 22 Mar 2017 10:24:16 +0000 (11:24 +0100)]
Add the AppContainerSigned-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Joas Schilling [Wed, 22 Mar 2017 09:33:30 +0000 (10:33 +0100)]
Don't do a recursive searchSigned-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 22 Mar 2017 09:13:14 +0000 (10:13 +0100)]
buildAppNamespace already has the fallbackSigned-off-by: Joas Schilling <coding@schilljs.com>
Roeland Jago Douma [Wed, 22 Mar 2017 08:24:40 +0000 (09:24 +0100)]
Merge pull request #3982 from nextcloud/hide-systemtag-delete-tooltip
Roeland Jago Douma [Wed, 22 Mar 2017 08:01:47 +0000 (09:01 +0100)]
Handlebars is already loaded by core.jsSigned-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Wed, 22 Mar 2017 07:58:28 +0000 (08:58 +0100)]
When debug don't load the bundled fileSigned-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Joas Schilling [Wed, 22 Mar 2017 07:54:40 +0000 (08:54 +0100)]
Remove ownCloud Root Authority as per todoSigned-off-by: Joas Schilling <coding@schilljs.com>
Roeland Jago Douma [Wed, 22 Mar 2017 07:52:49 +0000 (08:52 +0100)]
No need to exitSigned-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Wed, 22 Mar 2017 07:49:39 +0000 (08:49 +0100)]
Bump core.jsSigned-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Fri, 10 Mar 2017 09:45:27 +0000 (10:45 +0100)]
Add CI step to verify merged vendor jsSigned-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Fri, 10 Mar 2017 08:48:53 +0000 (09:48 +0100)]
Bundle more default vendor jsSigned-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Fri, 10 Mar 2017 08:34:29 +0000 (09:34 +0100)]
Merge vendor jsSigned-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Wed, 22 Mar 2017 07:46:10 +0000 (08:46 +0100)]
Merge pull request #3972 from nextcloud/merge-some-more-css
Christoph Wurst [Wed, 22 Mar 2017 07:43:45 +0000 (08:43 +0100)]
Merge pull request #3980 from nextcloud/fix-app-menu-triangle
Morris Jobke [Wed, 22 Mar 2017 03:49:25 +0000 (21:49 -0600)]
Remove tooltip of delete button for systemtagsSigned-off-by: Morris Jobke <hey@morrisjobke.de>
Nextcloud bot [Wed, 22 Mar 2017 01:07:53 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Tue, 21 Mar 2017 22:55:15 +0000 (16:55 -0600)]
Merge pull request #3974 from nextcloud/fix-reshare-activity-message
Joas Schilling [Tue, 21 Mar 2017 15:57:36 +0000 (16:57 +0100)]
Fix reshare with user activity messageSigned-off-by: Joas Schilling <coding@schilljs.com>
Morris Jobke [Tue, 21 Mar 2017 22:48:13 +0000 (16:48 -0600)]
Fix position of triangle in app menuSigned-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Tue, 21 Mar 2017 21:33:28 +0000 (15:33 -0600)]
fix pathSigned-off-by: Morris Jobke <hey@morrisjobke.de>
Roeland Jago Douma [Tue, 21 Mar 2017 19:53:37 +0000 (20:53 +0100)]
Make DI work for all apps
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>
Morris Jobke [Tue, 21 Mar 2017 19:18:19 +0000 (13:18 -0600)]
Merge pull request #3937 from nextcloud/downstream-27234
Morris Jobke [Tue, 21 Mar 2017 19:17:11 +0000 (13:17 -0600)]
Merge pull request #3975 from nextcloud/remove-dead-code
Lukas Reschke [Tue, 21 Mar 2017 15:59:10 +0000 (16:59 +0100)]
Remove test code
This seems to have been commited by mistake with https://github.com/nextcloud/server/commit/
6dbe417c51125419516dd29ebe4e529926c41a0f
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Joas Schilling [Tue, 21 Mar 2017 15:57:09 +0000 (16:57 +0100)]
Merge pull request #3844 from nextcloud/unshare_event
Lukas Reschke [Tue, 21 Mar 2017 15:35:31 +0000 (16:35 +0100)]
Merge some CSS files using our SCSS compilerSigned-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Tue, 21 Mar 2017 12:54:58 +0000 (13:54 +0100)]
Merge pull request #3968 from nextcloud/fix-branding
Lukas Reschke [Tue, 21 Mar 2017 11:20:22 +0000 (12:20 +0100)]
[master] Fix brandingSigned-off-by: Lukas Reschke <lukas@statuscode.ch>
Roeland Jago Douma [Tue, 21 Mar 2017 10:27:00 +0000 (11:27 +0100)]
Merge pull request #3955 from nextcloud/downstream-27113
Lukas Reschke [Tue, 21 Mar 2017 10:06:16 +0000 (11:06 +0100)]
Merge pull request #3901 from nextcloud/di_ng
Roeland Jago Douma [Tue, 21 Mar 2017 09:42:33 +0000 (10:42 +0100)]
Core is also a special appSigned-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Tue, 21 Mar 2017 09:00:02 +0000 (10:00 +0100)]
Move a lot of stuff over to the ServerContainerSigned-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Mon, 20 Mar 2017 13:53:57 +0000 (14:53 +0100)]
Fix NODB tests etcSigned-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Mon, 20 Mar 2017 09:16:56 +0000 (10:16 +0100)]
Fix settings testsSigned-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Sun, 19 Mar 2017 22:14:47 +0000 (23:14 +0100)]
Add DI intergration testsSigned-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Sun, 19 Mar 2017 21:20:56 +0000 (22:20 +0100)]
Extend DI testsSigned-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Sun, 19 Mar 2017 21:09:47 +0000 (22:09 +0100)]
More elegant handling of recursionSigned-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Fri, 17 Mar 2017 13:30:46 +0000 (14:30 +0100)]
PoC of moving the interface classes to the servercontainerSigned-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Fri, 17 Mar 2017 13:25:35 +0000 (14:25 +0100)]
Update query method for DIContainer
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>
Nextcloud bot [Tue, 21 Mar 2017 01:08:16 +0000 (01:08 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Mon, 20 Mar 2017 20:41:25 +0000 (21:41 +0100)]
Merge pull request #3963 from nextcloud/logs-access-to-previews
Lukas Reschke [Mon, 20 Mar 2017 18:49:53 +0000 (19:49 +0100)]
Merge pull request #3530 from nextcloud/scss-variables
Thomas Müller [Fri, 10 Feb 2017 15:20:25 +0000 (16:20 +0100)]
[CI] Can we get some faster phpunit execution? (#27113)Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Lukas Reschke [Mon, 20 Mar 2017 17:36:36 +0000 (18:36 +0100)]
Log access to preview imagesSigned-off-by: Lukas Reschke <lukas@statuscode.ch>
Christoph Wurst [Mon, 20 Mar 2017 17:10:05 +0000 (18:10 +0100)]
Merge pull request #3957 from nextcloud/downstream-27307
Robin Appelman [Mon, 20 Mar 2017 14:32:34 +0000 (15:32 +0100)]
Merge pull request #3961 from nextcloud/revert-2137-make-sure-tests-run-on-phpunit-4-again
Roeland Jago Douma [Mon, 20 Mar 2017 12:38:52 +0000 (13:38 +0100)]
Revert "Add a magic wrapper to allow phpunit4 to run the code again "Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Julius Härtl [Mon, 20 Mar 2017 13:20:34 +0000 (14:20 +0100)]
Fix testsSigned-off-by: Julius Härtl <jus@bitgrid.net>
Julius Härtl [Mon, 20 Mar 2017 12:59:21 +0000 (13:59 +0100)]
Fix sass compile testsSigned-off-by: Julius Härtl <jus@bitgrid.net>
Julius Härtl [Mon, 20 Mar 2017 11:31:29 +0000 (12:31 +0100)]
Add tests for SCSSCacherSigned-off-by: Julius Härtl <jus@bitgrid.net>
Lukas Reschke [Mon, 20 Mar 2017 12:16:10 +0000 (13:16 +0100)]
Merge pull request #3945 from nextcloud/downstream-27298
Lukas Reschke [Mon, 20 Mar 2017 12:15:43 +0000 (13:15 +0100)]
Merge pull request #3951 from nextcloud/menu-firefox-fixes
Roeland Jago Douma [Mon, 20 Mar 2017 12:13:33 +0000 (13:13 +0100)]
Merge pull request #3915 from michaelletzgus/html5-fix_autocapitalize
Julius Haertl [Sun, 5 Mar 2017 23:08:21 +0000 (00:08 +0100)]
Add variables.scss to sass compile testSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Sun, 5 Mar 2017 22:28:59 +0000 (23:28 +0100)]
Add tests for SCSSCacherSigned-off-by: Julius Härtl <jus@bitgrid.net>
Julius Haertl [Sun, 5 Mar 2017 21:38:59 +0000 (22:38 +0100)]
Replace old color occurences with calculationsSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Sun, 5 Mar 2017 21:09:36 +0000 (22:09 +0100)]
Make remaining colors depending on $color-main-text and $color-main-backgroundSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Sun, 5 Mar 2017 14:37:17 +0000 (15:37 +0100)]
Remove legacy CSSSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Sun, 5 Mar 2017 14:36:50 +0000 (15:36 +0100)]
Merge color tones aaaaaa, bebebe, cccccc in bbbbbbSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Wed, 1 Mar 2017 20:42:32 +0000 (21:42 +0100)]
Remove grey tintsSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Tue, 21 Feb 2017 16:33:07 +0000 (17:33 +0100)]
Remove separate error colorsSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Tue, 21 Feb 2017 16:28:48 +0000 (17:28 +0100)]
Extra variable for loading iconsSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Tue, 21 Feb 2017 16:22:16 +0000 (17:22 +0100)]
Merge #666 and #777 to #555Signed-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Tue, 21 Feb 2017 16:19:23 +0000 (17:19 +0100)]
Use one box-shadow colorSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Tue, 21 Feb 2017 15:56:31 +0000 (16:56 +0100)]
Replace #222 with #333Signed-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Tue, 21 Feb 2017 15:55:31 +0000 (16:55 +0100)]
Remove unused old #999Signed-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Tue, 21 Feb 2017 15:50:45 +0000 (16:50 +0100)]
Merge colorsSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Tue, 21 Feb 2017 15:42:56 +0000 (16:42 +0100)]
Remove rgb color valuesSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Mon, 20 Feb 2017 15:15:53 +0000 (16:15 +0100)]
Simplify colorsSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Sun, 19 Feb 2017 18:50:50 +0000 (19:50 +0100)]
SCSS colors in tooltip.scssSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Sun, 19 Feb 2017 18:50:36 +0000 (19:50 +0100)]
SCSS colors in styles.scssSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Sun, 19 Feb 2017 18:50:21 +0000 (19:50 +0100)]
SCSS colors in share.scssSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Sun, 19 Feb 2017 18:49:39 +0000 (19:49 +0100)]
SCSS colors in multiselect.scssSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Sun, 19 Feb 2017 18:49:19 +0000 (19:49 +0100)]
SCSS colors in inputs.scssSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Sun, 19 Feb 2017 18:49:06 +0000 (19:49 +0100)]
SCSS colors in icons.scssSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Sun, 19 Feb 2017 18:48:51 +0000 (19:48 +0100)]
SCSS colors in apps.scssSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Fri, 17 Feb 2017 16:15:24 +0000 (17:15 +0100)]
SCSS colors in header.scssSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Sun, 19 Feb 2017 18:47:13 +0000 (19:47 +0100)]
Add variables of existing colorsSigned-off-by: Julius Haertl <jus@bitgrid.net>
Julius Haertl [Fri, 17 Feb 2017 10:45:08 +0000 (11:45 +0100)]
Add variables.scss and import it for each scss fileSigned-off-by: Julius Haertl <jus@bitgrid.net>
Joas Schilling [Mon, 20 Mar 2017 11:46:48 +0000 (12:46 +0100)]
Merge pull request #3939 from nextcloud/downstream-27159
Joas Schilling [Mon, 20 Mar 2017 11:44:54 +0000 (12:44 +0100)]
Merge pull request #3929 from nextcloud/downstream-27068
Joas Schilling [Mon, 20 Mar 2017 11:27:38 +0000 (12:27 +0100)]
Merge pull request #3884 from nextcloud/downstream-26956
Joas Schilling [Mon, 20 Mar 2017 10:56:29 +0000 (11:56 +0100)]
Merge pull request #3868 from nextcloud/issue-3834-escape-theming-footer
Lukas Reschke [Mon, 20 Mar 2017 10:45:51 +0000 (11:45 +0100)]
Merge pull request #3924 from nextcloud/preview_fixes
Lukas Reschke [Mon, 20 Mar 2017 10:44:57 +0000 (11:44 +0100)]
Merge pull request #3950 from nextcloud/downstream-27149
Joas Schilling [Mon, 20 Mar 2017 10:32:29 +0000 (11:32 +0100)]
Don't use private apiSigned-off-by: Joas Schilling <coding@schilljs.com>
projects / nextcloud-server.git / log