summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix setup page strengthifyMorris Jobke2016-06-154-10/+4
* Update strengthify to 0.5.1Morris Jobke2016-06-153-116/+205
* Merge pull request #94 from nextcloud/ci-integration-testsMorris Jobke2016-06-153-0/+18
|\
| * Remove duplicate data folderLukas Reschke2016-06-151-1/+1
| * add temporary cleanup step for CIMorris Jobke2016-06-141-0/+1
| * fix integration tests for new admin_audit appMorris Jobke2016-06-141-0/+1
| * Add integration testsMorris Jobke2016-06-142-0/+16
* | Merge pull request #97 from nextcloud/update-message-fixMarius Blüm2016-06-147-14/+14
|\ \ | |/ |/|
| * Change name of the product in update messageMorris Jobke2016-06-147-14/+14
|/
* Merge pull request #90 from nextcloud/improved-autotestBjörn Schießle2016-06-141-2/+11
|\
| * allow to execute multiple tests in a directory at onceBjoern Schiessle2016-06-141-2/+11
* | Merge pull request #85 from nextcloud/downstream-160614Marius Blüm2016-06-1468-26/+218
|\ \
| * \ Merge branch 'master' of https://github.com/owncloud/core into downstream-160614Arthur Schiwon2016-06-1468-26/+218
| |\ \
| | * | Use proper namespaces - fixes #25078 (#25079)Thomas Müller2016-06-131-1/+2
| | * | [tx-robot] updated from transifexJenkins for ownCloud2016-06-1364-20/+188
| | * | fail hard if 2fa provider can not be loaded (#25061)Christoph Wurst2016-06-132-4/+27
| | * | Fix typo (found by codespell) (#25073)Stefan Weil2016-06-131-1/+1
* | | | Merge pull request #89 from nextcloud/test-whether-+1-works-in-utf-8Björn Schießle2016-06-141-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Add :+1: in UTF-8Lukas Reschke2016-06-141-1/+1
|/ / /
* | | Merge pull request #61 from nextcloud/this-is-nextcloudMorris Jobke2016-06-131-18/+9
|\ \ \
| * | | update email, remove HackerONEMarius Blüm2016-06-131-1/+1
| * | | Update devmanual LinkMarius Blüm2016-06-121-1/+1
| * | | Remove mailinglist-stuff from CONTRIBUTING.mdMarius Blüm2016-06-121-2/+1
| * | | Update CONTRIBUTING.mdMarius Blüm2016-06-121-16/+8
* | | | Merge pull request #77 from nextcloud/lgtm-noselfLukas Reschke2016-06-131-0/+1
|\ \ \ \
| * | | | LGTM: no self approvalMarius Blüm2016-06-131-0/+1
|/ / / /
* | | | Merge pull request #71 from nextcloud/fix-app-hookblizzz2016-06-131-1/+1
|\ \ \ \
| * | | | emit correct signal if a app get's disabledBjoern Schiessle2016-06-131-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #33 from nextcloud/LukasReschke-patch-1Morris Jobke2016-06-132-2/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Use proper PhantomJS library and run the tests as separate stepMorris Jobke2016-06-132-2/+6
|/ / /
* | | Merge pull request #57 from nextcloud/fdrop-templateLukas Reschke2016-06-133-5/+40
|\ \ \
| * | | smaller files drop fixesArthur Schiwon2016-06-113-5/+40
* | | | Merge pull request #58 from nextcloud/downstream-160611Morris Jobke2016-06-12109-219/+2151
|\ \ \ \
| * \ \ \ Merge branch 'master' of https://github.com/owncloud/core into downstream-160611Arthur Schiwon2016-06-11109-219/+2151
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Merge pull request #24863 from owncloud/propagator-batchingVincent Petry2016-06-104-1/+235
| | |\ \
| | | * | fix mtime propagation on sqliteRobin Appelman2016-06-021-3/+3
| | | * | add tests for propagator batchingRobin Appelman2016-06-021-0/+125
| | | * | use propagator batching in the scannerRobin Appelman2016-06-021-0/+4
| | | * | add propagator batchingRobin Appelman2016-06-022-0/+105
| | * | | Merge pull request #24898 from owncloud/avatar_repairVincent Petry2016-06-103-0/+306
| | |\ \ \
| | | * | | Empty string is null on oracleRoeland Jago Douma2016-06-101-1/+9
| | | * | | Add not-null columns for oracleJoas Schilling2016-06-101-0/+9
| | | * | | Repair job to fix permissions for avatarsRoeland Jago Douma2016-06-103-0/+289
| | * | | | Merge pull request #25003 from owncloud/fix_ocs_path_responseVincent Petry2016-06-103-21/+65
| | |\ \ \ \
| | | * | | | Extend unit testsRoeland Jago Douma2016-06-071-1/+33
| | | * | | | Fix unit testsRoeland Jago Douma2016-06-072-9/+21
| | | * | | | Show the path relative to the requesting userRoeland Jago Douma2016-06-071-12/+12
| | * | | | | Merge pull request #25055 from owncloud/enc-cappedcache-getaccesslistVincent Petry2016-06-101-0/+3
| | |\ \ \ \ \
| | | * | | | | Use capped cache for encryption's user access listVincent Petry2016-06-101-0/+3
| | * | | | | | fetchall appconfig entries (#23835)Jörn Friedrich Dreyer2016-06-101-1/+3