Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Support different server ports - defined by EXECUTOR_NUMBER | Thomas Müller | 2015-09-29 | 3 | -8/+14 |
| | |||||
* | added delete user test | Sergio Bertolin | 2015-09-29 | 1 | -0/+8 |
| | |||||
* | Use ci profile | Thomas Müller | 2015-09-29 | 1 | -1/+1 |
| | |||||
* | Use fixed port for now | Thomas Müller | 2015-09-29 | 1 | -5/+6 |
| | |||||
* | Test user creation | Thomas Müller | 2015-09-29 | 2 | -45/+110 |
| | |||||
* | require autoload.php | Thomas Müller | 2015-09-29 | 1 | -6/+1 |
| | |||||
* | Adding phpunit for the assertions | Thomas Müller | 2015-09-29 | 1 | -0/+1 |
| | |||||
* | Adding missing files | Thomas Müller | 2015-09-29 | 2 | -0/+94 |
| | |||||
* | First integration tests for provisioning api | Thomas Müller | 2015-09-29 | 5 | -0/+59 |
| | |||||
* | Merge pull request #17601 from owncloud/publicwebdav-allowajaxwhendisabled | Thomas Müller | 2015-09-29 | 1 | -1/+2 |
|\ | | | | | Allow ajax requests on public webdav interface | ||||
| * | Allow ajax requests on public webdav interface | Vincent Petry | 2015-09-22 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | Whenever outgoing shares are disabled, still allow ajax requests to make it possible to use the Webdav interface in the public link page. Please note that disabling outgoing shares isn't strong anyway as someone could abuse the ajax endpoints to access files anyway. To properly disable remote sharing, public link sharing must be disabled too. | ||||
* | | Merge pull request #19418 from owncloud/fix-parsehashquery | Thomas Müller | 2015-09-29 | 1 | -3/+1 |
|\ \ | | | | | | | Consider both hash params and query when parsing URL | ||||
| * | | Consider both hash params and query when parsing URL | Vincent Petry | 2015-09-28 | 1 | -3/+1 |
| | | | |||||
* | | | Merge pull request #19367 from owncloud/lock-transaction-no-log | Thomas Müller | 2015-09-29 | 1 | -4/+0 |
|\ \ \ | | | | | | | | | remove warning when trying to get a lock while in transaction | ||||
| * | | | remove warning when trying to get a lock while in transaction | Robin Appelman | 2015-09-25 | 1 | -4/+0 |
| | | | | |||||
* | | | | Merge pull request #19411 from owncloud/files-sidebar-shareloadspinner | Thomas Müller | 2015-09-29 | 2 | -5/+28 |
|\ \ \ \ | | | | | | | | | | | Show loading spinner for first fetch of shares | ||||
| * | | | | Show loading spinner for first fetch of shares | Vincent Petry | 2015-09-28 | 2 | -5/+28 |
| | |/ / | |/| | | | | | | | | | | | | | | Whenever the sidebar first loads shares, show a spinner instead of an empty content | ||||
* | | | | Merge pull request #19417 from owncloud/files-upload-checkconflictbeforeupload | Thomas Müller | 2015-09-29 | 2 | -22/+64 |
|\ \ \ \ | | | | | | | | | | | Show conflict dialog before upload when possible | ||||
| * | | | | Show conflict dialog before upload when possible | Vincent Petry | 2015-09-28 | 2 | -22/+64 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When uploading files, first check if the files exist in the current file list. For the ones that do, show a conflict dialog. For the rest, upload directly. If the upload operation detects a conflict on the server side, it will also continue populating the conflict dialog. From now on, server side conflict can only occur if someone concurrently uploaded a file into the same folder but the current user hasn't refreshed the list yet. | ||||
* | | | | Merge pull request #19409 from owncloud/files-sidebar-hiding-tabs | Thomas Müller | 2015-09-29 | 4 | -18/+136 |
|\ \ \ \ | | | | | | | | | | | Hide sidebar tab headers conditionally | ||||
| * | | | | Hide sidebar tab headers conditionally | Vincent Petry | 2015-09-28 | 4 | -18/+136 |
| |/ / / | | | | | | | | | | | | | | | | | Added canDisplay() in DetailsTabView that should return false if the tab header of this tab must be hidden | ||||
* | | | | Merge pull request #19426 from owncloud/fix-legacy-CSP-for-images | Thomas Müller | 2015-09-29 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Whitelist "data:" in legacy CSP headers | ||||
| * | | | | Fix CSP for images for legacy apps | Olivier Paroz | 2015-09-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Fixes #19425 | ||||
* | | | | | Merge pull request #19431 from phil-davis/r2 | Lukas Reschke | 2015-09-29 | 3 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Session closed exception wording | ||||
| * | | | | | Session closed exception wording | Phil Davis | 2015-09-29 | 3 | -3/+3 |
|/ / / / / | | | | | | | | | | | | | | | | and a small comment typo | ||||
* / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-29 | 18 | -4/+32 |
|/ / / / | |||||
* | | | | Merge pull request #19408 from owncloud/fix-trashbin-checkbox | Robin Appelman | 2015-09-28 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix checkbox in trashbin | ||||
| * | | | | fix checkbox in trashbin | Hendrik Leppelsack | 2015-09-28 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #19413 from owncloud/share-nopermission-link | Vincent Petry | 2015-09-28 | 2 | -30/+13 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Still show share link when recipient but no share permission | ||||
| * | | | | Still show share link when recipient but no share permission | Vincent Petry | 2015-09-28 | 2 | -30/+13 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible for the recipient to still trigger the sidebar and share tab to see information about the share. In the case where the file is not shared and no permissions exists, no action icon will be displayed. | ||||
* | | | | Merge pull request #18548 from owncloud/repair-mimetype-limitversion | Thomas Müller | 2015-09-28 | 3 | -25/+54 |
|\ \ \ \ | | | | | | | | | | | Repair mime types only when upgrading from OC 8.0 | ||||
| * | | | | Repair mime types only when upgrading from OC 8.0 | Vincent Petry | 2015-09-23 | 3 | -25/+54 |
| | | | | | |||||
* | | | | | Merge pull request #19404 from owncloud/files-sidebar-sorttabs | Thomas Müller | 2015-09-28 | 6 | -3/+31 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix tabs order in files sidebar | ||||
| * | | | | | Fix tabs order in files sidebar | Vincent Petry | 2015-09-28 | 6 | -3/+31 |
| | | | | | | |||||
* | | | | | | Merge pull request #19402 from owncloud/public-recognizeauthsession | Thomas Müller | 2015-09-28 | 1 | -1/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Allow public webdav auth to recognize sesssion | ||||
| * | | | | | | Allow public auth to recognize sesssion | Vincent Petry | 2015-09-28 | 1 | -1/+4 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a public link password has been input, its auth is stored in the session. This fix makes it possible to recognize the session when using public webdav from the files UI. | ||||
* | | | | | | Merge pull request #19401 from owncloud/files-actionsorder | Thomas Müller | 2015-09-28 | 4 | -0/+50 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Fix order of actions in the files actions menu | ||||
| * | | | | | Fix order of actions in the files actions menu | Vincent Petry | 2015-09-28 | 4 | -0/+50 |
| |/ / / / | |||||
* | | | | | Merge pull request #19318 from owncloud/tarstreamer | Thomas Müller | 2015-09-28 | 3 | -63/+158 |
|\ \ \ \ \ | | | | | | | | | | | | | Stream zip or tar | ||||
| * | | | | | Updating submodule | Thomas Müller | 2015-09-28 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | Updating TarStreamer to v0.1-beta3 | Thomas Müller | 2015-09-28 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | Adding ownCloud/TarStreamer | Thomas Müller | 2015-09-28 | 2 | -1/+1 |
| | | | | | | |||||
| * | | | | | Uniform behavour for tar and zip | Victor Dubiniuk | 2015-09-28 | 1 | -1/+6 |
| | | | | | | |||||
| * | | | | | More corrections | Victor Dubiniuk | 2015-09-28 | 2 | -11/+7 |
| | | | | | | |||||
| * | | | | | Add namespace. Fix broken zip | Victor Dubiniuk | 2015-09-28 | 2 | -5/+8 |
| | | | | | | |||||
| * | | | | | Add PHpdoc | Victor Dubiniuk | 2015-09-28 | 1 | -6/+40 |
| | | | | | | |||||
| * | | | | | Introduce streamer | Victor Dubiniuk | 2015-09-28 | 2 | -63/+120 |
| | | | | | | |||||
| * | | | | | Add submodule dependency | Victor Dubiniuk | 2015-09-28 | 1 | -0/+0 |
|/ / / / / | |||||
* | | | | | Merge pull request #18469 from owncloud/ldap-batch-read-attrs-ng | Thomas Müller | 2015-09-28 | 10 | -101/+516 |
|\ \ \ \ \ | | | | | | | | | | | | | read all relevant user attributes on login and user search, in one qu… | ||||
| * | | | | | do not throw exception when no attribute is specified | Arthur Schiwon | 2015-09-23 | 2 | -1/+107 |
| | | | | | |