| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #333 from nextcloud/sync-master | Lukas Reschke | 2016-07-07 | 120 | -325/+35 |
| |\ | | | | | Sync master | ||||
| | * | Revert "occ web executor (#24957)" | Morris Jobke | 2016-07-07 | 3 | -161/+0 |
| | | | | | | | | | This reverts commit 854352d9a064a1e469ede207493bce44fd41d96c. | ||||
| | * | Merge branch 'master' into sync-master | Morris Jobke | 2016-07-07 | 144 | -563/+707 |
| | |\ | |||||
| | * | | Revert "[tx-robot] updated from transifex" | Morris Jobke | 2016-07-07 | 18 | -240/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3731b2a006eca1e96d4087212a5e779c85a002e4. Revert "[tx-robot] updated from transifex" This reverts commit 94d91113f1206161b00bbc28da00aaf80bcd0a3e. Revert "[tx-robot] updated from transifex" This reverts commit e7cc8bac1e26935ed3bceb2b777659cc72cafdf2. Revert "[tx-robot] updated from transifex" This reverts commit 59fc3ff45a98e305ad65069d31fc78081fa88dc6. Revert "[tx-robot] updated from transifex" This reverts commit 6a89a63d2e5f6d807f6e99823b76f3cfea268c29. Revert "[tx-robot] updated from transifex" This reverts commit b0bad03234329113988d7d9c9cf2613d8f031c5f. | ||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-07-07 | 8 | -2/+10 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-07-06 | 2 | -12/+12 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-07-05 | 2 | -2/+116 |
| | | | | |||||
| | * | | Merge pull request #25240 from owncloud/remove-svg | Morris Jobke | 2016-07-04 | 116 | -163/+34 |
| | |\ \ | | | | | | | | | Remove SVG fallback | ||||
| | | * | | adjusts tests to removal of svg fallback | Hendrik Leppelsack | 2016-07-01 | 1 | -38/+1 |
| | | | | | |||||
| | | * | | remove svg classes | Hendrik Leppelsack | 2016-07-01 | 9 | -20/+20 |
| | | | | | |||||
| | | * | | remove png references in core | Hendrik Leppelsack | 2016-07-01 | 1 | -11/+4 |
| | | | | | |||||
| | | * | | remove png actions, fileicons, etc | Hendrik Leppelsack | 2016-07-01 | 105 | -0/+0 |
| | | | | | |||||
| | | * | | remove javascript png fallback for svg | Hendrik Leppelsack | 2016-07-01 | 1 | -94/+9 |
| | | | | | |||||
| | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-07-04 | 4 | -0/+76 |
| | | | | | |||||
| | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-07-03 | 2 | -6/+12 |
| | | | | | |||||
| | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-07-02 | 4 | -0/+16 |
| | |/ / | |||||
| | * | | Merge pull request #25262 from owncloud/fed-sharing-error | Vincent Petry | 2016-07-01 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | Only save federated share after remote server is notified | ||||
| | | * | | better detect errors in fed sharing response | Robin Appelman | 2016-06-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-07 | 2 | -26/+26 |
| | |_|/ |/| | | |||||
| * | | | Merge pull request #323 from Faldon/database_port | Morris Jobke | 2016-07-07 | 1 | -0/+3 |
| |\ \ \ | | | | | | | | | Added occ install option for database-port | ||||
| | * | | | Changed the input option for database-port to required when parameter was ↵ | Thomas Pulzer | 2016-07-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | provided. Added casting database port to int for input sanitation in pgsql and oci connections. | ||||
| | * | | | Added occ install option for database-port. | Thomas Pulzer | 2016-07-06 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | Extended the database setup to store the database port. Changed the PostgreSQL connection error message for clarification. | ||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-06 | 72 | -266/+254 |
| |/ / / | |||||
| * | | | Changed name of default logfile from owncloud.log to nextcloud.log. | Thomas Pulzer | 2016-07-04 | 2 | -2/+2 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-07-01 | 10 | -8/+512 |
| |\| | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-07-01 | 4 | -0/+122 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-30 | 2 | -2/+12 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-29 | 8 | -8/+356 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-28 | 2 | -0/+24 |
| | | | | |||||
| * | | | Merge pull request #236 from nextcloud/master-sync-upstream | Morris Jobke | 2016-06-28 | 12 | -175/+27 |
| |\ \ \ | | | | | | | | | [Master] sync upstream | ||||
| | * | | | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-27 | 12 | -175/+27 |
| | |\| | | |||||
| | | * | | Merge pull request #25263 from ↵ | Christoph Wurst | 2016-06-27 | 1 | -0/+3 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | owncloud/decryptall-keepencryptionenabledforsingleuser Keep encryption enabled if decrypting for single user | ||||
| | | | * | | Keep encryption enabled if decrypting for single user | Vincent Petry | 2016-06-24 | 1 | -0/+3 |
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When decrypting all files of a single user, the admin usually does not intend encryption to be suddenly disabled for everyone. This fix reenables encryption after decrypting for a single user. Decrypting for all users will still disable encryption globally. | ||||
| | | * | | Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadperms | Vincent Petry | 2016-06-27 | 1 | -1/+1 |
| | | |\ \ | | | | | | | | | | | Add explicit delete permission to link shares | ||||
| | | | * | | Add explicit delete permission to link shares | Vincent Petry | 2016-06-24 | 1 | -1/+1 |
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link shares always allowed deletion, however internally the permissions were stored as 7 which lacked delete permissions. This created an inconsistency in the Webdav permissions. This fix makes sure we include delete permissions in the share permissions, which now become 15. In case a client is still passing 7 for legacy reasons, it gets converted automatically to 15. | ||||
| | | * | | Merge pull request #25129 from owncloud/remove-ie | Vincent Petry | 2016-06-27 | 8 | -181/+9 |
| | | |\ \ | | | | | | | | | | | Remove ie8+9 support | ||||
| | | | * | | remove ie8+9 support | Hendrik Leppelsack | 2016-06-23 | 8 | -181/+9 |
| | | | | | | |||||
| | | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-27 | 2 | -0/+14 |
| | | | | | | |||||
| * | | | | | Migrate logic to dynamic controller | Lukas Reschke | 2016-06-27 | 2 | -1/+2 |
| |/ / / / | | | | | | | | | | | | | Also adds support for having custom login backgrounds | ||||
| * | | | | Merge remote-tracking branch 'upstream/master' into master-upstream-sync | Lukas Reschke | 2016-06-26 | 11 | -4/+200 |
| |\| | | | |||||
| | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-26 | 2 | -2/+30 |
| | | |/ | |/| | |||||
| | * | | Merge pull request #25239 from owncloud/setupchecks-preventreload | Vincent Petry | 2016-06-24 | 1 | -2/+4 |
| | |\ \ | | |/ | |/| | Don't reload page in case of auth errors during setup checks | ||||
| | | * | Don't reload page in case of auth errors during setup checks | Vincent Petry | 2016-06-23 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | If an error occurs during setup checks, do not let the global ajax error handler reload the page. | ||||
| | * | | Init the headers in iedavclient.js | Vincent Petry | 2016-06-22 | 1 | -0/+1 |
| | | | | |||||
| | * | | occ web executor (#24957) | VicDeo | 2016-06-22 | 3 | -0/+161 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial web executor * Fix PHPDoc Fix broken integration test OccControllerTests do not require database access - moch them all! Kill unused sprintf | ||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-22 | 4 | -0/+4 |
| | |/ | |||||
| * | | to Nextcloud | Joachim Sokolowski | 2016-06-22 | 6 | -22/+22 |
| | | | |||||
| * | | Fix translation strings | Morris Jobke | 2016-06-22 | 88 | -88/+88 |
| | | | |||||
| * | | Merge pull request #196 from JSoko/patch-2 | Morris Jobke | 2016-06-22 | 1 | -1/+1 |
| |\ \ | | | | | | | singleuser.user.php -> nextcloud | ||||
| | * | | singleuser.user.php -> nextcloud | Joachim Sokolowski | 2016-06-22 | 1 | -1/+1 |
| | | | | | | | | | | Changed to nextcloud | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |