]>
source.dussan.org Git - nextcloud-server.git/log
Lukas Reschke [Fri, 24 Mar 2017 18:49:43 +0000 (19:49 +0100)]
Merge JS for comments
Shaves off 6 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Fri, 24 Mar 2017 18:31:31 +0000 (19:31 +0100)]
Merge pull request #3988 from nextcloud/jscombiner
[PoC] JS Combiner
Morris Jobke [Fri, 24 Mar 2017 17:10:20 +0000 (11:10 -0600)]
Merge pull request #4021 from nextcloud/update-dependencies
Update dependencies
Morris Jobke [Thu, 23 Mar 2017 23:14:46 +0000 (17:14 -0600)]
Update dependencies
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Roeland Jago Douma [Fri, 24 Mar 2017 15:11:54 +0000 (16:11 +0100)]
Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Björn Schießle [Fri, 24 Mar 2017 13:33:03 +0000 (14:33 +0100)]
Merge pull request #3825 from nextcloud/federation-fixes
create correct VCard and return correct error codes
Roeland Jago Douma [Fri, 24 Mar 2017 10:00:07 +0000 (11:00 +0100)]
Tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Bjoern Schiessle [Thu, 23 Mar 2017 15:10:53 +0000 (16:10 +0100)]
fix tests
calling getAbsoluteBundlePath() in the constructor makes other tests fail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Joas Schilling [Thu, 23 Mar 2017 13:33:25 +0000 (14:33 +0100)]
Load cert file before syncing addressbooks and contacts
Signed-off-by: Joas Schilling <coding@schilljs.com>
Bjoern Schiessle [Mon, 13 Mar 2017 15:54:27 +0000 (16:54 +0100)]
use right format for avatars
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Bjoern Schiessle [Mon, 13 Mar 2017 13:58:37 +0000 (14:58 +0100)]
don't add empty values to the vcard
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Bjoern Schiessle [Mon, 13 Mar 2017 11:13:57 +0000 (12:13 +0100)]
only execute code if exception was thrown by the corresponding controller
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Bjoern Schiessle [Mon, 13 Mar 2017 13:47:08 +0000 (14:47 +0100)]
fix the way we create a new vcard to avoid to have multiple UIDs
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Roeland Jago Douma [Wed, 22 Mar 2017 15:22:15 +0000 (16:22 +0100)]
Add return
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Wed, 22 Mar 2017 14:42:17 +0000 (15:42 +0100)]
Add debug mode
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Wed, 22 Mar 2017 14:20:29 +0000 (15:20 +0100)]
Add caching
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Wed, 22 Mar 2017 13:47:32 +0000 (14:47 +0100)]
Combine additional files_sharing scripts
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Wed, 22 Mar 2017 13:47:07 +0000 (14:47 +0100)]
[PoC] JS Combiner
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Joas Schilling [Fri, 24 Mar 2017 09:55:10 +0000 (10:55 +0100)]
Merge pull request #4010 from nextcloud/fac-58-mimetype-on-creating-directories
Fix workflow engine mimetype detection when creating a directory
Lukas Reschke [Fri, 24 Mar 2017 09:54:33 +0000 (10:54 +0100)]
Merge pull request #4026 from nextcloud/appmenu-fix
Fix appmenu issues
Lukas Reschke [Fri, 24 Mar 2017 09:49:57 +0000 (10:49 +0100)]
Merge pull request #4013 from nextcloud/bundle_vendor_js
Bundle vendor js
Julius Härtl [Fri, 24 Mar 2017 09:19:42 +0000 (10:19 +0100)]
Fix appmenu issues
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Roeland Jago Douma [Fri, 24 Mar 2017 09:01:06 +0000 (10:01 +0100)]
Merge pull request #4022 from nextcloud/downstream-27105
Remove auto-focus on certain input fields
Roeland Jago Douma [Fri, 24 Mar 2017 07:44:42 +0000 (08:44 +0100)]
Merge pull request #4025 from nextcloud/downstream-27292
Update karma
Morris Jobke [Fri, 24 Mar 2017 05:45:43 +0000 (23:45 -0600)]
Merge pull request #3928 from nextcloud/downstream-17978
Adjust 4 byte MySQL code to upstream
Morris Jobke [Fri, 24 Mar 2017 05:45:28 +0000 (23:45 -0600)]
Merge pull request #3889 from nextcloud/downstream-26950
Sharing dialog: make autocomplete sorting case insensitive
Morris Jobke [Fri, 24 Mar 2017 05:42:54 +0000 (23:42 -0600)]
also install sinon
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Vincent Petry [Thu, 2 Mar 2017 09:11:56 +0000 (10:11 +0100)]
Properly clear heartbeat interval
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Vincent Petry [Thu, 2 Mar 2017 09:11:23 +0000 (10:11 +0100)]
Update karma, use sinon from npm
Update karma library and use sinon JS library provided by
karma-jasmine-sinon instead of local file.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Nextcloud bot [Fri, 24 Mar 2017 01:08:00 +0000 (01:08 +0000)]
[tx-robot] updated from transifex
Felix Heidecke [Wed, 15 Feb 2017 12:50:53 +0000 (13:50 +0100)]
Remove auto-focus on certain input fields
* remove autofocus on input certain input fields if browser is msie
* Update sharedialoglinkshareview.js
* Update sharedialogview.js
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Thu, 23 Mar 2017 22:12:24 +0000 (16:12 -0600)]
Merge pull request #3879 from nextcloud/downstream-26915
Added integration tests for sharees using v2.php
Morris Jobke [Thu, 23 Mar 2017 21:56:18 +0000 (15:56 -0600)]
Merge pull request #4007 from nextcloud/backport-27155
Change showTemporary notifications for closable ones
Morris Jobke [Wed, 22 Mar 2017 23:11:09 +0000 (17:11 -0600)]
fix sorting in the backend
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Thu, 23 Mar 2017 21:36:22 +0000 (15:36 -0600)]
Improve error message of charset convert script and behaviour
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Thu, 23 Mar 2017 21:26:43 +0000 (15:26 -0600)]
Merge pull request #3953 from nextcloud/downstream-27027
Ignore NoUserException for shares from ghosts
Morris Jobke [Thu, 23 Mar 2017 21:25:27 +0000 (15:25 -0600)]
Merge pull request #3850 from nextcloud/search-order
Fix search ordering
Robin Appelman [Wed, 15 Mar 2017 13:46:23 +0000 (14:46 +0100)]
Fix search ordering
Signed-off-by: Robin Appelman <robin@icewind.nl>
Morris Jobke [Thu, 23 Mar 2017 21:20:53 +0000 (15:20 -0600)]
Merge pull request #3965 from nextcloud/downstream-27343
Providing --path option to transfer-ownership
Roeland Jago Douma [Thu, 23 Mar 2017 20:59:39 +0000 (21:59 +0100)]
Merge pull request #3998 from nextcloud/backport-27032
Use the expected method depending on the target being a file or folder
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>
Morris Jobke [Thu, 23 Mar 2017 19:00:49 +0000 (13:00 -0600)]
Merge pull request #4001 from nextcloud/backport-27389
Ensure that FileInfo return values as required by its phpdoc.
Lukas Reschke [Thu, 23 Mar 2017 18:28:49 +0000 (19:28 +0100)]
Merge pull request #4000 from nextcloud/backport-27216
allow configuring authType for DAV backend
Joas Schilling [Thu, 23 Mar 2017 18:24:02 +0000 (19:24 +0100)]
Make deleting a group compatible with ocs v2
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 23 Mar 2017 16:52:47 +0000 (17:52 +0100)]
Fix type hints and doc blocks
Signed-off-by: Joas Schilling <coding@schilljs.com>
Robin Appelman [Thu, 23 Mar 2017 14:01:23 +0000 (15:01 +0100)]
set cache to failedcache when shared storage init fails
Signed-off-by: Robin Appelman <robin@icewind.nl>
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>
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>
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>
Joas Schilling [Thu, 23 Mar 2017 11:45:36 +0000 (12:45 +0100)]
Fix workflow engine mimetype detection when creating a directory
Signed-off-by: Joas Schilling <coding@schilljs.com>
Lukas Reschke [Thu, 23 Mar 2017 11:28:55 +0000 (12:28 +0100)]
Merge pull request #3995 from nextcloud/files_scan_appdata
Add files:scanAppData command
Lukas Reschke [Thu, 23 Mar 2017 10:57:34 +0000 (11:57 +0100)]
Merge pull request #3948 from nextcloud/downstream-27271
Tooltip in trashbin with previous location
Lukas Reschke [Thu, 23 Mar 2017 10:56:35 +0000 (11:56 +0100)]
Merge pull request #3978 from nextcloud/scss_deps_memcache
Cache SCSS dependency file in memcache
Lukas Reschke [Thu, 23 Mar 2017 10:55:36 +0000 (11:55 +0100)]
Merge pull request #3989 from nextcloud/files-external-save-button
replace autosave with a save button for external storage configuration
Lukas Reschke [Thu, 23 Mar 2017 10:54:54 +0000 (11:54 +0100)]
Merge pull request #3994 from nextcloud/only_init_backbone_once
Only initialize backbone once
Roeland Jago Douma [Thu, 23 Mar 2017 07:36:23 +0000 (08:36 +0100)]
Merge pull request #3997 from nextcloud/backport-27353
Update davclient.js to 0.1.1
Morris Jobke [Thu, 23 Mar 2017 06:25:59 +0000 (00:25 -0600)]
Merge pull request #3999 from nextcloud/backport-27262
Updated UI messages relating to the encryption functionality
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 [Thu, 23 Mar 2017 01:07:52 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Jörn Friedrich Dreyer [Wed, 22 Feb 2017 20:47:49 +0000 (21:47 +0100)]
allow configuring authType for DAV backend
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Matthew Setter [Mon, 27 Feb 2017 09:16:57 +0000 (10:16 +0100)]
Updated UI messages relating to the encryption functionality
The reason for updating these messages, is that grammatically they're
not quite correct. They showed a combination of:
- Related phrases, which could be either separated or joined better
- Related sentences, but which should be expressed as separate ones
They were also missing full-stops to end the them.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Juan Pablo Villafáñez [Wed, 25 Jan 2017 16:21:20 +0000 (17:21 +0100)]
Use the expected method depending on the target being a file or folder
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Vincent Petry [Fri, 10 Mar 2017 07:06:03 +0000 (08:06 +0100)]
Update davclient.js to 0.1.1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Wed, 22 Mar 2017 23:39:08 +0000 (17:39 -0600)]
improve file transfer code
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Wed, 22 Mar 2017 23:17:37 +0000 (17:17 -0600)]
fix path for files from root folder
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Wed, 22 Mar 2017 21:59:55 +0000 (15:59 -0600)]
Use proper name and code style
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Roeland Jago Douma [Wed, 22 Mar 2017 19:03:04 +0000 (20:03 +0100)]
Only initialize backbone once
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Nextcloud bot [Wed, 22 Mar 2017 21:14:04 +0000 (21:14 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Wed, 22 Mar 2017 20:30:44 +0000 (21:30 +0100)]
Add files:scanAppData command
Fixes https://github.com/nextcloud/server/issues/3041
Add a dedicated command to scan the special appdata dir
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Wed, 22 Mar 2017 12:26:18 +0000 (13:26 +0100)]
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Tue, 21 Mar 2017 20:53:20 +0000 (21:53 +0100)]
Cache SCSS dependency file in memcache
Since reading a file from disks can be costly. Lets store the dependency
json also in memcache.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
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
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
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"
Morris Jobke [Wed, 22 Mar 2017 18:08:41 +0000 (12:08 -0600)]
Fix autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
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>
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>
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
Make DI work for all apps
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>
Robin Appelman [Wed, 22 Mar 2017 13:32:26 +0000 (14:32 +0100)]
replace autosave with a save button for external storage configuration
Signed-off-by: Robin Appelman <robin@icewind.nl>
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
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
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>
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>
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>
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>
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>
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
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>
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>
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>
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>
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>
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>
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>
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>
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
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
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>
projects / nextcloud-server.git / log