Commit Graph
1412 Commits
Author SHA1 Message Date
Mr. Timothy G Webb Sr 8061e86750 Merge pull request #18 from boxbilling/master
Merge master branch from boxbilling/boxbilling to timothygwebb/boxbilling
2020-11-18 15:29:57 -05:00
Yağızhan 2bc218f068 Merge pull request #731 from boxbilling/feature/bootstrap
Add bootstrap theme
2020-11-18 12:16:11 +03:00
Yağızhan d389f184e0 Merge pull request #741 from timothygwebb/master
Fix: denial of service on jpeg-js
2020-11-18 12:14:19 +03:00
Mr. Timothy G Webb Sr 7c73b2d118 Update Service.php 2020-11-15 14:49:25 -05:00
Mr. Timothy G Webb Sr 214b2ccc0f Merge pull request #17 from timothygwebb/dependabot/npm_and_yarn/jpeg-js-0.4.2
Bump jpeg-js from 0.0.4 to 0.4.2
2020-11-15 14:40:04 -05:00
dependabot[bot] dc7e4e0f4b Bump jpeg-js from 0.0.4 to 0.4.2
Bumps [jpeg-js](https://github.com/eugeneware/jpeg-js) from 0.0.4 to 0.4.2.
- [Release notes](https://github.com/eugeneware/jpeg-js/releases)
- [Commits](https://github.com/eugeneware/jpeg-js/compare/v0.0.4...v0.4.2)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-15 19:37:39 +00:00
Mr. Timothy G Webb Sr fad270d053 Update package-lock.json
CVE-2020-8175
moderate severity
Vulnerable versions: < 0.4.0
Patched version: 0.4.0
Uncontrolled resource consumption in jpeg-js before 0.4.0 may allow attacker to launch denial of service attacks using specially a crafted JPEG image.
2020-11-15 14:37:03 -05:00
Mr. Timothy G Webb Sr 427b4a5709 Update Service.php 2020-11-15 14:27:27 -05:00
Mr. Timothy G Webb Sr 4858dc75f0 Update package-lock.json 2020-11-15 14:22:51 -05:00
Mr. Timothy G Webb Sr 4e6a88fcee Merge https://github.com/boxbilling/boxbilling 2020-11-15 13:53:41 -05:00
Samuel Aprakuandsamapraku d521b055ac Run tests for bb-library (#729)
* Run tests for bb-library

* Separate tests for bb-modules and bb-library

Co-authored-by: samapraku <samuel-adu-ansere.apraku@s2017.tu-chemnitz.de>
2020-11-09 20:41:27 +02:00
Fordnox 42565c783b Add bootstrap theme from https://github.com/scith/boxbilling-bootstrap 2020-11-09 08:51:36 +02:00
Andrius Putna b47a4ab099 Merge pull request #718 from boxbilling/fix/group-by
Fixes group by
2020-11-04 22:27:10 +02:00
Fordnox 17dc286a1f Fixes
https://github.com/boxbilling/boxbilling/issues/713
2020-11-04 22:18:06 +02:00
Andrius Putna b2887bb3c0 Merge pull request #723 from boxbilling/evrifaessa-patch-1
[ci skip] README update.
2020-11-04 22:13:41 +02:00
Yağızhan d6936db499 [ci skip] README update. 2020-11-04 21:12:35 +03:00
Yağızhan 4b65658fcf Merge pull request #722 from boxbilling/evrifaessa-patch-1
We can use Ubuntu 20.04 (Focal Fossa) instead of 16.04
2020-11-04 20:10:36 +03:00
Yağızhan b3d57a6dcd We can use Ubuntu 20.04 (Focal Fossa) instead of 16.04
That's newer.
2020-11-04 19:07:21 +03:00
Yağızhan 866c8731ff Merge pull request #721 from boxbilling/evrifaessa-patch-1
With this PR, Docker will no longer crash on Windows systems.
2020-11-04 19:06:19 +03:00
Yağızhan 69d7c51c23 With this way, Docker will no longer crash on Windows systems. 2020-11-04 18:27:14 +03:00
Yağızhan b2e3370186 Merge pull request #720 from evrifaessa/master
Methods with the same name as their class should not be constructors
2020-11-04 18:02:03 +03:00
Yağızhan dde9ffa82b this may solve the problem I guess.. 2020-11-04 17:13:22 +03:00
Yağızhan 29b92fc294 Methods with the same name as their class will not be constructors in a future version of PHP 2020-11-04 16:37:11 +03:00
Andrius Putna 8e45a38e2b Merge pull request #717 from boxbilling/fix/packages
Fix/packages
2020-11-02 21:52:26 +02:00
Fordnox 2cbdb5b5fd Fix one of
https://github.com/boxbilling/boxbilling/issues/713
2020-11-02 21:00:31 +02:00
Fordnox cea57ecee8 npm audit fix
change demo content passwords
2020-11-02 20:21:19 +02:00
Fordnox e535e356b4 npm audit fix 2020-11-02 20:02:02 +02:00
Fordnox 6f2d796104 makefile next tag 2020-11-02 19:13:21 +02:00
Yağızhan 075896b1dc Merge pull request #714 from evrifaessa/master
When the client has logged in, show a link to his profile instead of still showing the "register" link
2020-11-02 18:52:45 +03:00
Yağızhan 51f87d828d typo 2020-11-02 18:44:42 +03:00
Yağızhan 05b64cecc3 When the client has logged in, show a link to his profile instead of still showing the "register" link 2020-11-02 18:42:56 +03:00
Andrius Putna 67abeff6a8 Merge pull request #712 from evrifaessa/patch-1
Multiple fixes
2020-11-02 16:24:03 +02:00
Yağızhan 637ef630ce We also don't need to include these. 2020-11-02 17:21:23 +03:00
Fordnox 7848e7efcb Build on correct semver tag 2020-11-02 16:19:33 +02:00
Yağızhan 7dda1abc81 Updating the created_at and updated_at in prefilled content from 2012 to 2020 2020-11-02 17:19:09 +03:00
Yağızhan 4bcf000d97 Use the "boxbilling" theme instead of "huraga" 2020-11-02 17:13:58 +03:00
Yağızhan c2055e1a4b Fix Servicesolosvm module displaying an unreachable image path 2020-11-02 16:57:47 +03:00
Andrius Putna 5190ba607e Merge pull request #711 from boxbilling/fix/remove-mysqli-dep
Remove mysqli dependency
2020-11-02 15:56:09 +02:00
Andrius Putna cff4edbf6e Merge pull request #708 from evrifaessa/patch-1
Multiple changes, mostly based on removing references to the non-existing pro plan
2020-11-02 15:45:30 +02:00
Yağızhan 389e6ea76b Remove all references to Google Sites, and load the logo from the local storage. 2020-11-02 16:23:13 +03:00
Fordnox 7bdbbe2d05 Remove mysqli dependency 2020-11-02 15:20:37 +02:00
Yağızhan dd223fa80c Delete tests\bb-modules\Serviceboxbillinglicense
We no longer need this.
2020-11-02 16:06:22 +03:00
Yağızhan 877c9bd089 Remove the "BoxBilling license product" extension
We no longer have a pro plan. We can't let people resell something that no longer exists.
2020-11-02 16:03:00 +03:00
Yağızhan 1476cbfbe7 From now on, there's no pro plan. 2020-11-02 15:55:07 +03:00
Yağızhan ed9868943d just a small change. 2020-11-02 15:16:24 +03:00
Fordnox 536a37febb Add make target to test app after build 2020-11-02 14:14:56 +02:00
Andrius Putna a2de160f48 Merge pull request #707 from evrifaessa/patch-2
Remove all entities of license checking.
2020-11-02 13:31:04 +02:00
Yağızhan e52200939c Remove all entities of license checking. 2020-11-02 14:11:41 +03:00
Andrius Putna a998064930 Update README.md 2020-11-02 12:55:01 +02:00
Fordnox 4008a5a4b4 Next tag script 2020-11-02 03:03:26 +02:00