Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-24 | 398 | -2570/+832 |
| | |||||
* | Merge pull request #20622 from owncloud/comments-dbscheme | Thomas Müller | 2015-11-23 | 1 | -0/+151 |
|\ | | | | | DB scheme for Comments table, resolves #20265 | ||||
| * | DB scheme for Comments table, resolves #20265 | Arthur Schiwon | 2015-11-20 | 1 | -0/+151 |
| | | |||||
* | | Merge pull request #20684 from owncloud/more-time | Thomas Müller | 2015-11-23 | 1 | -1/+3 |
|\ \ | | | | | | | webdav docker tests - wait at least 5 seconds after the full startup | ||||
| * | | webdav docker tests - wait at least 5 seconds after the full startup | Morris Jobke | 2015-11-23 | 1 | -1/+3 |
| | | | |||||
* | | | Merge pull request #20587 from ↵ | Thomas Müller | 2015-11-23 | 3 | -19/+262 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/sharing-api-integration-tests-roelandcases Requested sharing API test cases. | ||||
| * | | | Added test case about trying to reshare a file with more permissions | Sergio Bertolin | 2015-11-20 | 2 | -9/+28 |
| | | | | |||||
| * | | | Making webdav path configurable | Sergio Bertolin | 2015-11-20 | 3 | -9/+23 |
| | | | | |||||
| * | | | modified makedavrequest to return response | Sergio Bertolin | 2015-11-20 | 1 | -3/+4 |
| | | | | |||||
| * | | | added test about resharing | Sergio Bertolin | 2015-11-19 | 2 | -10/+31 |
| | | | | |||||
| * | | | Added test and logic for deleting all group shares | Sergio Bertolin | 2015-11-19 | 2 | -2/+27 |
| | | | | |||||
| * | | | Added test for shared_with_me parameter | Sergio Bertolin | 2015-11-19 | 2 | -1/+22 |
| | | | | |||||
| * | | | Added some requirements for first test case | Sergio Bertolin | 2015-11-19 | 3 | -8/+150 |
| | | | | |||||
* | | | | Merge pull request #20609 from owncloud/dav-donotauththroughajax | Thomas Müller | 2015-11-23 | 2 | -2/+41 |
|\ \ \ \ | | | | | | | | | | | Do not authenticate over ajax Webdav | ||||
| * | | | | Do not authenticate over ajax | Vincent Petry | 2015-11-23 | 2 | -2/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | Merge pull request #20679 from owncloud/fixphpdoc | Thomas Müller | 2015-11-23 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | p() supports string as argument | ||||
| * | | | | | p() supports string as argument | Morris Jobke | 2015-11-23 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #20617 from owncloud/fix-usage-of-lastInsertId | Thomas Müller | 2015-11-23 | 6 | -62/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | lastInsertId() is properly working with Oracle if the table name is p… | ||||
| * | | | | | Throw an exception in case no table name is passed into lastInsertId of the ↵ | Thomas Müller | 2015-11-23 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Oracle adapter | ||||
| * | | | | | lastInsertId() is properly working with Oracle if the table name is properly ↵ | Thomas Müller | 2015-11-23 | 4 | -60/+8 |
| | |/ / / | |/| | | | | | | | | | | | | | passed in | ||||
* | | | | | Merge pull request #20543 from owncloud/share2.0_fix_hooks | Thomas Müller | 2015-11-23 | 5 | -260/+503 |
|\ \ \ \ \ | | | | | | | | | | | | | Move hook and delete children logic to share manager | ||||
| * | | | | | [Sharing 2.0] Move hook and delete children logic to share manager | Roeland Jago Douma | 2015-11-23 | 5 | -260/+503 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make sure hooks are always fired and child entries are always cleaned. This logic is moved to the share manager. * Updated unit tests | ||||
* | | | | | Merge pull request #20577 from owncloud/notifications-datetime-timestamp | Thomas Müller | 2015-11-23 | 3 | -47/+58 |
|\ \ \ \ \ | |/ / / / |/| | | | | Use a DateTime object instead of a timestamp | ||||
| * | | | | Use a DateTime object instead of a timestamp | Joas Schilling | 2015-11-23 | 3 | -47/+58 |
| | | | | | |||||
* | | | | | Merge pull request #20222 from owncloud/federated_sharing_auto_complete | Thomas Müller | 2015-11-23 | 28 | -7/+3086 |
|\ \ \ \ \ | |/ / / / |/| | | | | federated sharing auto-complete, first step | ||||
| * | | | | unit tests | Björn Schießle | 2015-11-20 | 7 | -17/+549 |
| | | | | | |||||
| * | | | | fixing OCI and others | Thomas Müller | 2015-11-19 | 5 | -20/+9 |
| | | | | | |||||
| * | | | | make sure that both server don't try to exchange the shared secret in parallel | Björn Schießle | 2015-11-19 | 3 | -32/+79 |
| | | | | | |||||
| * | | | | add option to auto add servers to the list of trusted servers once a ↵ | Björn Schießle | 2015-11-19 | 9 | -8/+67 |
| | | | | | | | | | | | | | | | | | | | | federated share was created and accepted successfully | ||||
| * | | | | add status to server list | Björn Schießle | 2015-11-19 | 4 | -5/+19 |
| | | | | | |||||
| * | | | | change 'cronstatus' to 'status' so that it can be used in other apps too | Björn Schießle | 2015-11-19 | 2 | -5/+5 |
| | | | | | |||||
| * | | | | add federation to shipped.json | Björn Schießle | 2015-11-19 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | exchange shared secret | Björn Schießle | 2015-11-19 | 12 | -119/+1052 |
| | | | | | |||||
| * | | | | added app "federation", allows you to connect ownClouds and exchange user lists | Björn Schießle | 2015-11-19 | 19 | -1/+1505 |
| | | | | | |||||
* | | | | | Merge pull request #20623 from owncloud/app-list-enhancements | Thomas Müller | 2015-11-23 | 1 | -0/+17 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Add cmdline key to show shipped/non-shipped apps only | ||||
| * | | | | Add cmdline key to show shipped/non-shipped apps only | Victor Dubiniuk | 2015-11-23 | 1 | -0/+17 |
| | | | | | |||||
* | | | | | Merge pull request #16902 from owncloud/jsocclient | Thomas Müller | 2015-11-23 | 58 | -1620/+4134 |
|\ \ \ \ \ | |/ / / / |/| | | | | Web UI uses Webdav instead of ajax/* calls | ||||
| * | | | | Update app version for Webdav impl of files GUI | Vincent Petry | 2015-11-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make sure the cached JS gets properly updated. Also, since this is a bigger change it also qualifies for a version increase :-) | ||||
| * | | | | also match ie11 with Request::USER_AGENT_IE | Robin Appelman | 2015-11-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Now using IE8 workaround of davclient.js for all IE versions | Vincent Petry | 2015-11-22 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | Patch for davclient.js for Firefox | Vincent Petry | 2015-11-22 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | Send download token as cookie to tell the UI that it started | Vincent Petry | 2015-11-22 | 1 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Fix issue when renaming creates a separate entry | Vincent Petry | 2015-11-22 | 1 | -8/+5 |
| | | | | | |||||
| * | | | | Properly join path sections | Vincent Petry | 2015-11-22 | 5 | -11/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This prevents double slashes that can mess up path comparisons in some cases. | ||||
| * | | | | Fix OC.FileInfo to copy all properties | Vincent Petry | 2015-11-22 | 1 | -25/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to also store custom properties passed through the data object like tags or shareOwner. | ||||
| * | | | | Fix undefined HTTP_USER_AGENT | Thomas Müller | 2015-11-22 | 2 | -8/+28 |
| | | | | | |||||
| * | | | | Update davclient.js | Vincent Petry | 2015-11-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Use oc:fileid property instead of oc:id | Vincent Petry | 2015-11-22 | 2 | -19/+5 |
| | | | | | |||||
| * | | | | Fix port issue - options.host already has the port attached | Thomas Müller | 2015-11-22 | 3 | -22/+6 |
| | | | | | |||||
| * | | | | Fix js file load order | Thomas Müller | 2015-11-22 | 1 | -2/+2 |
| | | | | |