Commit Graph

35023 Commits

Author SHA1 Message Date
Robin Appelman fdc2e8ba56
Add file action to move files and folders
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-14 16:23:11 +02:00
Arthur Schiwon 70c7781aa8
apply some polish
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-14 15:36:05 +02:00
Lukas Reschke 62e19dfa80 Merge pull request #1441 from nextcloud/getby-id-less-queries
optimize Folder::getById to use less queries
2016-10-14 15:18:23 +02:00
Christoph Wurst 53eb0f7f42 Merge pull request #1037 from nextcloud/no-double-token-update
dont update the auth token twice
2016-10-14 14:53:17 +02:00
Morris Jobke a38f3d9a9c Merge pull request #1745 from nextcloud/fix-dav-typo
fix typo
2016-10-14 12:40:43 +02:00
Thomas Citharel 3b055b160e
fix typo
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-10-14 11:48:18 +02:00
Thomas Müller 5cd90d4116
[9.2] Sync deathdate and anniversary to birthday calendar (#25655)
* Sync deathdate and anniversary to birthday calendar (which should be renamed maybe)

* Sync deathdate and anniversary to birthday calendar (which should be renamed maybe)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-14 10:12:43 +02:00
Roeland Jago Douma dd7c267842
[3rdparty] Bump synfony/process
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-14 08:24:36 +02:00
Nextcloud bot 92c24a91fa
[tx-robot] updated from transifex 2016-10-14 00:07:00 +00:00
Roeland Jago Douma 6c5f7d586e
Fix migration tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-13 19:40:44 +02:00
Roeland Jago Douma 77272ea52d
Use cache to determine if value need to be updated
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-13 19:40:40 +02:00
Arthur Schiwon a49d571799
fix and tidy up tests after merge conflicts
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-13 15:34:40 +02:00
Morris Jobke 4d2835802f
hide storage wrapper warning for the readonly storage
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-10-13 14:37:31 +02:00
Roeland Jago Douma 8c760e9187 Merge pull request #1721 from nextcloud/fix_bower
Add .bower.json to version control
2016-10-13 12:58:51 +02:00
Roeland Jago Douma cea0826796 Merge pull request #1720 from nextcloud/3rdparty_master
[3rdparty] Point to master again
2016-10-13 12:38:27 +02:00
Lukas Reschke f590bb1b3a Merge pull request #1701 from nextcloud/impr-user-list
tidy up adding user to list a little bit
2016-10-13 12:23:12 +02:00
Morris Jobke 05869e4d22 Merge pull request #1726 from nextcloud/fix-symfony-table
symfony replaced table helper by class, fixes two broken LDAP occ com…
2016-10-13 12:19:15 +02:00
Nextcloud bot 9aae4a0d02
[tx-robot] updated from transifex 2016-10-13 00:07:02 +00:00
Victor Dubiniuk c4fcd1f282
Update tests for phunit 5.5
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-13 01:06:45 +02:00
Victor Dubiniuk 011d5f554c
Harden empty
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-13 00:53:34 +02:00
Arthur Schiwon 9e817e9e0b
symfony replaced table helper by class, fixes two broken LDAP occ commands
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-12 23:47:07 +02:00
Arthur Schiwon 1bcd2ca8e3
emit pre-update event for comments
* notifications can be cleaned up, no polluted DB
* updating comments will re-notify users or remove notifications, depending on the message

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-12 18:06:22 +02:00
Robin Appelman 2de59d8a2a
remove unneeded unlock
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:40 +02:00
Robin Appelman 1484d01ff6
explicitly cast to int
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:39 +02:00
Robin Appelman ab10a54836
remove duplicate trait
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:38 +02:00
Robin Appelman f63f0aa1ae
get node by path as fallback
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:37 +02:00
Robin Appelman 9754724c8b
fix getting recipient share in ocs api
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:37 +02:00
Robin Appelman 240538d9e6
reuse share node when creating a share
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:36 +02:00
Robin Appelman 7d1e800c15
fix share tests not passing path
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:36 +02:00
Robin Appelman 1b3b816a0a
re-use the share node while formating if we already have it
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:35 +02:00
Robin Appelman 3845d4ec9a
more robust test setup
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:34 +02:00
Robin Appelman 7ce68ce6ac
phpunit is weird
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:34 +02:00
Robin Appelman 37eded7e7c
Always unlock node after trying to create a share
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:29 +02:00
Robin Appelman 0d842e0550
optimize Folder::getById to use less queries
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:28 +02:00
blizzz 17fa45a292 Merge pull request #1704 from nextcloud/avatar_dropdown
[us] Show avatar in share drop down
2016-10-12 15:38:38 +02:00
Morris Jobke 38eae3177d
add proper .gitignore rules
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-10-12 13:34:10 +02:00
Roeland Jago Douma 96c2f42ac5
Add .bower.json to version control
We need .bower.json to have bower functioning correctly

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-12 12:03:38 +02:00
Roeland Jago Douma 28708e1b19
[3rdparty] Update to master again 2016-10-12 11:55:56 +02:00
Roeland Jago Douma b2d68c0009 Merge pull request #1713 from nextcloud/rebase_1493
fix issue #1482 - mail invites through v1 webdav
2016-10-12 10:24:44 +02:00
Morris Jobke b300ae517c Merge pull request #1711 from nextcloud/us_move-more-commands-to-info.xml
[oc] move more commands to info.xml
2016-10-12 10:04:18 +02:00
Morris Jobke 657f1af263 Merge pull request #1712 from nextcloud/us_tear_down_fs_between_cron
[master] Tear down FS between cron jobs (#26223)
2016-10-12 10:00:45 +02:00
Claudemir Todo Bom 5b7f272fd4
fix issue #1482 - mail invites through v1 webdav
Signed-off-by: Claudemir Todo Bom <claudemir@todobom.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-12 09:13:55 +02:00
Roeland Jago Douma 1992d4be48 Merge pull request #1693 from nextcloud/fix-authors-with-mail-and-homepage
Fix authors with mail and homepage
2016-10-12 09:01:28 +02:00
Vincent Petry 5eb01b01a9
[master] Tear down FS between cron jobs (#26223)
Because some cron jobs do not always properly clean up their FS usage
and others might not clean up before setting up the FS, this could
cause potential side effects.

To make sure we exclude side effects, we tear down the FS between cron
jobs.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-12 08:37:17 +02:00
Roeland Jago Douma 0c574569a4
Readd Notify command
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-12 08:04:49 +02:00
Thomas Müller 8628d57b2c
Move console command registration to info.xml for encryption as well as files_external
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-12 08:04:15 +02:00
Nextcloud bot c2be9cb605
[tx-robot] updated from transifex 2016-10-12 00:08:16 +00:00
Joas Schilling 8a700d7b44 Merge pull request #1705 from nextcloud/us_register-commands-in-info.xml
[oc] Register commands in info.xml
2016-10-11 22:03:01 +02:00
Morris Jobke bf56b8c620 Merge pull request #1702 from nextcloud/fix_tooltip_nc
Use Nextcloud in share tooltip
2016-10-11 20:27:31 +02:00
Roeland Jago Douma 7eba1d806b
Add tests for commands in info.xml
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-11 19:48:31 +02:00