Commit Graph

31096 Commits

Author SHA1 Message Date
Thomas Müller 4f25f34178 Merge pull request #22778 from owncloud/fix-22770
untangle different user manager instances, fixes #22770
2016-03-03 11:55:10 +01:00
Thomas Müller c590372aef Merge pull request #22784 from owncloud/files-newmenu-removebrowsercomplete
Remove browser autocomplete in new file menu
2016-03-03 11:54:48 +01:00
Thomas Müller 89181b572e Merge pull request #22799 from owncloud/phil-davis-patch-1
Minor grammar in config.sample.php
2016-03-03 11:54:35 +01:00
Thomas Müller 8cacfce83d ne, or_IN, uz and yo have been removed from transifex and will be removed from git here now as well 2016-03-03 11:29:57 +01:00
Vincent Petry dbdf2173ac Return false on 401 in file list + trash file list
This gives a chance to the global ajax error handler to do its work if
the session expired.
2016-03-03 09:09:30 +01:00
Jenkins for ownCloud 8b76e8c57b [tx-robot] updated from transifex 2016-03-03 01:56:04 -05:00
Arthur Schiwon adf5d111f6 don't hide server not available exception, fixes #20536 2016-03-03 01:15:41 +01:00
Phil Davis 8e70351bda Minor grammar in config.sample.php
Fix this here in the source so it will propogate into the documentation.
Edit was already applied in https://github.com/owncloud/documentation/pull/2208 but needs to be done here at the source.
2016-03-03 04:31:57 +05:45
Vincent Petry 03b90cec35 Fix tooltip for versions mtime
It was missing a call to jquery.tooltip
2016-03-02 17:50:46 +01:00
Vincent Petry 5676216e56 Remove browser autocomplete in new file menu 2016-03-02 17:10:29 +01:00
Thomas Müller a6094b07e3 Merge pull request #22775 from owncloud/issue-22767-federation-fix-missing-translation
Translate strings of federation admin section
2016-03-02 16:32:58 +01:00
Thomas Müller 8a23235632 Merge pull request #22776 from RealRancor/versions_config_sample
Add Versions app header to config.sample.php
2016-03-02 14:25:44 +01:00
Jenkins for ownCloud 2773b2bb0a [tx-robot] updated from transifex 2016-03-02 07:40:13 -05:00
Arthur Schiwon 82b55c4db9 untangle different user manager instances, fixes #22770 2016-03-02 13:02:43 +01:00
Joas Schilling 1b3e7ae82b Translate strings of federation admin section 2016-03-02 12:54:53 +01:00
RealRancor 4a0d91a043 Add Versions app header to config.sample.php 2016-03-02 12:51:04 +01:00
Thomas Müller 6d90651ff0 Merge pull request #22769 from owncloud/increase-version-for-9.1
Master is now 9.1
2016-03-02 11:10:45 +01:00
Joas Schilling 8885cb1eb9 Increase all versions on master which is now 9.1 2016-03-02 08:53:42 +01:00
Jenkins for ownCloud 702c1a8962 [tx-robot] updated from transifex 2016-03-02 01:56:33 -05:00
C. Montero Luque 4d69e562a0 Merge pull request #22757 from owncloud/apply-license
Update copyright information and author file
2016-03-01 15:36:37 -05:00
C. Montero Luque 12479a1eda Merge pull request #22756 from owncloud/exclude-custom-data-dir
Exclude custom data directory from integrity checker
2016-03-01 15:32:27 -05:00
C. Montero Luque 069c65479d Merge pull request #22684 from owncloud/part-file-root
allow putting the part file in the view root
2016-03-01 14:42:59 -05:00
C. Montero Luque c51a01b43f Merge branch 'master' into exclude-custom-data-dir 2016-03-01 13:35:14 -05:00
C. Montero Luque 5a2fe4107c Merge branch 'master' into part-file-root 2016-03-01 13:35:04 -05:00
C. Montero Luque 745fdc4800 Merge pull request #22742 from owncloud/ceph-keystone-readiness
Use readiness notification socket to be absolutely sure this works
2016-03-01 13:34:23 -05:00
Lukas Reschke 3067367ff3 Add new apps 2016-03-01 17:52:32 +01:00
Lukas Reschke c353d51810 Remove Scrutinizer Auto Fixer 2016-03-01 17:48:23 +01:00
Lukas Reschke c430f5ba53 Map Maci 2016-03-01 17:45:05 +01:00
Lukas Reschke 933f60e314 Update author information
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
2016-03-01 17:25:15 +01:00
Lukas Reschke 2d68c1b945 Exclude custom data directory from integrity checker
We should not scan any custom data directory in the integrity checker as well. Otherwise this would lead to a massive increased update time that may likely exceed the timeout.

