mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
37,699 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

37699 Commits

Author SHA1 Message Date
Joas Schilling 2e78aa6232
Remove the cert as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-22 15:17:19 +01:00
Joas Schilling 5a6e29e4a8
Remove ownCloud Root Authority as per todo 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-22 08:54:40 +01:00
Roeland Jago Douma 16a0bccefa Merge pull request #3972 from nextcloud/merge-some-more-css 
Merge some CSS files using our SCSS compiler
 2017-03-22 08:46:10 +01:00
Christoph Wurst c6c5896474 Merge pull request #3980 from nextcloud/fix-app-menu-triangle 
Fix position of triangle in app menu
 2017-03-22 08:43:45 +01:00
Nextcloud bot cae8702ab2
[tx-robot] updated from transifex 2017-03-22 01:07:53 +00:00
Morris Jobke e46ffe82f7 Merge pull request #3974 from nextcloud/fix-reshare-activity-message 
Fix reshare with user activity message
 2017-03-21 16:55:15 -06:00
Joas Schilling 20a0a18fbd
Fix reshare with user activity message 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-21 16:54:28 -06:00
Morris Jobke 6d35827bf6
Fix position of triangle in app menu 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-21 16:48:13 -06:00
Morris Jobke 1084cdb613
fix path 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-21 15:33:28 -06:00
Morris Jobke d2b1b02244 Merge pull request #3937 from nextcloud/downstream-27234 
fix typo in sftp public key
 2017-03-21 13:18:19 -06:00
Morris Jobke a85d7e6f98 Merge pull request #3975 from nextcloud/remove-dead-code 
Remove test code
 2017-03-21 13:17:11 -06:00
Lukas Reschke 99bf437640
Remove test code 
This seems to have been commited by mistake with 6dbe417c51

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-21 16:59:10 +01:00
Joas Schilling 348d97dfd6 Merge pull request #3844 from nextcloud/unshare_event 
Unshare event
 2017-03-21 16:57:09 +01:00
Lukas Reschke 5c7ad6d3ec
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>
 2017-03-21 16:35:31 +01:00
Lukas Reschke 60d45ec2cc Merge pull request #3968 from nextcloud/fix-branding 
[master] Fix branding and show Nextcloud
 2017-03-21 13:54:58 +01:00
Lukas Reschke d8e8d7b60e
[master] Fix branding 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-21 12:20:22 +01:00
Roeland Jago Douma 7e95837097 Merge pull request #3955 from nextcloud/downstream-27113 
Can we get some faster phpunit execution?
 2017-03-21 11:27:00 +01:00
Lukas Reschke 04f419bc25 Merge pull request #3901 from nextcloud/di_ng 
Move Interface Definitions to the ServerContainer
 2017-03-21 11:06:16 +01:00
Roeland Jago Douma 92f50c7d87
Core is also a special app 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 10:42:33 +01:00
Roeland Jago Douma 48c34522ed
Move a lot of stuff over to the ServerContainer 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 10:29:59 +01:00
Roeland Jago Douma 0fb5776133
Fix NODB tests etc 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:20 +01:00
Roeland Jago Douma c92b9ce2c4
Fix settings tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:20 +01:00
Roeland Jago Douma 21641302a9
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>
 2017-03-21 08:52:20 +01:00
Roeland Jago Douma 7cece61ff6
Extend DI tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:20 +01:00
Roeland Jago Douma 246e9ce547
More elegant handling of recursion 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:20 +01:00
Roeland Jago Douma df14684817
PoC of moving the interface classes to the servercontainer 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:20 +01:00
Roeland Jago Douma 886202123c
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>
 2017-03-21 08:52:17 +01:00
Nextcloud bot fd0e42e093
[tx-robot] updated from transifex 2017-03-21 01:08:16 +00:00
Roeland Jago Douma 3b07731099 Merge pull request #3963 from nextcloud/logs-access-to-previews 
Log access to preview images
 2017-03-20 21:41:25 +01:00
Lukas Reschke 21cf1b22e9 Merge pull request #3530 from nextcloud/scss-variables 
Implement scss variables
 2017-03-20 19:49:53 +01:00
Thomas Müller 5bfce597a9
[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>
 2017-03-20 12:34:05 -06:00
Lukas Reschke abaf909ba2
Log access to preview images 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-20 18:36:36 +01:00
Christoph Wurst 03a92eaf74 Merge pull request #3957 from nextcloud/downstream-27307 
Follow up to #3949 (app exists on enable)
 2017-03-20 18:10:05 +01:00
Robin Appelman be9ae45a4b 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 "
 2017-03-20 15:32:34 +01:00
Roeland Jago Douma 1565177fb5
Revert "Add a magic wrapper to allow phpunit4 to run the code again " 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-20 14:25:43 +01:00
Julius Härtl a0f7d4b688
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 14:20:34 +01:00
Julius Härtl 53c0fe6e23
Fix sass compile tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 14:12:45 +01:00
Julius Härtl 29ec58f1b5
Add tests for SCSSCacher 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 14:12:35 +01:00
Lukas Reschke 450a899f01 Merge pull request #3945 from nextcloud/downstream-27298 
Adding file, line, class and function to the query logger (#27298)
 2017-03-20 13:16:10 +01:00
Lukas Reschke 29039eb608 Merge pull request #3951 from nextcloud/menu-firefox-fixes 
Fix new app menu on firefox
 2017-03-20 13:15:43 +01:00
Roeland Jago Douma 376e6f0884 Merge pull request #3915 from michaelletzgus/html5-fix_autocapitalize 
Fix value of attribute "autocapitalize"
 2017-03-20 13:13:32 +01:00
Julius Haertl ccd35095d0
Add variables.scss to sass compile test 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl 4fbf9a4feb
Add tests for SCSSCacher 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl 7381a2ec5c
Replace old color occurences with calculations 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl 322ecdca63
Make remaining colors depending on $color-main-text and $color-main-background 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl 9f259d4c7a
Remove legacy CSS 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl c7de67e44a
Merge color tones aaaaaa, bebebe, cccccc in bbbbbb 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl 58a9d1b0f2
Remove grey tints 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl 5b3a1a558e
Remove separate error colors 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:07 +01:00
Julius Haertl 8ff3db1be8
Extra variable for loading icons 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:07 +01:00