Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 | ||||
* | | | changed to nextcloud | Joachim Sokolowski | 2016-06-22 | 1 | -1/+1 |
| | | | |||||
* | | | nextcloud server | Joachim Sokolowski | 2016-06-22 | 1 | -1/+1 |
|/ / | | | | | | | nextcloud server | ||||
* | | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-21 | 14 | -16/+133 |
|\| | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-20 | 2 | -0/+36 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-17 | 6 | -2/+26 |
| | | |||||
| * | Prevent the advanced options toggle in the setup from acting as a link | Robin Appelman | 2016-06-16 | 1 | -1/+2 |
| | | |||||
| * | fix grouped input fields, make sure they take precedence | Jan-Christoph Borchardt | 2016-06-16 | 1 | -13/+13 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-15 | 4 | -0/+56 |
| | | |||||
* | | make loading spinner thicker and color lighter | Jan-Christoph Borchardt | 2016-06-20 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #83 from nextcloud/file-drop-highlight | Marius Blüm | 2016-06-15 | 1 | -0/+4 |
|\ \ | | | | | | | File drop highlight | ||||
| * | | store icons in class | Vincent Chan | 2016-06-15 | 1 | -0/+4 |
| | | | |||||
* | | | fix setup page strengthify | Morris Jobke | 2016-06-15 | 4 | -10/+4 |
| | | | | | | | | | | | | * fixes #105 | ||||
* | | | Update strengthify to 0.5.1 | Morris Jobke | 2016-06-15 | 3 | -116/+205 |
| | | | |||||
* | | | Change name of the product in update message | Morris Jobke | 2016-06-14 | 7 | -14/+14 |
| | | | | | | | | | | | | | | | * also update all german translations * fixes #96 | ||||
* | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160614 | Arthur Schiwon | 2016-06-14 | 4 | -0/+4 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-13 | 4 | -0/+4 |
| | | |||||
* | | Merge pull request #57 from nextcloud/fdrop-template | Lukas Reschke | 2016-06-13 | 1 | -2/+2 |
|\ \ | | | | | | | smaller files drop fixes | ||||
| * | | smaller files drop fixes | Arthur Schiwon | 2016-06-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | * fix infinite spinner on blacklisted files * move HTML to template * indentation | ||||
* | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 | Arthur Schiwon | 2016-06-11 | 20 | -5/+137 |
|\ \ \ | | |/ | |/| | |||||
| * | | Allow empty host when installing on oracle via CLI (#25034) | Jörn Friedrich Dreyer | 2016-06-10 | 1 | -1/+6 |
| | | | |||||
| * | | Merge pull request #25048 from owncloud/email-login-leak | Vincent Petry | 2016-06-10 | 1 | -2/+3 |
| |\ \ | | | | | | | | | Do not leak the login name | ||||
| | * | | Do not leak the login name - fixes #25047 | Thomas Müller | 2016-06-09 | 1 | -2/+3 |
| | | | |