github
/
flarum
mirror of https://github.com/flarum/flarum
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
282 Commits
5 Branches
29 Tags
9.5 MiB
Commit Graph

282 Commits (995a2621db714604983c892eaef2653fe3d425e2)

Author SHA1 Message Date
Franz Liedke 995a2621db
Prevent Git from auto-merging Composer's lockfile 
Source: https://blog.martinhujer.cz/17-tips-for-using-composer-efficiently/
 2018-06-02 15:06:48 +02:00
Franz Liedke 01e5fde09c
Composer: Sort dependencies 2018-06-02 15:04:46 +02:00
Franz Liedke 17926d696d
Remove http-interop package 2018-05-29 20:26:15 +02:00
Franz Liedke 088fdb4110
Unbundle Akismet extension 
It's used comparatively rarely, and adds another required PHP
extension to our set of minimum requirements.

Closes flarum/flarum.github.io#69.
 2018-05-17 15:29:23 +02:00
Franz Liedke 2798440851
Add directory for storing session data 2018-03-18 15:57:18 +01:00
Franz Liedke 84f8ef0395
Add version constraint for http-interop interfaces 2018-03-18 13:54:49 +01:00
Toby Zerner d43085eaee
Merge pull request #50 from clarkwinkelmann/patch-1 
Remove htaccess rules that are no longer necessary with the public folder
 2018-03-06 06:08:59 +10:30
