Commit Graph

576 Commits

Author SHA1 Message Date
David Ralph
a3ba90d1da modify env and merge 2020-11-27 22:18:58 +00:00
David Ralph
0e10a4cf45 Merge pull request #123 from mue/dependabot/npm_and_yarn/material-ui/core-4.11.1
Bump @material-ui/core from 4.11.0 to 4.11.1
2020-11-25 10:42:54 +00:00
dependabot-preview[bot]
bb0db0f2de Bump @material-ui/core from 4.11.0 to 4.11.1
Bumps [@material-ui/core](https://github.com/mui-org/material-ui/tree/HEAD/packages/material-ui) from 4.11.0 to 4.11.1.
- [Release notes](https://github.com/mui-org/material-ui/releases)
- [Changelog](https://github.com/mui-org/material-ui/blob/v4.11.1/CHANGELOG.md)
- [Commits](https://github.com/mui-org/material-ui/commits/v4.11.1/packages/material-ui)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-25 06:46:14 +00:00
David Ralph
2215dd7dcd Merge pull request #121 from mue/dependabot/npm_and_yarn/react-scripts-4.0.1
Bump react-scripts from 4.0.0 to 4.0.1
2020-11-23 10:49:54 +00:00
David Ralph
888dd7fb5f Merge pull request #122 from mue/dependabot/npm_and_yarn/react-modal-3.12.1
Bump react-modal from 3.11.2 to 3.12.1
2020-11-23 10:49:46 +00:00
dependabot-preview[bot]
636c1892ec Bump react-modal from 3.11.2 to 3.12.1
Bumps [react-modal](https://github.com/reactjs/react-modal) from 3.11.2 to 3.12.1.
- [Release notes](https://github.com/reactjs/react-modal/releases)
- [Changelog](https://github.com/reactjs/react-modal/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reactjs/react-modal/compare/v3.11.2...v3.12.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-23 07:08:56 +00:00
dependabot-preview[bot]
d954ae78f6 Bump react-scripts from 4.0.0 to 4.0.1
Bumps [react-scripts](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-scripts) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/facebook/create-react-app/releases)
- [Changelog](https://github.com/facebook/create-react-app/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/create-react-app/commits/react-scripts@4.0.1/packages/react-scripts)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-23 07:08:09 +00:00
David Ralph
13757243a4 Merge pull request #120 from mue/dependabot/npm_and_yarn/react-toastify-6.1.0
Bump react-toastify from 6.0.9 to 6.1.0
2020-11-09 11:11:52 +00:00
dependabot-preview[bot]
40d3281fa1 Bump react-toastify from 6.0.9 to 6.1.0
Bumps [react-toastify](https://github.com/fkhadra/react-toastify) from 6.0.9 to 6.1.0.
- [Release notes](https://github.com/fkhadra/react-toastify/releases)
- [Commits](https://github.com/fkhadra/react-toastify/compare/v6.0.9...v6.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-09 07:00:54 +00:00
David Ralph
bbb49f536d readme updates 2020-11-08 11:48:37 +00:00
David Ralph
6b9a0028c6 Feedback modal (WIP)
Co-authored-by: Alex Sparkes <turbomarshmello@gmail.com>
2020-11-07 12:44:25 +00:00
David Ralph
d7e4bfafda Update package.json 2020-11-06 16:09:28 +00:00
David Ralph
e1510e8277 cleanup 2020-11-05 16:01:31 +00:00
David Ralph
f6d8ccf6e7 Finish welcome modal 2020-11-04 12:19:12 +00:00
David Ralph
3b52010213 More cleanup (some marketplace stuff broken, will fix later) 2020-11-04 12:01:18 +00:00
David Ralph
c0cced4f5d Merge things 2020-11-03 19:15:28 +00:00
David Ralph
8642757bd8 Marketplace cleanup 2020-11-03 19:01:20 +00:00
David Ralph
be1bccd2ac Merge pull request #119 from mue/dependabot/npm_and_yarn/node-sass-5.0.0
Bump node-sass from 4.14.1 to 5.0.0
2020-11-02 10:50:49 +00:00
dependabot-preview[bot]
5d2dc65e08 Bump node-sass from 4.14.1 to 5.0.0
Bumps [node-sass](https://github.com/sass/node-sass) from 4.14.1 to 5.0.0.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v4.14.1...v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-02 07:02:34 +00:00
David Ralph
aa010be11d Merge pull request #115 from MrOnosa/colorGradientPicker
Color gradient picker
2020-10-31 11:29:16 +00:00
MrOnosa
492b3b6715 * Solved padding issue
* Solved margin and colour issue of text
* Addressed some small code-style tweaks that need doing as well before this can be merged
2020-10-30 19:36:40 -05:00
MrOnosa
1245d58b7e Merge commit '2d128754760fba06f0cfd42b8bd6ded52a4ed864' into colorGradientPicker 2020-10-30 18:10:04 -05:00
David Ralph
b3195d0819 unfinished date feature 2020-10-29 16:05:28 +00:00
David Ralph
aacc779162 Fixes and improvements 2020-10-28 23:14:34 +00:00
David Ralph
96377c72ed Fix things and add new noscript message 2020-10-28 18:39:29 +00:00
David Ralph
3c27a5baf4 test 2020-10-28 17:13:19 +00:00
David Ralph
2d12875476 Add Spanish to language dropdown 2020-10-28 17:02:01 +00:00
David Ralph
acc583f995 Merge pull request #118 from Vicente015/master
Spanish translation
2020-10-28 14:02:11 +00:00
Vicente015
ac60d54950 Spanish translation 2020-10-28 13:58:53 +00:00
David Ralph
7490b5926f Merge pull request #108 from ssw99/dropdown-improvement
Add a bit css improvement on dropdowns
2020-10-28 11:07:01 +00:00
David Ralph
8b8353297d WIP modal improvements as well as some fixes etc 2020-10-27 15:10:40 +00:00
Serhat
d455e4b63b Add a bit more css improvement on dropdown 2020-10-27 18:00:39 +03:00
Serhat
cc5fa542e1 Dropdowns are now standalone class 2020-10-27 17:59:45 +03:00
Serhat
4cb5d1eaae Add a bit css improvement on dropdowns 2020-10-27 15:09:48 +03:00
David Ralph
0f279b8087 fix merge conflict 2020-10-27 12:06:21 +00:00
David Ralph
1647d3c520 Better font system 2020-10-27 12:02:41 +00:00
David Ralph
3da376e68a Merge pull request #117 from MrZillaGold/patch-1
Update ru.json
2020-10-27 09:18:57 +00:00
Pronin Egor
1f0bc275a0 Update ru.json 2020-10-27 12:41:02 +10:00
David Ralph
60bf6315a4 Improvements to navbar component and notes (mainly translation support) 2020-10-26 19:25:39 +00:00
David Ralph
4b25a1c955 Merge pull request #116 from mue/dependabot/npm_and_yarn/react-scripts-4.0.0
Bump react-scripts from 3.4.4 to 4.0.0
2020-10-26 14:59:40 +00:00
dependabot-preview[bot]
16419ca775 Bump react-scripts from 3.4.4 to 4.0.0
Bumps [react-scripts](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-scripts) from 3.4.4 to 4.0.0.
- [Release notes](https://github.com/facebook/create-react-app/releases)
- [Changelog](https://github.com/facebook/create-react-app/blob/master/CHANGELOG-3.x.md)
- [Commits](https://github.com/facebook/create-react-app/commits/react-scripts@4.0.0/packages/react-scripts)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-23 21:22:40 +00:00
David Ralph
f390c6ca92 Merge pull request #114 from MrOnosa/master
Fixing warning/errors on Master
2020-10-22 10:58:01 +01:00
MrOnosa
d85fc79734 Refactored color helpers into their own folder 2020-10-21 19:45:27 -05:00
MrOnosa
b45129f3d0 Totally functional! Just need to refactor like crazy. 2020-10-21 19:26:47 -05:00
MrOnosa
392f14c89d Hiding alpha settings 2020-10-21 19:13:36 -05:00
MrOnosa
1c49306a46 Merge commit '30c50968a218e6a8326fba041a2703fd57b119c4' into colorGradientPicker 2020-10-21 18:24:39 -05:00
MrOnosa
30c50968a2 * Fixed reset toast in background modal.
* Fixed credits dom selector

I hadn't realized these bugs were in the master branch.
2020-10-21 18:19:35 -05:00
MrOnosa
3b5ac499cc Merge commit '0b4383d2632b2126d0c74a9e3c5365e645a4fbc6' 2020-10-21 18:16:05 -05:00
MrOnosa
754fdbe284 Merge commit '0b4383d2632b2126d0c74a9e3c5365e645a4fbc6' into colorGradientPicker 2020-10-21 18:15:15 -05:00
MrOnosa
1ce238722a Added support for radianal gradiant. 2020-10-21 18:13:14 -05:00