Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
215bf2e
Delete old (and useless) installer
TechWilk Dec 30, 2017
f11d789
Remove unused config options
TechWilk Dec 30, 2017
64ea013
Bump michelf/php-markdown from 1.7.0 to 1.8.0
dependabot-support Jan 15, 2018
4a7b3aa
Merge pull request #115 from TechWilk/dependabot/composer/michelf/php…
TechWilk Jan 15, 2018
322a4c9
Bump phpunit/phpunit from 5.7.26 to 5.7.27
dependabot-support Feb 1, 2018
5d8d0a1
Merge pull request #116 from TechWilk/dependabot/composer/phpunit/php…
TechWilk Feb 23, 2018
8861ea9
Bump mailgun/mailgun-php from 2.4.0 to 2.4.1
dependabot-support Feb 23, 2018
91366eb
Merge pull request #117 from TechWilk/dependabot/composer/mailgun/mai…
TechWilk Feb 23, 2018
349a286
Bump facebook/graph-sdk from 5.6.1 to 5.6.2
dependabot-support Feb 23, 2018
13c2094
Merge pull request #118 from TechWilk/dependabot/composer/develop/fac…
TechWilk Feb 26, 2018
2f65919
Bump erusev/parsedown from 1.6.4 to 1.7.0
dependabot-support Mar 1, 2018
c04afe7
Merge pull request #119 from TechWilk/dependabot/composer/develop/eru…
TechWilk Mar 1, 2018
e8fc468
Remove unneeded .less files
TechWilk Feb 24, 2018
b4278ee
Start purging old files, replacing with redirect routes
TechWilk Feb 24, 2018
7dab51d
Apply fixes from StyleCI (#120)
TechWilk Mar 1, 2018
e2ca46c
Bump erusev/parsedown from 1.7.0 to 1.7.1
dependabot-support Mar 8, 2018
e70941d
Merge pull request #123 from TechWilk/dependabot/composer/develop/eru…
TechWilk Mar 9, 2018
bacf8b9
Bump guzzlehttp/guzzle from 6.3.0 to 6.3.2
dependabot-support Mar 27, 2018
c2e5fa9
Bump php-http/curl-client from 1.7.0 to 1.7.1
dependabot-support Mar 27, 2018
e090eed
Merge pull request #124 from TechWilk/dependabot/composer/develop/guz…
TechWilk Mar 27, 2018
90f9592
Merge branch 'develop' into dependabot/composer/develop/php-http/curl…
TechWilk Mar 27, 2018
00b93a2
Merge pull request #125 from TechWilk/dependabot/composer/develop/php…
TechWilk Mar 28, 2018
1e50746
Bump mailgun/mailgun-php from 2.4.1 to 2.5.0
dependabot-support Apr 9, 2018
4fd790e
Merge pull request #126 from TechWilk/dependabot/composer/develop/mai…
TechWilk Apr 13, 2018
7a7467e
Bump slim/slim from 3.9.2 to 3.10.0
dependabot-support Apr 20, 2018
c6e92dc
Merge pull request #127 from TechWilk/dependabot/composer/develop/sli…
TechWilk Apr 20, 2018
fa0805c
Bump guzzlehttp/guzzle from 6.3.2 to 6.3.3
dependabot-support Apr 23, 2018
8451ca4
Merge pull request #128 from TechWilk/dependabot/composer/develop/guz…
TechWilk Apr 24, 2018
71e26d8
Bump slim/twig-view from 2.3.0 to 2.4.0
dependabot-support May 8, 2018
475f1a4
Merge pull request #129 from TechWilk/dependabot/composer/develop/sli…
TechWilk May 8, 2018
7f0867f
Bump dpolac/twig-lambda from 0.5.0 to 1.0.0
dependabot-support Jun 7, 2018
32631cb
Merge pull request #133 from TechWilk/dependabot/composer/develop/dpo…
TechWilk Jun 7, 2018
333f449
Bump slim/slim from 3.10.0 to 3.11.0
dependabot-support Sep 17, 2018
8776115
Merge pull request #138 from TechWilk/dependabot/composer/develop/sli…
TechWilk Sep 24, 2018
444dfc0
Bump facebook/graph-sdk from 5.6.2 to 5.6.3
dependabot-support Sep 24, 2018
3e572bb
Merge pull request #134 from TechWilk/dependabot/composer/develop/fac…
TechWilk Sep 24, 2018
72c75da
Bump twig/extensions from 1.5.1 to 1.5.2
dependabot-support Sep 24, 2018
90525a6
Merge pull request #135 from TechWilk/dependabot/composer/develop/twi…
TechWilk Sep 24, 2018
bc60504
Bump mailgun/mailgun-php from 2.5.0 to 2.6.0
dependabot-support Sep 24, 2018
59fb304
Merge pull request #136 from TechWilk/dependabot/composer/develop/mai…
TechWilk Sep 24, 2018
4bab9a5
Bump slim/csrf from 0.8.2 to 0.8.3
dependabot-support Sep 24, 2018
e373078
Merge pull request #137 from TechWilk/dependabot/composer/develop/sli…
TechWilk Sep 24, 2018
6bf59d8
Drop support for php5.6 and 7.0
TechWilk Oct 5, 2018
662ef73
Update readme with new supported versions
TechWilk Oct 5, 2018
aa7c4af
Remove more redundant js
TechWilk Mar 2, 2018
f9a76ec
Merge pull request #122 from TechWilk/tidyup
TechWilk Oct 5, 2018
94ffd7d
Bump composer php version to 7.1
TechWilk Oct 5, 2018
269ad14
Remove old system homepage, events page & redundant assets
TechWilk Oct 5, 2018
2b467f7
Apply fixes from StyleCI (#139)
TechWilk Oct 5, 2018
b88b392
Fix broken link
TechWilk Oct 5, 2018
ad6a0f6
Bump aptoma/twig-markdown from 2.0.0 to 3.0.0
dependabot-support Oct 8, 2018
bd2c75a
Merge pull request #142 from TechWilk/dependabot/composer/develop/apt…
TechWilk Oct 8, 2018
e3c2912
Fix CSRF check on calendar URL creation
TechWilk Oct 8, 2018
a039681
Merge branch 'master' of github.com:TechWilk/rota into develop
TechWilk Oct 9, 2018
1a95681
CSRF fix for team creation modal
TechWilk Oct 10, 2018
cd215d6
Bump facebook/graph-sdk from 5.6.3 to 5.7.0
dependabot-support Dec 14, 2018
1f1014d
Merge pull request #154 from TechWilk/dependabot/composer/develop/fac…
TechWilk Jan 3, 2019
5eb7fe0
Bump guzzlehttp/psr7 from 1.4.2 to 1.5.2
dependabot-support Jan 3, 2019
9a23844
Merge pull request #150 from TechWilk/dependabot/composer/develop/guz…
TechWilk Jan 4, 2019
a5e049a
Bump monolog/monolog from 1.23.0 to 1.24.0
dependabot-support Jan 4, 2019
41a87b2
Merge pull request #145 from TechWilk/dependabot/composer/develop/mon…
TechWilk Jan 4, 2019
56e3b10
Bump twig/extensions from 1.5.2 to 1.5.4
dependabot-support Jan 4, 2019
011f2ee
Merge pull request #151 from TechWilk/dependabot/composer/develop/twi…
TechWilk Jan 4, 2019
f9c32f5
Bump mailgun/mailgun-php from 2.6.0 to 2.8.0
dependabot-support Jan 7, 2019
9a75e59
Merge pull request #155 from TechWilk/dependabot/composer/develop/mai…
TechWilk Jan 18, 2019
985b068
[Security] Bump twig/twig from 2.6.0 to 2.6.2
dependabot-support Jan 18, 2019
6557e78
Merge pull request #156 from TechWilk/dependabot/composer/develop/twi…
TechWilk Jan 18, 2019
3c50ac7
Bump slim/slim from 3.11.0 to 3.12.0
dependabot-support Jan 18, 2019
68408ac
Merge pull request #158 from TechWilk/dependabot/composer/develop/sli…
TechWilk Jan 18, 2019
d76930e
Bump mailgun/mailgun-php from 2.8.0 to 2.8.1
dependabot-support Feb 4, 2019
ada9e27
Merge pull request #159 from TechWilk/dependabot/composer/develop/mai…
TechWilk Feb 4, 2019
26682ab
Bump satooshi/php-coveralls from 2.0.0 to 2.1.0
dependabot-support Feb 21, 2019
45dcaf1
Merge pull request #164 from TechWilk/dependabot/composer/develop/sat…
TechWilk Apr 30, 2019
0c0d183
Bump aptoma/twig-markdown from 3.0.0 to 3.1.0
dependabot-support Apr 30, 2019
b9fb6c4
Merge pull request #172 from TechWilk/dependabot/composer/develop/apt…
TechWilk Apr 30, 2019
20ea8f9
Bump erusev/parsedown from 1.7.1 to 1.7.3
dependabot-support Apr 30, 2019
8a59e9a
Merge pull request #173 from TechWilk/dependabot/composer/develop/eru…
TechWilk Apr 30, 2019
6bbd905
Bump slim/twig-view from 2.4.0 to 2.5.0
dependabot-support Apr 30, 2019
e21940c
Merge pull request #174 from TechWilk/dependabot/composer/develop/sli…
TechWilk May 1, 2019
c009a13
Bump slim/slim from 3.12.0 to 3.12.1
dependabot-support May 1, 2019
18884d3
Merge pull request #176 from TechWilk/dependabot/composer/develop/sli…
TechWilk May 1, 2019
a39f701
Bump phpunit/phpunit from 5.7.27 to 7.5.9
dependabot-support May 1, 2019
bc5a53e
Fix unit test namespaces for phpunit 7
TechWilk May 2, 2019
6e5123a
Apply fixes from StyleCI
TechWilk May 3, 2019
77341c0
Merge pull request #177 from TechWilk/dependabot/composer/develop/php…
TechWilk May 3, 2019
4528a83
Bump phpunit/phpunit from 7.5.9 to 7.5.10
dependabot-support May 10, 2019
16d7757
Merge pull request #179 from TechWilk/dependabot/composer/develop/php…
TechWilk May 10, 2019
772d623
Bump phpunit/phpunit from 7.5.10 to 7.5.11
dependabot-support May 14, 2019
d28b746
Merge pull request #180 from TechWilk/dependabot/composer/develop/php…
TechWilk May 22, 2019
1a8246a
Bump phpunit/phpunit from 7.5.11 to 7.5.13
dependabot-preview[bot] Jun 20, 2019
9bb009d
Apply fixes from StyleCI
TechWilk Jun 20, 2019
d9f3f89
Merge pull request #183 from TechWilk/dependabot/composer/develop/php…
TechWilk Jun 21, 2019
aadbc6d
Bump guzzlehttp/psr7 from 1.5.2 to 1.6.1
dependabot-preview[bot] Jul 2, 2019
939ac8e
Merge pull request #185 from TechWilk/dependabot/composer/develop/guz…
TechWilk Jul 16, 2019
45a99b1
Bump phpunit/phpunit from 7.5.13 to 7.5.18
dependabot-preview[bot] Dec 9, 2019
672542c
Move to CircleCI
TechWilk Dec 26, 2019
b148ebe
Some group routes thing
TechWilk Dec 26, 2019
1283325
Apply fixes from StyleCI (#207)
TechWilk Dec 26, 2019
e76d98f
Add apt update for circleci
TechWilk Dec 26, 2019
652271e
Remove coveralls for now
TechWilk Dec 26, 2019
fc59b82
Merge branch 'develop' into dependabot/composer/develop/phpunit/phpun…
TechWilk Dec 26, 2019
7574acc
Merge pull request #201 from TechWilk/dependabot/composer/develop/php…
TechWilk Dec 26, 2019
305b524
Bump guzzlehttp/guzzle from 6.3.3 to 6.5.2
dependabot-preview[bot] Dec 26, 2019
91d1379
Merge pull request #206 from TechWilk/dependabot/composer/develop/guz…
TechWilk Dec 26, 2019
cfb02d6
Bump monolog/monolog from 1.24.0 to 1.25.3
dependabot-preview[bot] Dec 26, 2019
15f51fb
Merge pull request #204 from TechWilk/dependabot/composer/develop/mon…
TechWilk Dec 26, 2019
e2169d1
Bump michelf/php-markdown from 1.8.0 to 1.9.0
dependabot-preview[bot] Dec 26, 2019
580fb02
Merge pull request #200 from TechWilk/dependabot/composer/develop/mic…
TechWilk Dec 26, 2019
78a3235
Bump mailgun/mailgun-php from 2.8.1 to 3.0.0
dependabot-preview[bot] Dec 26, 2019
d4ed345
Merge pull request #194 from TechWilk/dependabot/composer/develop/mai…
TechWilk Dec 26, 2019
4f51706
Neater config
TechWilk Dec 26, 2019
7376dea
Circleci store_test_results
TechWilk Dec 26, 2019
4245ef8
Add php 7.3 & 7.4 to circleci
TechWilk Dec 26, 2019
d9970f7
Move shared steps to top of circleci
TechWilk Dec 27, 2019
23b88fa
Remove duplicated steps
TechWilk Dec 27, 2019
d30e189
Merge pull request #208 from TechWilk/circleci
TechWilk Dec 27, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
shared: &shared
working_directory: ~/rota
steps:
- checkout
- run:
command: |
sudo apt update
sudo apt install -y libsqlite3-dev zlib1g-dev
sudo docker-php-ext-install zip
- run: sudo composer self-update
- restore_cache:
keys:
- composer-v1-{{ checksum "composer.lock" }}
# fallback to using the latest cache if no exact match is found (See https://circleci.com/docs/2.0/caching/)
- composer-v1-
- run: composer install -n --prefer-dist
- save_cache:
key: composer-v1-{{ checksum "composer.lock" }}
paths:
- vendor
- run:
command: |
cp config/database{.default,}.php
cp config/auth{.default,}.php
cp config/email{.default,}.php
cp config/recording{.default,}.php
- run: |
mkdir -p ~/phpunit
composer test -- --log-junit ~/phpunit/junit.xml
- store_test_results:
path: ~/phpunit
- store_artifacts:
path: ~/phpunit

version: 2

jobs:
php7.2:
docker:
- image: circleci/php:7.2
<<: *shared
php7.3:
docker:
- image: circleci/php:7.3
<<: *shared
php7.4:
docker:
- image: circleci/php:7.4
<<: *shared

workflows:
version: 2
workflow:
jobs:
- php7.4
- php7.3
- php7.2
21 changes: 0 additions & 21 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Rota can be installed on almost any PHP web host, possibly even on the one your

### What you'll need:

- Web host running PHP 5.6 or above (recommended PHP 7.0)
- Web host running PHP 7.1 or above (it may work with earlier versions, but this isn't supported)
- MySQL database (or an alternate DB which works with [PDO](http://php.net/manual/en/pdo.drivers.php), we've only tested MySQL though)
- [Mailgun](https://www.mailgun.com/) account for email sending (10,000 email/month free) - or sendmail if you're feeling brave...

Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
},
"config": {
"platform": {
"php": "5.6.0"
"php": "7.1.0"
}
},
"require": {
"aptoma/twig-markdown": "^2.0",
"dpolac/twig-lambda": "^0.5.0",
"aptoma/twig-markdown": "^3.0",
"dpolac/twig-lambda": "^1.0.0",
"erusev/parsedown": "^1.6",
"facebook/graph-sdk": "~5.0",
"guzzlehttp/guzzle": "~6.0",
"guzzlehttp/psr7": "^1.3",
"mailgun/mailgun-php": "^2.1",
"mailgun/mailgun-php": "^3.0",
"michelf/php-markdown": "~1.3",
"monolog/monolog": "^1.17",
"oscarotero/psr7-middlewares": "^3.20",
Expand All @@ -52,7 +52,7 @@
}
},
"require-dev": {
"phpunit/phpunit": "^5.7.26",
"phpunit/phpunit": "^7.5.9",
"satooshi/php-coveralls": "^2.0"
},
"scripts": {
Expand Down
Loading