UPschooling/matrix-php-sdk
4
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
198 commits 2 branches 0 tags 226 KiB
Commit graph

198 commits

This branch
This branch
All branches
Author SHA1 Message Date
Frank de Jonge ba4a5cfef8 Merge pull request #117 from TangRufus/patch-1 
Rename CONDUCT.md to CODE_OF_CONDUCT.md
 2017-08-22 15:08:47 +02:00
Tang Rufus fb04815e6d
Rename CONDUCT.md to CODE_OF_CONDUCT.md 
GitHub looks for [CODE_OF_CONDUCT.md](https://help.github.com/articles/adding-a-code-of-conduct-to-your-project/)
 2017-08-22 05:34:33 +08:00
Frank de Jonge 4d43518157 Merge pull request #115 from ozh/fixtests 
Fix tests on PHP 5.6 & HHVM
 2017-08-14 23:12:17 +02:00
ozh fd3dd12c2f Fix tests on PHP 5.6 & HHVM 2017-06-30 20:05:48 +02:00
Frank de Jonge ae7202b50f Merge pull request #112 from VictorAvelar/patch-1 
Update composer.json
 2017-04-04 07:33:26 +02:00
Victor Hugo Avelar 03e1f7e71c Update composer.json 
Just to accept the latest PHPUnit version
 2017-04-03 18:50:45 -05:00
Frank de Jonge eea377a312 Merge pull request #111 from jclyons52/master 
Removed trailing comma from call to array_merge.
 2017-03-16 10:19:22 +01:00
Joseph Lyons e0d10abe4a put array back the way it was 2017-03-16 13:23:58 +11:00
Joseph Lyons 6acef5f791 trailing comma not allowed 2017-03-16 13:20:23 +11:00
Frank de Jonge e94159cfc0 Merge pull request #110 from hansott/patch-1 
Replace placeholders in tests as well
 2017-03-15 22:28:00 +01:00
Hans Ott 6076c8da37 Replace placeholders in tests as well 2017-03-15 21:22:48 +01:00
Frank de Jonge 9fa0cc01e3 Merge pull request #109 from TravisCarden/patch-1 
Fix minor grammar error in code of conduct
 2017-02-27 17:24:26 +01:00
Travis Carden c335ea3a98 Fix minor grammar error in code of conduct 2017-02-27 10:22:57 -06:00
Phil Sturgeon 5bff3377ba Merge pull request #108 from thephpleague/revert-107-revert-106-patch-1 
Revert "Revert "Remove Composer self-updating from .travis.yml""
 2017-01-25 12:08:51 -05:00
Phil Sturgeon 48041ad725 Revert "Revert "Remove Composer self-updating from .travis.yml"" 2017-01-25 12:08:33 -05:00
Phil Sturgeon eb4f6b5d30 Merge pull request #107 from thephpleague/revert-106-patch-1 
Revert "Remove Composer self-updating from .travis.yml"
 2017-01-25 11:29:27 -05:00
Phil Sturgeon 9f4392df5d Revert "Remove Composer self-updating from .travis.yml" 2017-01-25 11:29:19 -05:00
Phil Sturgeon 4295a4cd5e Merge pull request #106 from pamil/patch-1 
Remove Composer self-updating from .travis.yml
 2017-01-25 11:24:47 -05:00
Kamil Kokot 6c3a889e6a Remove Composer self-updating from .travis.yml 
It is done automatically by Travis.
 2017-01-25 12:36:53 +01:00
Frank de Jonge 8db2d152f2 Merge pull request #103 from odan/master 
Update README.md
 2017-01-18 13:02:46 +01:00
Frank de Jonge 5c82d4959c Merge pull request #105 from renan/patch-1 
Fix tests directory name
 2017-01-18 13:02:21 +01:00
Renan Gonçalves 3ce99d6f9e Fix tests directory name 
Because almost all League projects uses `tests/`, including this skeleton.
 2017-01-18 12:15:05 +01:00
Frank de Jonge b281e01721 Merge pull request #104 from carlosafonso/master 
Update year in LICENSE.md
 2017-01-03 21:09:52 +01:00
Carlos Afonso Pérez 72e1b2d32e Update year in LICENSE.md 2017-01-03 21:05:12 +01:00
odan 295bf73cfd Update README.md 2017-01-02 22:36:33 +01:00
Frank de Jonge ad992b1e08 Merge pull request #101 from dragoonis/master 
Adding in recommended directory structure
 2016-12-15 19:52:23 +01:00
Paul Dragoonis cc1c74c6b8 Update README.md 2016-12-15 18:28:35 +00:00
Paul Dragoonis 82ca2c025c Adding in recommended directory structure 2016-12-15 18:26:32 +00:00
Frank de Jonge f28fdebaa7 Merge pull request #100 from andylolz/patch-1 
Fix typo
 2016-12-14 01:20:15 +01:00
Andy Lulham bbff3d5289 Fix typo 
Add missing word
 2016-12-13 20:57:58 +00:00
Phil Sturgeon eb10964e7b Merge pull request #98 from Tjoosten/patch-87 
Fix #87 | "docs" entry in .gitignore?
 2016-11-24 09:30:18 -05:00
Tim Joosten 279e0d1891
Fix #87 | "docs" entry in .gitignore? 
Remove docs directory out of .gitignore and locate it in .gitaatributes
 2016-11-24 14:11:19 +01:00
Phil Sturgeon 13d3e957ed Merge pull request #97 from hansott/patch-1 
Remove useless items from PR checklist
 2016-11-02 13:48:47 -04:00
Hans Ott 2964e5aedb Add note about CI 2016-11-01 10:13:31 +01:00
Hans Ott 3c9e47ab34 Remove useless items from PR checklist 
These rules will be checked in the Travis build.
 2016-10-30 16:50:19 +01:00
Phil Sturgeon 5229fb7e3b Merge pull request #96 from hansott/use-ocular-phar 
Use phar version of ocular
 2016-09-19 11:14:49 +01:00
Hans Ott f145704730 Remove .travis.codecoverage.sh from git attributes 2016-09-19 08:33:37 +02:00
Hans Ott ef61620266 Don't use separate file for uploading code coverage 2016-09-19 08:29:46 +02:00
Hans Ott abf471b40f Add .travis.coverage.sh to gitattributes 2016-09-17 14:15:13 +02:00
Hans Ott d79cbe8d7e Use phar version of ocular 
It's impossible to install the latest version of Guzzle due
ocular (used to upload code coverage) depending on guzzlehttp/guzzle ~3.0.

See https://github.com/scrutinizer-ci/ocular/blob/master/composer.json

Closes #95

Inspired by https://github.com/Ocramius/ProxyManager/blob/master/.travis.coverage.sh
 2016-09-17 14:09:48 +02:00
Phil Sturgeon f1bc4192b7 Merge pull request #94 from rfussien/fix/add-the-xml-extension-to-prefil 
add the xml.dist extesion to the prefil script
 2016-09-16 06:57:15 -04:00
Phil Sturgeon 591bb8cf80 Merge pull request #93 from rfussien/fix/set-conduct-contact 
set the author email as the contact in the CONDUCT file
 2016-09-16 06:55:55 -04:00
Remi FUSSIEN 64ede3ad83 add the xml.dist extesion to the prefil script 2016-09-15 14:08:49 +02:00
Remi FUSSIEN 01ea4b1d1b set the author email as the contact in the CONDUCT file 2016-09-15 13:56:02 +02:00
Phil Sturgeon d5b838777b Merge pull request #41 from ravage84/composer-phpcs 
Add Composer scripts "check-codestyle" & "fix-codestyle"
 2016-09-14 14:16:57 -04:00
Marc Würth fcb1285761 Replace check-codestyle & fix-codestyle with check-style & fix-style respecively 2016-09-14 17:22:46 +02:00
Marc Würth 8e47aefcd8 Fix indentation 2016-09-14 17:14:21 +02:00
Marc Würth 861d69077f Ignore errors and warnings in PHPCS 
Refs: https://github.com/thephpleague/skeleton/pull/41#issuecomment-104071697

Thanks to @gsherwood
 2016-09-14 17:11:24 +02:00
Marc Würth 4b35187e4b Adjust Contribution guide 2016-09-14 17:11:23 +02:00
Marc Würth a243b4a03a Add Composer scripts "check-codestyle" & "fix-codestyle" 2016-09-14 17:11:23 +02:00