Commit Graph
1538 Commits
Author SHA1 Message Date
Kino Roy f84e8683ca Merge branch 'development' into licence-header 2020-05-05 22:25:02 -07:00
Kino 4c97a49cc1 Add shared template macro to insert the licence in every source file 2020-05-05 22:06:49 -07:00
Jakub Kašpar 0be18048ec Merge pull request #1338 from MessageKit/mergeMaster
Master => Development #trivial
2020-04-24 00:43:51 +02:00
Jakub Kaspar 2460ce4551 Merge branch 'development' into mergeMaster
# Conflicts:
#	.github/workflows/danger.yml
#	Example/Gemfile
#	Example/Gemfile.lock
2020-04-24 00:38:01 +02:00
Jakub Kašpar fadb7811b2 Merge pull request #1326 from alfredcc/development
Fix Manual link in README.md
2020-04-14 10:49:35 +02:00
racechao 1b2e807e8b Fix Manual link in README.md
Fix Manual link
2020-04-14 15:49:50 +08:00
Austin Wright 93675ab98b Merge pull request #1318 from MessageKit/put-danger-back
put danger back
2020-04-06 16:37:06 -04:00
Austin Wright 324515729f put danger back
disable development branch and put danger token back to secrets
2020-04-06 16:30:45 -04:00
Austin Wright a2246b9516 Merge pull request #1317 from MessageKit/replace-secrets-with-exposed-token
replace secrets with exposed token
2020-04-06 15:55:55 -04:00
Austin Wright e18b30312c replace secrets with exposed token
replace secrets with exposed token
2020-04-06 15:54:13 -04:00
Austin Wright 5de37e4dab Merge pull request #1314 from MessageKit/fix-danger-on-forks-1
Change token & add development branch to danger #trivial
2020-04-06 15:30:12 -04:00
Austin Wright dcdc54b31f Change token & add development branch to danger
Add `- development` to list of branches (for now).
Change GITHUB_TOKEN to MESSAGEKIT_DANGER_GITHUB_API_TOKEN (MessageKit-Bot)
2020-04-06 15:16:48 -04:00
Jakub Kašpar 42834bc93a Merge pull request #1312 from MessageKit/disableDangerForDevelopment
Disable Danger for development branch #trivial
2020-04-06 17:24:04 +02:00
Jakub Kaspar 0b0d151c66 disable 2020-04-06 17:15:24 +02:00
Jakub Kašpar a61038962e Merge pull request #1306 from isupremedyou/master
fix spelling typo and rename UIImage extension filename
2020-04-05 17:03:27 +02:00
Travis Chapman d6335042d6 Merge branch 'master' of https://github.com/isupremedyou/MessageKit 2020-04-04 13:50:30 -06:00
Travis Chapman 16a51800fa fix typo rigt vs right 2020-04-04 13:49:54 -06:00
Jakub Kašpar 768be3b7f7 Merge branch 'development' into master 2020-04-03 15:29:06 +02:00
Austin Wright 417722060e Merge pull request #1297 from MessageKit/cherryPickCI
Apply CI and infra changes from development to master #trivial
2020-04-03 09:26:31 -04:00
Austin Wright 8155419adf Merge pull request #1309 from MessageKit/fixSwiftlint
(Infra) Fix SwiftLint on PRs #trivial
2020-04-03 08:59:47 -04:00
Jakub Kaspar cee0cec113 Fix octokit 2020-04-02 21:42:59 +02:00
Jakub Kaspar 4ebb06320c Udpate octokit 2020-04-02 21:42:37 +02:00
Jakub Kaspar 0c676da60c Fix swiftlint 2020-04-02 21:40:20 +02:00
Jakub Kaspar 4db71affef Fix Swiftlint 2020-04-02 21:39:46 +02:00
Jakub Kašpar 83cda0ee9d Merge branch 'development' into master 2020-04-02 10:11:06 +02:00
Travis Chapman bd193d9f7f fix spelling typo and rename UIImage extension filename 2020-03-31 18:30:58 -06:00
Jakub Kašpar 673390584d Merge pull request #1294 from martinpucik/documentation/remote_image_example
documentation: Loading remote image messages in Example project
2020-03-23 10:27:15 +01:00
Jakub Kaspar 6f3a7b2e1d Cherry pick changes for example app 2020-03-20 18:58:19 +01:00
Jakub Kaspar 544bcb9ea5 Cherry pick CI and infra changes from development to apply to master 2020-03-20 18:52:38 +01:00
Martin Púčik 8bff5c99bf Merge branch 'development' into documentation/remote_image_example 2020-03-20 16:48:37 +01:00
Austin Wright 5013fd8bfe Merge pull request #1295 from MessageKit/fixCache
Fix caching for CI #trivial
2020-03-20 10:15:39 -04:00
Jakub Kaspar 94a263d988 Update cache strategy with keys 2020-03-20 14:22:45 +01:00
martinpucik f28e72a085 Changelog 2020-03-20 14:17:07 +01:00
martinpucik 81d4387d94 build: Bump Cocoapods bundle version 2020-03-20 14:02:16 +01:00
martinpucik 176c6cdd28 documentation: Loading remote image messages in Example project 2020-03-20 13:56:20 +01:00
Jakub Kašpar 9dfe24ec01 Merge pull request #1261 from MessageKit/cleanupSwift
Drop iOS 9 and iOS 10, update example project
2020-03-20 09:35:22 +01:00
Jakub Kaspar d3f722d81e fix cache 2020-03-19 20:16:27 +01:00
Jakub Kaspar 42d32abf3a Update project and example 2020-03-19 20:02:22 +01:00
Austin Wright c13bdf56e6 Merge branch 'development' into cleanupSwift 2020-03-19 14:18:42 -04:00
Austin Wright 7dc8201e54 Merge pull request #1292 from MessageKit/cleanupCircleCI
Remove Circle CI entirely, rely on Github Actions only #trivial
2020-03-19 14:18:16 -04:00
Jakub Kaspar 71d175913b Update swiftlint 2020-03-17 23:27:47 +01:00
Jakub Kaspar 419e2e96d7 Get rid of Circle CI and unused travis file 2020-03-17 23:22:01 +01:00
Jakub Kaspar 07fbb99705 Merge branch 'development' into cleanupSwift
# Conflicts:
#	Example/Podfile.lock
2020-03-17 23:07:11 +01:00
Jakub Kaspar d52d57cce6 Merge branch 'master' into development
# Conflicts:
#	Example/Podfile.lock
2020-03-17 22:54:01 +01:00
Jakub Kašpar 413fd8f6eb Merge pull request #1291 from MessageKit/fixChangelog
Fix changelog entry
3.1.0
2020-03-17 22:40:03 +01:00
Jakub Kaspar b731bc41e4 add missing entry 2020-03-17 22:20:38 +01:00
Austin Wright e010dcbbb1 Merge pull request #1287 from MessageKit/prepare_3_1_0_release
Prepare 3.1.0 final release #trivial
2020-03-17 17:12:17 -04:00
Jakub Kašpar faa3addb97 Merge branch 'master' into prepare_3_1_0_release 2020-03-17 21:40:09 +01:00
Jakub Kašpar b2c96a8a7d Merge pull request #1290 from MessageKit/bguidolim-patch-1
Added COYO Engage to the apps list
2020-03-17 21:39:22 +01:00
Jakub Kašpar 58d9937448 Merge branch 'master' into bguidolim-patch-1 2020-03-17 21:21:33 +01:00