aboutsummaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #236 from nextcloud/master-sync-upstreamMorris Jobke2016-06-2812-175/+27
|\
| * Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2712-175/+27
| |\
| | * Merge pull request #25263 from owncloud/decryptall-keepencryptionenabledforsi...Christoph Wurst2016-06-271-0/+3
| | |\
| | | * Keep encryption enabled if decrypting for single userVincent Petry2016-06-241-0/+3
| | * | Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadpermsVincent Petry2016-06-271-1/+1
| | |\ \
| | | * | Add explicit delete permission to link sharesVincent Petry2016-06-241-1/+1
| | | |/
| | * | Merge pull request #25129 from owncloud/remove-ieVincent Petry2016-06-278-181/+9
| | |\ \
| | | * | 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
|/ / / /
* | | | 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 checksVincent Petry2016-06-231-2/+4
| * | Init the headers in iedavclient.jsVincent Petry2016-06-221-0/+1
| * | occ web executor (#24957)VicDeo2016-06-223-0/+161
| * | [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 -> nextcloudJoachim Sokolowski2016-06-221-1/+1
* | | changed to nextcloudJoachim Sokolowski2016-06-221-1/+1
* | | nextcloud serverJoachim Sokolowski2016-06-221-1/+1
|/ /
* | 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
|\ \
| * | store icons in classVincent Chan2016-06-151-0/+4
* | | fix setup page strengthifyMorris Jobke2016-06-154-10/+4
* | | Update strengthify to 0.5.1Morris Jobke2016-06-153-116/+205
* | | Change name of the product in update messageMorris Jobke2016-06-147-14/+14
* | | 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 fixesArthur Schiwon2016-06-111-2/+2
* | | 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 - fixes #25047Thomas Müller2016-06-091-2/+3
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-1018-2/+128
| |/ /
* | | Upload progress nextcloud blueWilliam Bargent2016-06-111-1/+1
* | | Sets notification background to whiteWilliam Bargent2016-06-111-1/+2
| |/ |/|
* | Merge pull request #19 from nextcloud/files-dropLukas Reschke2016-06-104-4/+59
|\ \
| * | Fix indentationLukas Reschke2016-06-091-16/+16
| * | Add fancy layoutLukas Reschke2016-06-092-2/+2
| * | add hide file list optionBjoern Schiessle2016-06-092-5/+60