]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoadded quit option in commentstabview.js 4007/head
noveens [Tue, 14 Feb 2017 20:26:00 +0000 (01:56 +0530)]
added quit option in commentstabview.js

added quit option in notif in app.js

added quit option in notif in file-upload.js

added quit option in notif in fileinfomodel.js

added quit option in notif in filelist.js

added quit option in notif in filelist.js

added quit option in notif in tagsplugin.js

added quit option in notif in statusmanager.js

added quit option in notif in external.js

added quit option in notif in versionstabview.js

added quit option in notif in notification.js

changes according to the latest review.

timeout removed since there is a button to close it

translation capability added

typo fixed

test files updated

small errors fixed

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 23 Mar 2017 01:07:52 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 22 Mar 2017 21:14:04 +0000 (21:14 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3497 from nextcloud/mount-shared-last
Morris Jobke [Wed, 22 Mar 2017 19:12:54 +0000 (13:12 -0600)]
Merge pull request #3497 from nextcloud/mount-shared-last

mount shared mounts last

7 years agoMerge pull request #3990 from nextcloud/remove-owncloud-root-cert-as-per-todo
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

Remove the ownCloud Root Authority file as well

7 years agoMerge pull request #3992 from nextcloud/revert-3795-bundle_vendor_js
Morris Jobke [Wed, 22 Mar 2017 18:11:45 +0000 (12:11 -0600)]
Merge pull request #3992 from nextcloud/revert-3795-bundle_vendor_js

Revert "Bundle vendor js"

7 years agoadd integration test to ensure that shares dont overwrite external storages 3497/head
Robin Appelman [Wed, 22 Mar 2017 17:00:12 +0000 (18:00 +0100)]
add integration test to ensure that shares dont overwrite external storages

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agomount shared mounts last
Robin Appelman [Wed, 15 Feb 2017 14:00:21 +0000 (15:00 +0100)]
mount shared mounts last

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoRevert "Bundle vendor js" 3992/head
Roeland Jago Douma [Wed, 22 Mar 2017 16:01:54 +0000 (17:01 +0100)]
Revert "Bundle vendor js"

7 years agoMerge pull request #3977 from nextcloud/di_ng2
blizzz [Wed, 22 Mar 2017 14:36:52 +0000 (15:36 +0100)]
Merge pull request #3977 from nextcloud/di_ng2

Make DI work for all apps

7 years agoRemove the cert as well 3990/head
Joas Schilling [Wed, 22 Mar 2017 14:17:19 +0000 (15:17 +0100)]
Remove the cert as well

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3795 from nextcloud/bundle_vendor_js
Roeland Jago Douma [Wed, 22 Mar 2017 12:34:21 +0000 (13:34 +0100)]
Merge pull request #3795 from nextcloud/bundle_vendor_js

Bundle vendor js

7 years agoMerge pull request #3983 from nextcloud/remove-owncloud-root-cert-as-per-todo
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

Remove ownCloud Root Authority as per todo

7 years agoRegister the namespace with the autoloading to allow reverse recovery 3977/head
Joas Schilling [Wed, 22 Mar 2017 10:50:58 +0000 (11:50 +0100)]
Register the namespace with the autoloading to allow reverse recovery

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAlso cache the namespace from appinfo
Joas Schilling [Wed, 22 Mar 2017 10:50:31 +0000 (11:50 +0100)]
Also cache the namespace from appinfo

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd the AppContainer
Roeland Jago Douma [Wed, 22 Mar 2017 10:24:16 +0000 (11:24 +0100)]
Add the AppContainer

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoDon't do a recursive search
Joas Schilling [Wed, 22 Mar 2017 09:33:30 +0000 (10:33 +0100)]
Don't do a recursive search

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agobuildAppNamespace already has the fallback
Joas Schilling [Wed, 22 Mar 2017 09:13:14 +0000 (10:13 +0100)]
buildAppNamespace already has the fallback

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3982 from nextcloud/hide-systemtag-delete-tooltip
Roeland Jago Douma [Wed, 22 Mar 2017 08:24:40 +0000 (09:24 +0100)]
Merge pull request #3982 from nextcloud/hide-systemtag-delete-tooltip

Remove tooltip of delete button for systemtags

7 years agoHandlebars is already loaded by core.js 3795/head
Roeland Jago Douma [Wed, 22 Mar 2017 08:01:47 +0000 (09:01 +0100)]
Handlebars is already loaded by core.js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoWhen debug don't load the bundled file
Roeland Jago Douma [Wed, 22 Mar 2017 07:58:28 +0000 (08:58 +0100)]
When debug don't load the bundled file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoRemove ownCloud Root Authority as per todo 3983/head
Joas Schilling [Wed, 22 Mar 2017 07:54:40 +0000 (08:54 +0100)]
Remove ownCloud Root Authority as per todo

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoNo need to exit
Roeland Jago Douma [Wed, 22 Mar 2017 07:52:49 +0000 (08:52 +0100)]
No need to exit

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoBump core.js
Roeland Jago Douma [Wed, 22 Mar 2017 07:49:39 +0000 (08:49 +0100)]
Bump core.js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoAdd CI step to verify merged vendor js
Roeland Jago Douma [Fri, 10 Mar 2017 09:45:27 +0000 (10:45 +0100)]
Add CI step to verify merged vendor js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoBundle more default vendor js
Roeland Jago Douma [Fri, 10 Mar 2017 08:48:53 +0000 (09:48 +0100)]
Bundle more default vendor js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge vendor js
Roeland Jago Douma [Fri, 10 Mar 2017 08:34:29 +0000 (09:34 +0100)]
Merge vendor js

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>
7 years agoMerge pull request #3972 from nextcloud/merge-some-more-css
Roeland Jago Douma [Wed, 22 Mar 2017 07:46:10 +0000 (08:46 +0100)]
Merge pull request #3972 from nextcloud/merge-some-more-css

Merge some CSS files using our SCSS compiler

7 years agoMerge pull request #3980 from nextcloud/fix-app-menu-triangle
Christoph Wurst [Wed, 22 Mar 2017 07:43:45 +0000 (08:43 +0100)]
Merge pull request #3980 from nextcloud/fix-app-menu-triangle

Fix position of triangle in app menu

7 years agoRemove tooltip of delete button for systemtags 3982/head
Morris Jobke [Wed, 22 Mar 2017 03:49:25 +0000 (21:49 -0600)]
Remove tooltip of delete button for systemtags

* fixes #3967

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 22 Mar 2017 01:07:53 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3974 from nextcloud/fix-reshare-activity-message
Morris Jobke [Tue, 21 Mar 2017 22:55:15 +0000 (16:55 -0600)]
Merge pull request #3974 from nextcloud/fix-reshare-activity-message

Fix reshare with user activity message

7 years agoFix reshare with user activity message 3974/head
Joas Schilling [Tue, 21 Mar 2017 15:57:36 +0000 (16:57 +0100)]
Fix reshare with user activity message

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix position of triangle in app menu 3980/head
Morris Jobke [Tue, 21 Mar 2017 22:48:13 +0000 (16:48 -0600)]
Fix position of triangle in app menu

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agofix path 3972/head
Morris Jobke [Tue, 21 Mar 2017 21:33:28 +0000 (15:33 -0600)]
fix path

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMake DI work for all apps
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>
7 years agoMerge pull request #3937 from nextcloud/downstream-27234
Morris Jobke [Tue, 21 Mar 2017 19:18:19 +0000 (13:18 -0600)]
Merge pull request #3937 from nextcloud/downstream-27234

fix typo in sftp public key

7 years agoMerge pull request #3975 from nextcloud/remove-dead-code
Morris Jobke [Tue, 21 Mar 2017 19:17:11 +0000 (13:17 -0600)]
Merge pull request #3975 from nextcloud/remove-dead-code

Remove test code

7 years agoRemove test code 3975/head
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>
7 years agoMerge pull request #3844 from nextcloud/unshare_event
Joas Schilling [Tue, 21 Mar 2017 15:57:09 +0000 (16:57 +0100)]
Merge pull request #3844 from nextcloud/unshare_event

Unshare event

7 years agoMerge some CSS files using our SCSS compiler
Lukas Reschke [Tue, 21 Mar 2017 15:35:31 +0000 (16:35 +0100)]
Merge some CSS files using our SCSS compiler

This saves around 4 requests on the average page load.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3968 from nextcloud/fix-branding
Lukas Reschke [Tue, 21 Mar 2017 12:54:58 +0000 (13:54 +0100)]
Merge pull request #3968 from nextcloud/fix-branding

[master] Fix branding and show Nextcloud

7 years ago[master] Fix branding 3968/head
Lukas Reschke [Tue, 21 Mar 2017 11:20:22 +0000 (12:20 +0100)]
[master] Fix branding

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3955 from nextcloud/downstream-27113
Roeland Jago Douma [Tue, 21 Mar 2017 10:27:00 +0000 (11:27 +0100)]
Merge pull request #3955 from nextcloud/downstream-27113

Can we get some faster phpunit execution?

7 years agoMerge pull request #3901 from nextcloud/di_ng
Lukas Reschke [Tue, 21 Mar 2017 10:06:16 +0000 (11:06 +0100)]
Merge pull request #3901 from nextcloud/di_ng

Move Interface Definitions to the ServerContainer

7 years agoCore is also a special app 3901/head
Roeland Jago Douma [Tue, 21 Mar 2017 09:42:33 +0000 (10:42 +0100)]
Core is also a special app

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMove a lot of stuff over to the ServerContainer
Roeland Jago Douma [Tue, 21 Mar 2017 09:00:02 +0000 (10:00 +0100)]
Move a lot of stuff over to the ServerContainer

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix NODB tests etc
Roeland Jago Douma [Mon, 20 Mar 2017 13:53:57 +0000 (14:53 +0100)]
Fix NODB tests etc

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix settings tests
Roeland Jago Douma [Mon, 20 Mar 2017 09:16:56 +0000 (10:16 +0100)]
Fix settings tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoAdd DI intergration tests
Roeland Jago Douma [Sun, 19 Mar 2017 22:14:47 +0000 (23:14 +0100)]
Add DI intergration tests

* 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>
7 years agoExtend DI tests
Roeland Jago Douma [Sun, 19 Mar 2017 21:20:56 +0000 (22:20 +0100)]
Extend DI tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMore elegant handling of recursion
Roeland Jago Douma [Sun, 19 Mar 2017 21:09:47 +0000 (22:09 +0100)]
More elegant handling of recursion

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoPoC of moving the interface classes to the servercontainer
Roeland Jago Douma [Fri, 17 Mar 2017 13:30:46 +0000 (14:30 +0100)]
PoC of moving the interface classes to the servercontainer

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoUpdate query method for DIContainer
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>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 21 Mar 2017 01:08:16 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3963 from nextcloud/logs-access-to-previews
Roeland Jago Douma [Mon, 20 Mar 2017 20:41:25 +0000 (21:41 +0100)]
Merge pull request #3963 from nextcloud/logs-access-to-previews

Log access to preview images

7 years agoMerge pull request #3530 from nextcloud/scss-variables
Lukas Reschke [Mon, 20 Mar 2017 18:49:53 +0000 (19:49 +0100)]
Merge pull request #3530 from nextcloud/scss-variables

Implement scss variables

7 years ago[CI] Can we get some faster phpunit execution? (#27113) 3955/head
Thomas Müller [Fri, 10 Feb 2017 15:20:25 +0000 (16:20 +0100)]
[CI] Can we get some faster phpunit execution? (#27113)

* Don't backup globals and static attributes

* Unset global variable to remove impact on followup tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoLog access to preview images 3963/head
Lukas Reschke [Mon, 20 Mar 2017 17:36:36 +0000 (18:36 +0100)]
Log access to preview images

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3957 from nextcloud/downstream-27307
Christoph Wurst [Mon, 20 Mar 2017 17:10:05 +0000 (18:10 +0100)]
Merge pull request #3957 from nextcloud/downstream-27307

Follow up to #3949 (app exists on enable)

7 years agoMerge pull request #3961 from nextcloud/revert-2137-make-sure-tests-run-on-phpunit...
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

Revert "Add a magic wrapper to allow phpunit4 to run the code again "

7 years agoRevert "Add a magic wrapper to allow phpunit4 to run the code again " 3961/head
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>
7 years agoFix tests 3530/head
Julius Härtl [Mon, 20 Mar 2017 13:20:34 +0000 (14:20 +0100)]
Fix tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoFix sass compile tests
Julius Härtl [Mon, 20 Mar 2017 12:59:21 +0000 (13:59 +0100)]
Fix sass compile tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoAdd tests for SCSSCacher
Julius Härtl [Mon, 20 Mar 2017 11:31:29 +0000 (12:31 +0100)]
Add tests for SCSSCacher

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoMerge pull request #3945 from nextcloud/downstream-27298
Lukas Reschke [Mon, 20 Mar 2017 12:16:10 +0000 (13:16 +0100)]
Merge pull request #3945 from nextcloud/downstream-27298

Adding file, line, class and function to the query logger (#27298)

7 years agoMerge pull request #3951 from nextcloud/menu-firefox-fixes
Lukas Reschke [Mon, 20 Mar 2017 12:15:43 +0000 (13:15 +0100)]
Merge pull request #3951 from nextcloud/menu-firefox-fixes

Fix new app menu on firefox

7 years agoMerge pull request #3915 from michaelletzgus/html5-fix_autocapitalize
Roeland Jago Douma [Mon, 20 Mar 2017 12:13:33 +0000 (13:13 +0100)]
Merge pull request #3915 from michaelletzgus/html5-fix_autocapitalize

Fix value of attribute "autocapitalize"

7 years agoAdd variables.scss to sass compile test
Julius Haertl [Sun, 5 Mar 2017 23:08:21 +0000 (00:08 +0100)]
Add variables.scss to sass compile test

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoAdd tests for SCSSCacher
Julius Haertl [Sun, 5 Mar 2017 22:28:59 +0000 (23:28 +0100)]
Add tests for SCSSCacher

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoReplace old color occurences with calculations
Julius Haertl [Sun, 5 Mar 2017 21:38:59 +0000 (22:38 +0100)]
Replace old color occurences with calculations

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMake remaining colors depending on $color-main-text and $color-main-background
Julius Haertl [Sun, 5 Mar 2017 21:09:36 +0000 (22:09 +0100)]
Make remaining colors depending on $color-main-text and $color-main-background

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoRemove legacy CSS
Julius Haertl [Sun, 5 Mar 2017 14:37:17 +0000 (15:37 +0100)]
Remove legacy CSS

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMerge color tones aaaaaa, bebebe, cccccc in bbbbbb
Julius Haertl [Sun, 5 Mar 2017 14:36:50 +0000 (15:36 +0100)]
Merge color tones aaaaaa, bebebe, cccccc in bbbbbb

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoRemove grey tints
Julius Haertl [Wed, 1 Mar 2017 20:42:32 +0000 (21:42 +0100)]
Remove grey tints

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoRemove separate error colors
Julius Haertl [Tue, 21 Feb 2017 16:33:07 +0000 (17:33 +0100)]
Remove separate error colors

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoExtra variable for loading icons
Julius Haertl [Tue, 21 Feb 2017 16:28:48 +0000 (17:28 +0100)]
Extra variable for loading icons

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMerge #666 and #777 to #555
Julius Haertl [Tue, 21 Feb 2017 16:22:16 +0000 (17:22 +0100)]
Merge #666 and #777 to #555

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoUse one box-shadow color
Julius Haertl [Tue, 21 Feb 2017 16:19:23 +0000 (17:19 +0100)]
Use one box-shadow color

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoReplace #222 with #333
Julius Haertl [Tue, 21 Feb 2017 15:56:31 +0000 (16:56 +0100)]
Replace #222 with #333

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoRemove unused old #999
Julius Haertl [Tue, 21 Feb 2017 15:55:31 +0000 (16:55 +0100)]
Remove unused old #999

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMerge colors
Julius Haertl [Tue, 21 Feb 2017 15:50:45 +0000 (16:50 +0100)]
Merge colors

- #fafafa/#f8f8f8/#f5f5f5 to #f8f8f8
- #f0f0f0/#eeeeee/#e8e8e8 to #eeeeee

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoRemove rgb color values
Julius Haertl [Tue, 21 Feb 2017 15:42:56 +0000 (16:42 +0100)]
Remove rgb color values

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoSimplify colors
Julius Haertl [Mon, 20 Feb 2017 15:15:53 +0000 (16:15 +0100)]
Simplify colors

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoSCSS colors in tooltip.scss
Julius Haertl [Sun, 19 Feb 2017 18:50:50 +0000 (19:50 +0100)]
SCSS colors in tooltip.scss

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoSCSS colors in styles.scss
Julius Haertl [Sun, 19 Feb 2017 18:50:36 +0000 (19:50 +0100)]
SCSS colors in styles.scss

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoSCSS colors in share.scss
Julius Haertl [Sun, 19 Feb 2017 18:50:21 +0000 (19:50 +0100)]
SCSS colors in share.scss

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoSCSS colors in multiselect.scss
Julius Haertl [Sun, 19 Feb 2017 18:49:39 +0000 (19:49 +0100)]
SCSS colors in multiselect.scss

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoSCSS colors in inputs.scss
Julius Haertl [Sun, 19 Feb 2017 18:49:19 +0000 (19:49 +0100)]
SCSS colors in inputs.scss

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoSCSS colors in icons.scss
Julius Haertl [Sun, 19 Feb 2017 18:49:06 +0000 (19:49 +0100)]
SCSS colors in icons.scss

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoSCSS colors in apps.scss
Julius Haertl [Sun, 19 Feb 2017 18:48:51 +0000 (19:48 +0100)]
SCSS colors in apps.scss

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoSCSS colors in header.scss
Julius Haertl [Fri, 17 Feb 2017 16:15:24 +0000 (17:15 +0100)]
SCSS colors in header.scss

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoAdd variables of existing colors
Julius Haertl [Sun, 19 Feb 2017 18:47:13 +0000 (19:47 +0100)]
Add variables of existing colors

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoAdd variables.scss and import it for each scss file
Julius Haertl [Fri, 17 Feb 2017 10:45:08 +0000 (11:45 +0100)]
Add variables.scss and import it for each scss file

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMerge pull request #3939 from nextcloud/downstream-27159
Joas Schilling [Mon, 20 Mar 2017 11:46:48 +0000 (12:46 +0100)]
Merge pull request #3939 from nextcloud/downstream-27159

Fix malformed logging in exception

7 years agoMerge pull request #3929 from nextcloud/downstream-27068
Joas Schilling [Mon, 20 Mar 2017 11:44:54 +0000 (12:44 +0100)]
Merge pull request #3929 from nextcloud/downstream-27068

cache loadUser if not exists

7 years agoMerge pull request #3884 from nextcloud/downstream-26956
Joas Schilling [Mon, 20 Mar 2017 11:27:38 +0000 (12:27 +0100)]
Merge pull request #3884 from nextcloud/downstream-26956

Skip null groups in group manager

7 years agoMerge pull request #3868 from nextcloud/issue-3834-escape-theming-footer
Joas Schilling [Mon, 20 Mar 2017 10:56:29 +0000 (11:56 +0100)]
Merge pull request #3868 from nextcloud/issue-3834-escape-theming-footer

Correctly escape the footer description from theming

7 years agoMerge pull request #3924 from nextcloud/preview_fixes
Lukas Reschke [Mon, 20 Mar 2017 10:45:51 +0000 (11:45 +0100)]
Merge pull request #3924 from nextcloud/preview_fixes

Do not generate the max preview twice

7 years agoMerge pull request #3950 from nextcloud/downstream-27149
Lukas Reschke [Mon, 20 Mar 2017 10:44:57 +0000 (11:44 +0100)]
Merge pull request #3950 from nextcloud/downstream-27149

Forbid to upload part files via web UI