summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into implement_712Lukas Reschke2016-08-15128-258/+1230
|\
| * Merge pull request #862 from nextcloud/us_25767Lukas Reschke2016-08-155-26/+34
| |\
| | * Add PHPdocRoeland Jago Douma2016-08-151-3/+5
| | * missing PHPDocJörn Friedrich Dreyer2016-08-141-0/+1
| | * Type compatabilityJörn Friedrich Dreyer2016-08-141-1/+1
| | * Method is deprecatedJörn Friedrich Dreyer2016-08-141-3/+3
| | * Unreachable statementJörn Friedrich Dreyer2016-08-141-4/+1
| | * Unnecessary fully qualified namesJörn Friedrich Dreyer2016-08-144-17/+25
| * | Merge pull request #882 from nextcloud/use-proper-test-executionLukas Reschke2016-08-158-114/+92
| |\ \
| | * | We have to mock the is_uploaded_file in the OC\Core\Controller namespaceRoeland Jago Douma2016-08-151-8/+10
| | * | Fix mock call in AvatarControllerTestRoeland Jago Douma2016-08-151-12/+12
| | * | Use generated URLLukas Reschke2016-08-151-1/+1
| | * | Fix CheckSetupController testsLukas Reschke2016-08-152-68/+40
| | * | Fix template testLukas Reschke2016-08-151-1/+1
| | * | Fix tests for LoginControllerLukas Reschke2016-08-151-5/+4
| | * | Add reference to current userLukas Reschke2016-08-151-0/+1
| | * | Add new dependencyLukas Reschke2016-08-151-1/+7
| | * | Don't use create mockLukas Reschke2016-08-151-14/+14
| | * | Use proper casingLukas Reschke2016-08-152-6/+4
| * | | Merge pull request #876 from nextcloud/licenceRoeland Jago Douma2016-08-151-2/+7
| |\ \ \ | | |/ / | |/| |
| | * | If there is no copyright notice print comment lineRoeland Jago Douma2016-08-151-1/+6
| | * | Do not licence composer stuffRoeland Jago Douma2016-08-151-1/+1
| * | | Merge pull request #855 from nextcloud/files_drop_capabilityRoeland Jago Douma2016-08-152-0/+3
| |\ \ \ | | |/ / | |/| |
| | * | Add files drop capability for clientsRoeland Jago Douma2016-08-132-0/+3
| * | | [tx-robot] updated from transifexNextcloud bot2016-08-1520-18/+200
| * | | Merge pull request #816 from nextcloud/socialbuttonsMarius Blüm2016-08-147-3/+78
| |\ \ \ | | |_|/ | |/| |
| | * | Do not translate HTMLRoeland Jago Douma2016-08-131-13/+19
| | * | compress images and fix positionJan-Christoph Borchardt2016-08-136-136/+21
| | * | use shorthand for padding valuesJan-Christoph Borchardt2016-08-131-1/+1
| | * | Remove accidentially added lineLukas Reschke2016-08-131-1/+1
| | * | adding rel="noreferrer noopener"Frank Karlitschek2016-08-131-5/+5
| | * | adding social buttonsFrank Karlitschek2016-08-137-4/+188
| | |/
| * / [tx-robot] updated from transifexNextcloud bot2016-08-1410-4/+36
| |/
| * [tx-robot] updated from transifexNextcloud bot2016-08-1340-42/+234
| * Merge pull request #844 from nextcloud/twofactor_mw_excepLukas Reschke2016-08-121-0/+2
| |\
| | * Throw exception if you don't handle itRoeland Jago Douma2016-08-121-0/+2
| * | Merge pull request #837 from nextcloud/when-logged-in-then-just-redirect-to-r...Morris Jobke2016-08-122-21/+132
| |\ \ | | |/ | |/|
| | * Use createMock instead of deprecated getMockLukas Reschke2016-08-111-12/+12
| | * Redirect users when already logged-in on login formLukas Reschke2016-08-112-9/+120
| * | [tx-robot] updated from transifexNextcloud bot2016-08-1244-46/+436
| |/
* | Use MockBuilder instead of createMockLukas Reschke2016-08-1520-63/+63
* | Add unit testsLukas Reschke2016-08-1535-67/+2107
* | satisfy dependencies for files_externalArthur Schiwon2016-08-152-0/+9
* | simplify encryption manager fetching in DIContainerArthur Schiwon2016-08-131-16/+2
* | move mail settings and file handling to additional ones, thus files_external ...Arthur Schiwon2016-08-1312-145/+249
* | change federatedfilesharing css class to followupsection to reduce whitespaceArthur Schiwon2016-08-131-1/+1
* | move systemstags to sharign section, drop collaboration sectionArthur Schiwon2016-08-132-3/+2
* | make updatenotification settings appear as if it is part of the version part ...Arthur Schiwon2016-08-134-4/+11
* | change casing in section display namesArthur Schiwon2016-08-133-5/+5
* | mark current sectionArthur Schiwon2016-08-122-7/+13