Clark Winkelmann 23a1ed3e58
Rules no longer necessary with the public folder 2018-03-05 18:09:14 +01:00
Franz Liedke 0e0d443f85
Tweak readme text 2018-01-07 18:39:15 +01:00
Gurjyot Singh 0e9810b1bc Added link for Flarum/core and Discord Chat (#45) 
* Added link for Flarum/core and Discord Chat

* Fixed Text
 2018-01-07 18:35:10 +01:00
Miguel Piedrafita 8ab7784514 Update license year (#47) 2017-12-31 20:46:40 +01:00
Franz Liedke ddf49f77f8
Merge pull request #46 from gwillem/contributing 
Add links to dev discussions
 2017-12-30 19:09:17 +01:00
Willem de Groot df852638f9 Add links to dev discussions 2017-12-29 22:10:24 +01:00
Toby Zerner 7dc7f97f3c Merge branch 'next-back' 2017-12-28 12:18:25 +10:30
Gurjyot 530c8a9946 Fixed "Roadmap's" link, "good first issue" label link and added Milestone's link (#44) 
* Fixed links for Roadmap and Good first issue label

* Update CONTRIBUTING.md

* Changed Roadmap URL
 2017-12-26 19:29:28 +01:00
Toby Zerner f87217c6d9 Reset composer.json 2017-12-19 18:50:52 +10:30
Toby Zerner 47c8012869 Merge branch 'master' into next-back 2017-12-19 18:45:28 +10:30
Toby Zerner 4549c53c46 Remove Procfile 
Leave it up to each dev to decide what workflow for running processes
they want to use.
 2017-12-19 18:44:38 +10:30
Toby Zerner e3ed1adb73 Remove Vagrant 
Flarum is meant to be able to run on any PHP installation anyway so
Vagrant is not particularly useful (no need to standardize among devs)
 2017-12-19 18:43:07 +10:30
Toby Zerner c5c81c8651 Add public directory 2017-12-19 18:35:40 +10:30
Daniel Klabbers 7cf64af7f9 seems translations are working again, thanks to @tobscure 2017-11-27 10:01:23 +01:00
Toby Zerner e1c0f1794a Add folder for locale cache 2017-11-12 22:42:51 +10:30
Franz Liedke d779c97ced
Use new Site class to bootstrap web server and console 2017-07-05 21:47:23 +02:00
Franz Liedke 18c1750f3a
Delete unnecessary front controllers 
See flarum/core@cc4b259115
 2017-06-30 12:22:28 +02:00
Toby Zerner 6916205522 Merge pull request #41 from Luceos/patch-1 
Update .htaccess
 2017-05-24 12:40:53 +09:30
Daniël Klabbers 1ed484990f Update .htaccess 
declined access to composer.json
 2017-04-10 12:41:46 +02:00
Daniël Klabbers 0ba01391e8 Update .htaccess 
flarum/core#692 protect composer.lock, but also improve protection for git directories
 2017-04-07 13:39:46 +02:00
Franz Liedke ba53bc77fd Merge pull request #40 from Strobotti/vagrant 
Fix vagrant provisioning
 2017-03-03 08:53:29 +01:00
Juha Jantunen 72eeac2b2e Fix vagrant provisioning 2017-03-03 09:02:08 +02:00
Juha Jantunen 4479d857b6 Fixes for Vaprobash environment (#38) 
* Escape some quotes in environment.sh
* Fix incompatibility between Vaprobash 1.4.2 where first parameter for composer.sh is now treated as a Github token

Ref: https://github.com/fideloper/Vaprobash/pull/493
 2017-03-02 08:07:33 +01:00
Franz Liedke 569e3a3b5e
Fix workaround for HTTPoxy vulnerability 
Three issues with the previous solution:
* `Header unset` instead of `RequestHeader unset`
* No check for mod_headers being installed
* No alternative for when mod_headers is not installed (this still
  requires the mod_security module, but that's the best I could do)
 2017-02-12 01:36:42 +01:00
Franz Liedke 70a765a2c8 Merge pull request #37 from milescellar/patch-1 
Update year
 2017-01-02 20:07:20 +01:00
Miles Cellar a5b4c2eacd Update year 2017-01-01 22:50:11 +01:00
Toby Zerner 0c975a7f10 Remove PPM for now 
Since it doesn't have a stable version tagged, which is causing issues with `composer install`.
 2016-10-18 22:12:09 +10:30
Franz Liedke 46c951349a apache: Remove proxy header 2016-07-19 11:01:10 +09:00
Franz Liedke de19d0a95b nginx: Overwrite Proxy header 2016-07-19 10:50:02 +09:00
Franz Liedke 7e17408634
htaccess: Block access to .git directory 
Refs flarum/core#632.
 2016-04-23 17:08:16 +09:00
Franz Liedke cc8e9aa6e6
Add a Procfile for starting all dev processes at once 
This can be used with tools like Foreman [1] to start a
web server and the asset compilation from one console.

[1] http://ddollar.github.io/foreman/
 2016-04-20 20:10:02 +09:00
Franz Liedke 158f2020c8
Configure PPM to use correct bridge class 2016-04-19 11:07:16 +09:00
Franz Liedke 2a53b0367d
PHP-PM bridge for PSR-7 has been moved to new organization 2016-04-19 09:28:42 +09:00
Franz Liedke 6fa9800e55
Configure PHP-PM to use the correct bridge and the new server class 2016-04-16 23:20:28 +09:00
Franz Liedke e4d90d6017
Load PHP-PM and a bridge for PSR-7 middleware 2016-04-16 23:20:12 +09:00
Franz Liedke 30dfd952b8
Upgrade to latest version of Studio 2016-04-06 22:53:56 +09:00
Franz Liedke 533e7d4051 Use sensible version constraint for Studio 2016-03-28 14:04:44 +09:00
Franz Liedke 8caebc73e6 Upgrade version constraint for Studio 2016-03-04 00:27:09 +09:00
Toby Zerner e54e60a44b Merge pull request #35 from Luceos/drop-ext-dir 
removed composer installer and extensions directory
 2016-03-02 19:04:03 +10:30
Daniel Klabbers eeeca56481 removed composer installer and extensions directory 
added composer, dropping composer installer
 2016-02-26 12:08:24 +01:00
Toby Zerner f99aa84034 Delete build.sh 
This is outdated, we don't need it anymore!
 2016-02-06 15:58:54 +10:30
Toby Zerner cfd8650ab2 Merge pull request #32 from maelsoucaze/patch-2 
Update license year range to 2016
 2016-01-26 11:15:13 +10:30
Maël Soucaze db911e8263 Update license year range to 2016 2016-01-25 16:48:09 +01:00