Commit graph

28435 commits

Author SHA1 Message Date
Thomas Müller
4978a785fa Merge pull request #18294 from esakol/issue17173
Fix RHDS ldap paged search, Issue #17173
2015-11-24 16:04:23 +01:00
Thomas Müller
6ce6e27560 Merge pull request #20595 from owncloud/fix-double-slashes
Avoid double slashes in URL when trying to add an remote share
2015-11-24 16:04:03 +01:00
Thomas Müller
9385eef31a Merge pull request #18999 from owncloud/ext-config-listadmin
Improvements to external storages list rendering
2015-11-24 16:03:35 +01:00
Robin Appelman
95f2e15f83 Merge pull request #20574 from owncloud/files_external_list_command
Add files_external:list command to list configured external storages
2015-11-24 13:34:59 +01:00
Thomas Müller
b7b6770d35 Merge pull request #20693 from owncloud/phpdoc_node
Consistent interface declaration OCP\Files\Node
2015-11-24 10:56:53 +01:00
Thomas Müller
d785883eb2 Merge pull request #20682 from owncloud/objectid-to-string
Make sure that object id can be a string
2015-11-24 10:56:34 +01:00
Jenkins for ownCloud
cb69e6c201 [tx-robot] updated from transifex 2015-11-24 01:56:32 -05:00
Roeland Jago Douma
5873821b8d Consistent interface declaration 2015-11-23 22:03:19 +01:00
Thomas Müller
2bffeefee1 Merge pull request #20622 from owncloud/comments-dbscheme
DB scheme for Comments table, resolves #20265
2015-11-23 17:19:17 +01:00
Thomas Müller
7062e6636d Merge pull request #20684 from owncloud/more-time
webdav docker tests - wait at least 5 seconds after the full startup
2015-11-23 15:35:51 +01:00
Morris Jobke
4608e7134c webdav docker tests - wait at least 5 seconds after the full startup 2015-11-23 14:49:01 +01:00
Joas Schilling
018bd3ee24 Make sure that object id can be a string 2015-11-23 14:18:15 +01:00
Thomas Müller
a1c4e2e635 Merge pull request #20587 from owncloud/sharing-api-integration-tests-roelandcases
Requested sharing API test cases.
2015-11-23 13:34:40 +01:00
Thomas Müller
7e9cf00e34 Merge pull request #20609 from owncloud/dav-donotauththroughajax
Do not authenticate over ajax Webdav
2015-11-23 13:33:08 +01:00
Thomas Müller
021137d7ae Merge pull request #20679 from owncloud/fixphpdoc
p() supports string as argument
2015-11-23 13:32:46 +01:00
Thomas Müller
df906f475b Merge pull request #20617 from owncloud/fix-usage-of-lastInsertId
lastInsertId() is properly working with Oracle if the table name is p…
2015-11-23 13:29:08 +01:00
Thomas Müller
240cc1c4ea Merge pull request #20543 from owncloud/share2.0_fix_hooks
Move hook and delete children logic to share manager
2015-11-23 13:28:49 +01:00
Thomas Müller
f85282c90a Merge pull request #20577 from owncloud/notifications-datetime-timestamp
Use a DateTime object instead of a timestamp
2015-11-23 13:14:45 +01:00
Robin Appelman
74dfc604d1 language fixes 2015-11-23 13:08:53 +01:00
Robin Appelman
ff72eac927 truncate long values on default 2015-11-23 12:29:20 +01:00
Roeland Jago Douma
1360e22d7c [Sharing 2.0] Move hook and delete children logic to share manager
To make sure hooks are always fired and child entries are always
cleaned. This logic is moved to the share manager.

