d83b15cd85
Merge pull request #3982 from nextcloud/hide-systemtag-delete-tooltip
...
Remove tooltip of delete button for systemtags
2017-03-22 09:24:40 +01:00
d2a2cef4cc
Handlebars is already loaded by core.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 09:01:47 +01:00
a427e130ae
When debug don't load the bundled file
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 08:58:28 +01:00
5a6e29e4a8
Remove ownCloud Root Authority as per todo
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-22 08:54:40 +01:00
1f7b86297a
No need to exit
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 08:52:49 +01:00
2337e11d88
Bump core.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 08:49:39 +01:00
12de9ad655
Add CI step to verify merged vendor js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 08:49:03 +01:00
98a14909e1
Bundle more default vendor js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 08:49:03 +01:00
7195a9323d
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>
2017-03-22 08:48:10 +01:00
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
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
c3f08ab151
Remove tooltip of delete button for systemtags
...
* fixes #3967
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 21:49:25 -06:00
cae8702ab2
[tx-robot] updated from transifex
2017-03-22 01:07:53 +00:00
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
20a0a18fbd
Fix reshare with user activity message
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-21 16:54:28 -06:00
6d35827bf6
Fix position of triangle in app menu
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 16:48:13 -06:00
1084cdb613
fix path
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 15:33:28 -06:00
67909cf87b
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>
2017-03-21 20:53:37 +01:00
d2b1b02244
Merge pull request #3937 from nextcloud/downstream-27234
...
fix typo in sftp public key
2017-03-21 13:18:19 -06:00
a85d7e6f98
Merge pull request #3975 from nextcloud/remove-dead-code
...
Remove test code
2017-03-21 13:17:11 -06:00
99bf437640
Remove test code
...
This seems to have been commited by mistake with 6dbe417c51
2017-03-21 16:59:10 +01:00
348d97dfd6
Merge pull request #3844 from nextcloud/unshare_event
...
Unshare event
2017-03-21 16:57:09 +01:00
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
60d45ec2cc
Merge pull request #3968 from nextcloud/fix-branding
...
[master] Fix branding and show Nextcloud
2017-03-21 13:54:58 +01:00
d8e8d7b60e
[master] Fix branding
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-21 12:20:22 +01:00
7e95837097
Merge pull request #3955 from nextcloud/downstream-27113
...
Can we get some faster phpunit execution?
2017-03-21 11:27:00 +01:00
04f419bc25
Merge pull request #3901 from nextcloud/di_ng
...
Move Interface Definitions to the ServerContainer
2017-03-21 11:06:16 +01:00
92f50c7d87
Core is also a special app
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 10:42:33 +01:00
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
0fb5776133
Fix NODB tests etc
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
c92b9ce2c4
Fix settings tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
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
7cece61ff6
Extend DI tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
246e9ce547
More elegant handling of recursion
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
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
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
fd0e42e093
[tx-robot] updated from transifex
2017-03-21 01:08:16 +00:00
209e3e39e2
Use proper bash test syntax
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 18:48:55 -06:00
f654f29532
Providing --path option to transfer-ownership
...
This will help user to selectively move the folders
specified using --path option, instead of moving
entire folder under files directory.
Signed-off-by: Sujith H <sharidasan@owncloud.com>
Update the integration test for transfer-ownership
Update the integration test for transfer-ownership
as the new option --path is introduced in the command.
Signed-off-by: Sujith H <sharidasan@owncloud.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 18:29:21 -06:00
3b07731099
Merge pull request #3963 from nextcloud/logs-access-to-previews
...
Log access to preview images
2017-03-20 21:41:25 +01:00
ce302aea11
Fix warning
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 13:13:09 -06:00
a8e3168c17
200 is ok
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 13:13:09 -06:00
4157e7914a
Fix deletion of groups
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 13:13:09 -06:00
4626514a35
Strict comparisons
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 13:13:09 -06:00
036f5a6e08
add drone config
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 13:13:08 -06:00
8e99f19c28
Added tests using v2.php
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 13:13:08 -06:00
21cf1b22e9
Merge pull request #3530 from nextcloud/scss-variables
...
Implement scss variables
2017-03-20 19:49:53 +01:00
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
abaf909ba2
Log access to preview images
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-20 18:36:36 +01:00
0c1b7fdcb5
return failed cache if the shared storage failed to setup
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-20 18:31:34 +01:00
Roeland Jago Douma
Roeland Jago Douma
Joas Schilling
Christoph Wurst
Morris Jobke
Nextcloud bot
Lukas Reschke
Sujith H
Sergio Bertolin
Thomas Müller
Robin Appelman