Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Restructure config.sample.php of master | RealRancor | 2015-10-13 | 1 | -31/+31 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-13 | 26 | -12/+86 |
* | Merge pull request #19723 from owncloud/strip-directory | Thomas Müller | 2015-10-13 | 2 | -5/+49 |
|\ | |||||
| * | Strip directory from scriptName | Lukas Reschke | 2015-10-12 | 2 | -5/+49 |
* | | Merge pull request #19719 from owncloud/edit-icon | Thomas Müller | 2015-10-13 | 3 | -0/+8 |
|\ \ | |/ |/| | |||||
| * | add specific edit icon | Jan-Christoph Borchardt | 2015-10-13 | 3 | -0/+8 |
|/ | |||||
* | Merge pull request #19683 from owncloud/repair-donotrepairfoldermimetypes | Thomas Müller | 2015-10-12 | 2 | -2/+28 |
|\ | |||||
| * | Do not update mime types for folders with extension | Vincent Petry | 2015-10-09 | 2 | -2/+28 |
* | | Merge pull request #19708 from owncloud/revert-19628-files-canceluploaddebounce | Thomas Müller | 2015-10-12 | 1 | -5/+6 |
|\ \ | |||||
| * | | Revert "Debounce cancel upload message" | Thomas Müller | 2015-10-12 | 1 | -5/+6 |
* | | | Merge pull request #19703 from owncloud/revert-19702-trash-deletesectionposition | Thomas Müller | 2015-10-12 | 3 | -18/+14 |
|\ \ \ | |||||
| * | | | Revert "Move trashbin specific CSS that modifies sidebar" | Thomas Müller | 2015-10-12 | 3 | -18/+14 |
* | | | | Merge pull request #19704 from owncloud/fix_17997 | Björn Schießle | 2015-10-12 | 2 | -0/+27 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | also detect files in a .part folder as part file | Bjoern Schiessle | 2015-10-12 | 2 | -0/+27 |
|/ / / | |||||
* | | | Merge pull request #19657 from owncloud/setup-transport | Thomas Müller | 2015-10-12 | 2 | -2/+5 |
|\ \ \ | |||||
| * | | | Setup sendmail transport | Lukas Reschke | 2015-10-08 | 2 | -2/+5 |
* | | | | Merge pull request #19702 from owncloud/trash-deletesectionposition | Raghu Nayyar | 2015-10-12 | 3 | -14/+18 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Move trashbin specific CSS that modifies sidebar | Vincent Petry | 2015-10-12 | 3 | -14/+18 |
|/ / / | |||||
* | | | Merge pull request #19628 from owncloud/files-canceluploaddebounce | Robin Appelman | 2015-10-12 | 1 | -6/+5 |
|\ \ \ | |||||
| * | | | Debounce cancel upload message | Vincent Petry | 2015-10-07 | 1 | -6/+5 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-12 | 12 | -22/+36 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-11 | 20 | -26/+182 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-10 | 64 | -188/+94 |
* | | | | Merge pull request #19585 from owncloud/enc_improve_introduction | Jörn Friedrich Dreyer | 2015-10-09 | 1 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | improved explanation of server side encryption | Bjoern Schiessle | 2015-10-06 | 1 | -4/+4 |
* | | | | | Merge pull request #19670 from owncloud/objectstore_filesystem_tests | Jörn Friedrich Dreyer | 2015-10-09 | 1 | -3/+12 |
|\ \ \ \ \ | |||||
| * | | | | | adjust filesystem tests to objectstore | Jörn Friedrich Dreyer | 2015-10-09 | 1 | -3/+12 |
* | | | | | | Merge pull request #19643 from owncloud/public-download-spinner | Thomas Müller | 2015-10-09 | 1 | -1/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Set download cookie on public download | Vincent Petry | 2015-10-08 | 1 | -1/+15 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #19654 from owncloud/db-locking-no-scan-transaction | Robin Appelman | 2015-10-09 | 1 | -2/+8 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Dont use a transaction in the scanner while using db based locking | Robin Appelman | 2015-10-08 | 1 | -2/+8 |
| |/ / / / | |||||
* | | | | | Merge pull request #18586 from owncloud/ie8-uploadavatar | Thomas Müller | 2015-10-09 | 8 | -34/+111 |
|\ \ \ \ \ | |||||
| * | | | | | Use injected request | Vincent Petry | 2015-10-09 | 2 | -2/+2 |
| * | | | | | fix IE8 user agent detection | Morris Jobke | 2015-10-09 | 4 | -16/+3 |
| * | | | | | Fix uploading avatar and root certs in IE8 | Vincent Petry | 2015-10-09 | 8 | -34/+124 |
|/ / / / / | |||||
* | / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-09 | 24 | -2/+66 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #19034 from owncloud/http-request-warning | Thomas Müller | 2015-10-08 | 2 | -1/+24 |
|\ \ \ \ | |||||
| * | | | | Unit test for preventing warning decoding content | Robin McCorkell | 2015-09-23 | 1 | -0/+21 |
| * | | | | Merge branch 'master' into http-request-warning | Lukas Reschke | 2015-09-15 | 10 | -0/+64 |
| |\ \ \ \ | |||||
| * | | | | | Prevent warning decoding content | Robin McCorkell | 2015-09-14 | 1 | -1/+3 |
* | | | | | | Merge pull request #19651 from owncloud/recursive_mkdir_for_objectstores | Thomas Müller | 2015-10-08 | 2 | -18/+22 |
|\ \ \ \ \ \ | |||||
| * | | | | | | make mkdir recursive, add phpdoc to api | Jörn Friedrich Dreyer | 2015-10-08 | 2 | -18/+22 |
* | | | | | | | Merge pull request #19664 from owncloud/check-only-if-s2s-or-appstore-is-enabled | Thomas Müller | 2015-10-08 | 2 | -17/+127 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Don't perform checks for outdated TLS libs when no internet connection | Lukas Reschke | 2015-10-08 | 2 | -15/+125 |
| * | | | | | | | Fix comment syntax | Lukas Reschke | 2015-10-08 | 1 | -2/+2 |
* | | | | | | | | Merge pull request #19655 from owncloud/integration-whitespace-fixes | Thomas Müller | 2015-10-08 | 1 | -15/+15 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix whitespace issues in integration tests | Morris Jobke | 2015-10-08 | 1 | -15/+15 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #19616 from owncloud/ocs_provisioning_api_checking_lists | Thomas Müller | 2015-10-08 | 2 | -1/+64 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | changing indentation, vertical elements and previous existance of users and g... | Sergio Bertolin | 2015-10-07 | 2 | -23/+29 |
| * | | | | | | ordering arrays before comparing | Sergio Bertolin | 2015-10-07 | 1 | -2/+2 |