From 0437f808f229de08dd980618ac8f90a1ccd9b0c8 Mon Sep 17 00:00:00 2001
From: Bruce Wells <brucekwells@gmail.com>
Date: Tue, 15 Jan 2019 18:33:27 -0500
Subject: sync (#6)

* Fixed function parameter order (#42)

* Fixed parsing for ()

* sync (#5)

* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)

* Added simple coc (#37)

* Added simple coc

* Fix

* Replaceable operators (#38)

* Updated from NeonXP/MathExecutor

* Fixed function in () block issue

* Fixing typos in and clarifying documentation.

* Syncing from origin (#3)

* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)

* Allow for operators to be replaced based on regex expression

* Fix md typo (#39)

* Updated from NeonXP/MathExecutor

* Fixed function in () block issue

* Fixing typos in and clarifying documentation.

* Syncing from origin (#3)

* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)

* Syncing to origin (#4)

* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)

* Added simple coc (#37)

* Added simple coc

* Fix

* Replaceable operators (#38)

* Updated from NeonXP/MathExecutor

* Fixed function in () block issue

* Fixing typos in and clarifying documentation.

* Syncing from origin (#3)

* Documentation fixes (#34)

Fixing typos in and clarifying documentation.

* MathExecutor allow override default operators, functions and vars (#36)

* Allow for operators to be replaced based on regex expression

* \\ instead of \

* Update README.md

Some small fixes

* Fix single quotes parsing (#41)

* Fix single quotes parsing
Fix e-mails
Some small fixes

* Mistake in test

* More PHP versions

* Update README.md

Deleted `dev` branch

* Fixed function parameter order

Corrected $places default value for addFunction to match TokenFactory
Added function order test and put expected order first in assertEquals
If else blocks in calculator
Updated docs

* Create code-of-conduct.ru.md

* Update code-of-conduct.ru.md
---
 code-of-conduct.ru.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 code-of-conduct.ru.md

diff --git a/code-of-conduct.ru.md b/code-of-conduct.ru.md
new file mode 100644
index 0000000..04a566f
--- /dev/null
+++ b/code-of-conduct.ru.md
@@ -0,0 +1,5 @@
+# Кодекс поведения
+
+Нам всё равно, кто ты в реальной жизни, просто будь профессионалом и всё будет хорошо.
+
+Если ты будешь вести себя как сволочь - не удивляйся, что и к тебе будут относиться так же.
-- 
cgit v1.2.3