* Updated unit tests
2015-11-23 12:28:54 +01:00
Robin Appelman
0795f7d71b hide passwords and secrets on default 2015-11-23 12:24:24 +01:00
Morris Jobke
7138659080 p() supports string as argument 2015-11-23 12:11:23 +01:00
Thomas Müller
aa660ec232 Throw an exception in case no table name is passed into lastInsertId of the Oracle adapter 2015-11-23 11:44:08 +01:00
Thomas Müller
9f69021691 lastInsertId() is properly working with Oracle if the table name is properly passed in 2015-11-23 11:44:08 +01:00
Joas Schilling
a370c29068 Use a DateTime object instead of a timestamp 2015-11-23 11:41:48 +01:00
Robin Appelman
909b31ea58 use common --output option 2015-11-23 11:36:20 +01:00
Robin Appelman
f5cdd27b22 Add files_external:list command to list configured external storages 2015-11-23 11:31:40 +01:00
Thomas Müller
bf672d7e51 Merge pull request #20222 from owncloud/federated_sharing_auto_complete
federated sharing auto-complete, first step
2015-11-23 10:42:14 +01:00
Thomas Müller
43391f8f47 Merge pull request #20623 from owncloud/app-list-enhancements
Add cmdline key to show shipped/non-shipped apps only
2015-11-23 10:07:52 +01:00
Vincent Petry
055d58bfc3 Do not authenticate over ajax
This makes sure that whenever a Webdav call is done through Ajax, if the
session has expired, it will not send back a challenge but a simple 401
response. Without this fix, the default code would send back a challenge
and trigger the browser's basic auth dialog.
2015-11-23 09:44:30 +01:00
Thomas Müller
79bbda994b Merge pull request #16902 from owncloud/jsocclient
Web UI uses Webdav instead of ajax/* calls
2015-11-23 09:38:01 +01:00
Victor Dubiniuk
8d9353a640 Add cmdline key to show shipped/non-shipped apps only 2015-11-23 09:06:35 +01:00
Thomas Müller
2f89eef334 Merge pull request #20524 from owncloud/pgsql-version-check-error
assume pgsql >=9 if checking the version fails
2015-11-23 09:05:13 +01:00
Thomas Müller
57c9aa3ca7 Merge pull request #20558 from owncloud/remove-path-from-shared-with
Unset `path` for shared with me
2015-11-23 09:04:52 +01:00
Thomas Müller
333232f665 Merge pull request #20559 from owncloud/settings_app_to_controller
[Settings] Moved changedisplayname to usercontroller
2015-11-23 08:36:47 +01:00
Thomas Müller
a32b861f18 Merge pull request #20649 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2015-11-23 08:35:26 +01:00
Thomas Müller
8c979398d5 Merge pull request #20633 from owncloud/symfony_console_2.7.4
[3rdparty] Bump for symfony/console-2.7.4
2015-11-23 08:35:08 +01:00
Jenkins for ownCloud
56e05a90af [tx-robot] updated from transifex 2015-11-23 01:54:53 -05:00
Roeland Jago Douma
7ecf9d70f5 [3rdparty] Bump for symfony/console-2.7.4 2015-11-23 07:52:33 +01:00
Robin McCorkell
08839ce77d Defer initialisation of data until after complete construction 2015-11-22 17:25:32 +00:00
Vincent Petry
418fefc93c Update app version for Webdav impl of files GUI
This will make sure the cached JS gets properly updated.
Also, since this is a bigger change it also qualifies for a version
increase :-)
2015-11-22 16:05:52 +01:00
Robin Appelman
2d7c9f0ba9 also match ie11 with Request::USER_AGENT_IE 2015-11-22 16:05:52 +01:00
Vincent Petry
a05e40932c Now using IE8 workaround of davclient.js for all IE versions 2015-11-22 16:05:52 +01:00
Vincent Petry
fd40b06639 Patch for davclient.js for Firefox 2015-11-22 16:05:51 +01:00
Vincent Petry
ce897f80e6 Send download token as cookie to tell the UI that it started
This used to be done in the ajax download code. Now that single file
downloads are going through Webdav, the token handling needs to be done
here too.
2015-11-22 16:05:51 +01:00
Vincent Petry
d3383adb71 Fix issue when renaming creates a separate entry 2015-11-22 16:05:51 +01:00
Vincent Petry
ec3166742b Properly join path sections
This prevents double slashes that can mess up path comparisons in some
cases.
2015-11-22 16:05:51 +01:00
Vincent Petry
7ec83fc9fb Fix OC.FileInfo to copy all properties
This makes it possible to also store custom properties passed through
the data object like tags or shareOwner.
2015-11-22 16:05:50 +01:00
Thomas Müller
358858c9e3 Fix undefined HTTP_USER_AGENT 2015-11-22 16:05:50 +01:00