summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-07-0672-266/+254
|
* Changed name of default logfile from owncloud.log to nextcloud.log.Thomas Pulzer2016-07-042-2/+2
|
* Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-07-0110-8/+512
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2016-07-014-0/+122
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-302-2/+12
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-298-8/+356
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-282-0/+24
| |
* | Merge pull request #236 from nextcloud/master-sync-upstreamMorris Jobke2016-06-2812-175/+27
|\ \ | | | | | | [Master] sync upstream
| * | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2712-175/+27
| |\|
| | * Merge pull request #25263 from ↵Christoph Wurst2016-06-271-0/+3
| | |\ | | | | | | | | | | | | | | | | owncloud/decryptall-keepencryptionenabledforsingleuser Keep encryption enabled if decrypting for single user
| | | * Keep encryption enabled if decrypting for single userVincent Petry2016-06-241-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-includedeletewithuploadpermsVincent Petry2016-06-271-1/+1
| | |\ \ | | | | | | | | | | Add explicit delete permission to link shares
| | | * | Add explicit delete permission to link sharesVincent Petry2016-06-241-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-ieVincent Petry2016-06-278-181/+9
| | |\ \ | | | | | | | | | | Remove ie8+9 support
| | | * | remove ie8+9 supportHendrik Leppelsack2016-06-238-181/+9
| | | | |
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-272-0/+14
| | | | |
* | | | | Migrate logic to dynamic controllerLukas Reschke2016-06-272-1/+2
|/ / / / | | | | | | | | | | | | Also adds support for having custom login backgrounds
* | | | Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-2611-4/+200
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-262-2/+30
| | |/ | |/|
| * | Merge pull request #25239 from owncloud/setupchecks-preventreloadVincent Petry2016-06-241-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 checksVincent Petry2016-06-231-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.jsVincent Petry2016-06-221-0/+1
| | |
| * | occ web executor (#24957)VicDeo2016-06-223-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 transifexJenkins for ownCloud2016-06-224-0/+4
| |/
* | to NextcloudJoachim Sokolowski2016-06-226-22/+22
| |
* | Fix translation stringsMorris Jobke2016-06-2288-88/+88
| |
* | Merge pull request #196 from JSoko/patch-2Morris Jobke2016-06-221-1/+1
|\ \ | | | | | | singleuser.user.php -> nextcloud
| * | singleuser.user.php -> nextcloudJoachim Sokolowski2016-06-221-1/+1
| | | | | | | | | Changed to nextcloud
* | | changed to nextcloudJoachim Sokolowski2016-06-221-1/+1
| | |
* | | nextcloud serverJoachim Sokolowski2016-06-221-1/+1
|/ / | | | | | | nextcloud server
* | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2114-16/+133
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-202-0/+36
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-176-2/+26
| |
| * Prevent the advanced options toggle in the setup from acting as a linkRobin Appelman2016-06-161-1/+2
| |
| * fix grouped input fields, make sure they take precedenceJan-Christoph Borchardt2016-06-161-13/+13
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-154-0/+56
| |
* | make loading spinner thicker and color lighterJan-Christoph Borchardt2016-06-201-4/+4
| |
* | Merge pull request #83 from nextcloud/file-drop-highlightMarius Blüm2016-06-151-0/+4
|\ \ | | | | | | File drop highlight
| * | store icons in classVincent Chan2016-06-151-0/+4
| | |
* | | fix setup page strengthifyMorris Jobke2016-06-154-10/+4
| | | | | | | | | | | | * fixes #105
* | | Update strengthify to 0.5.1Morris Jobke2016-06-153-116/+205
| | |
* | | Change name of the product in update messageMorris Jobke2016-06-147-14/+14
| | | | | | | | | | | | | | | * also update all german translations * fixes #96
* | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160614Arthur Schiwon2016-06-144-0/+4
|\ \ \ | |/ / |/| / | |/
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-134-0/+4
| |
* | Merge pull request #57 from nextcloud/fdrop-templateLukas Reschke2016-06-131-2/+2
|\ \ | | | | | | smaller files drop fixes
| * | smaller files drop fixesArthur Schiwon2016-06-111-2/+2
| | | | | | | | | | | | | | | | | | * fix infinite spinner on blacklisted files * move HTML to template * indentation
* | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611Arthur Schiwon2016-06-1120-5/+137
|\ \ \ | | |/ | |/|
| * | Allow empty host when installing on oracle via CLI (#25034)Jörn Friedrich Dreyer2016-06-101-1/+6
| | |
| * | Merge pull request #25048 from owncloud/email-login-leakVincent Petry2016-06-101-2/+3
| |\ \ | | | | | | | | Do not leak the login name
| | * | Do not leak the login name - fixes #25047Thomas Müller2016-06-091-2/+3
| | | |