mirror/php-flarum

mirror of https://github.com/flarum/core.git synced 2025-07-19 15:51:16 +02:00

Go to file

Franz Liedke c2df8d5214 Merge branch 'master' into psr-7

Conflicts:
	composer.json
	composer.lock
	src/Api/Actions/TokenAction.php
	src/Core/Formatter/FormatterManager.php
	src/Core/Handlers/Events/EmailConfirmationMailer.php
	src/Forum/Actions/ConfirmEmailAction.php
	src/Forum/Actions/IndexAction.php
	src/Forum/Actions/ResetPasswordAction.php
	src/Forum/Actions/SavePasswordAction.php
	src/Forum/routes.php

2015-06-06 13:59:59 +02:00

Fix error

2015-06-04 11:12:04 +09:30

Style tweaks

2015-06-03 18:11:43 +09:30

Really rough fulltext driver implementation

2015-06-04 11:11:56 +09:30

Don't ignore FontAwesome fonts

2015-03-30 15:50:36 +10:30

Merge branch 'master' into psr-7

2015-06-06 13:59:59 +02:00

Remove unneeded .gitkeep's

2015-03-31 22:38:15 +03:00

Improvements to change/forgot password

2015-05-27 16:25:44 +09:30

.editorconfig

Tweak editorconfig settings

2015-05-06 11:26:47 +09:30

.gitignore

Don't ignore FontAwesome fonts

2015-03-30 15:50:36 +10:30

.travis.yml

Travis: Send an email for the first failed build

2015-05-19 02:14:56 +02:00

codeception.yml

add codeception, update gitignore

2014-12-22 08:28:01 -05:00

composer.json

Merge branch 'master' into psr-7

2015-06-06 13:59:59 +02:00

composer.lock

Merge branch 'master' into psr-7

2015-06-06 13:59:59 +02:00

LICENSE.txt

I don't think we need this, the text in their CLA is everywhere

2015-05-11 10:38:18 +09:30

README.md

Move bulk of readme to flarum/flarum

2015-05-07 12:43:23 +09:30

README.md

Flarum Core

This repository contains the core code of Flarum. If you want to install Flarum, visit the main Flarum repository.

Contributing

Interested in contributing to Flarum? Read the Contribution Guide!

Languages

PHP 65.5%

JavaScript 14.2%

TypeScript 13.9%

Less 5.5%

Blade 0.7%

Other 0.2%