To test this:

1. Install ownCloud 8.2.2, set as data dir another folder than `data` such as `data-asdf`. Make sure that folder lives in the web root as well.
2. Update that instance to 9.0.0 beta2 => Errors are shown in the code integrity check
3. Apply this patch and trigger the rescan in the admin settings => No errors are shown anymore (can also do a new update with that patch applied)

Fixes https://github.com/owncloud/core/issues/22698
2016-03-01 17:16:10 +01:00
Robin Appelman 49d3a7d0bb add config sample 2016-03-01 15:29:19 +01:00
Robin Appelman 37f1206818 allow putting the part file in the view root 2016-03-01 15:21:24 +01:00
Thomas Müller 900dcf6594 Merge pull request #22699 from owncloud/checksum_int_test
Checksum intergration tests and fixes
2016-03-01 14:47:09 +01:00
Thomas Müller a83af96dd3 Merge pull request #22686 from owncloud/cleanup_remote_address_books
remove remote address book if access was revoked
2016-03-01 14:46:51 +01:00
Morris Jobke 3682a4220c local entrypoint.sh isn't needed - all fixes are upstream 2016-03-01 13:54:46 +01:00
Vincent Petry 57babe032b Save some calls to refreshInfo during upload 2016-03-01 11:44:49 +01:00
Roeland Jago Douma ac392457f2 Fix unit tests 2016-03-01 11:37:16 +01:00
Roeland Jago Douma ec140fa2ec Checksums on chunked files
We should also store checksums on chunked files.
We do not checksum individual chunks but only the final file.
2016-03-01 11:37:16 +01:00
Roeland Jago Douma 3e88a5067f Remove checksum on upload of non checksumed file
When we overwrite a checksumed file with a file without a checksum we
should remove the checksum from the server.

This is done by setting the column to empty.
2016-03-01 11:37:16 +01:00
Roeland Jago Douma 03d0fa012f Checksum intergration test
* Upload file with checksum
* Chunked upload with checksum
* Copy file with checksum should also copy the checksum
* Moving a file with checksum should also move the checksum
* Uploading a file with checksum and overwriting it with a file without cheksum should remove the checksum
2016-03-01 11:37:16 +01:00
Thomas Müller 5fe5233f41 Merge pull request #22681 from owncloud/add-autodiscovery-for-ocs
Add autodiscovery support to server-to-server sharing implementation
2016-03-01 11:27:28 +01:00
Thomas Müller 73e145cf63 Merge pull request #22728 from owncloud/external-share-testremote
use ocs discover endpoint to test remote
2016-03-01 11:27:07 +01:00
Thomas Müller 256dfd27b6 Merge pull request #17451 from owncloud/apps-disablebrokenappafterenable
Disable app that bricks the server after enabling
2016-03-01 11:26:18 +01:00
Bjoern Schiessle 1832bd0fa1 increase version number 2016-03-01 11:21:24 +01:00
Morris Jobke 4943a0326d Use sockets for startup notification in primary storage tests 2016-03-01 10:45:48 +01:00
Thomas Müller a66899c528 Handle null case 2016-03-01 10:41:05 +01:00
Thomas Müller 1652541150 Merge pull request #22700 from owncloud/only_1_linkshare
For now only allow 1 link share per file/folder
2016-03-01 09:22:39 +01:00
Thomas Müller 25a4571dcd Merge pull request #22731 from owncloud/hide-nodes-from-listening
Hides nodes from listing that the user has no access to
2016-03-01 09:22:08 +01:00
Thomas Müller fd4742d430 Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotaset
Don't return quota when none set
2016-03-01 08:30:58 +01:00
Roeland Jago Douma 0dd0adf69f Intergration tests 2016-03-01 08:29:15 +01:00