summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | invert colors of favicons to match header and log in site, white on blueJan-Christoph Borchardt2016-06-106-3/+3
* | | Single block for PHP Mod not installedWilliam Bargent2016-06-101-3/+2
* | | Downstream 2016-06-09Arthur Schiwon2016-06-0913-19/+65
|\ \ \ | | |/ | |/|
| * | Fix the FIXME (#25022)Joas Schilling2016-06-091-2/+1
| * | Merge pull request #25014 from owncloud/admin-datadircheck-fixVincent Petry2016-06-092-3/+3
| |\ \
| | * | Use temporary htaccesstest.txt for data dir security checkVincent Petry2016-06-072-3/+3
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-092-0/+2
| * | | Merge pull request #25027 from owncloud/fix-22746-narrowtooltipVincent Petry2016-06-081-1/+1
| |\ \ \
| | * | | Added width of the tooltipSergio Bertolín2016-06-081-1/+1
| | |/ /
| * | | Merge pull request #25011 from owncloud/issue-24745-allow-to-cancel-2faVincent Petry2016-06-085-1/+21
| |\ \ \
| | * | | Allow to cancel 2FA after loginJoas Schilling2016-06-075-1/+21
| | |/ /
| * | | Merge pull request #24991 from owncloud/2fa-do-not-generate-tokenVincent Petry2016-06-082-12/+27
| |\ \ \
| | * | | do not generate device token if 2FA is enable for userChristoph Wurst2016-06-072-12/+27
| | |/ /
| * | | Merge pull request #24992 from owncloud/fix_decrypt_messageVincent Petry2016-06-081-1/+10
| |\ \ \
| | * | | Fixed reviewsSergio Bertolín2016-06-071-2/+2
| | * | | Comments fixeddavitol2016-06-061-3/+2
| | * | | Fix Decrypt message via occdavitol2016-06-061-1/+11