davidl/ploi-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
487 Commits 3 Branches 87 Tags
2af546643e3845febb421da6e0a3f4bec546bc2c
Commit Graph

253 Commits

Author SHA1 Message Date
Dennis
2af546643e Merge branch 'develop' 2022-09-19 11:07:42 +02:00
Dennis
e63b13e5fd package updates 2022-09-19 11:07:35 +02:00
Dennis
36385c2242 wip 2022-09-11 08:41:00 +02:00
Dennis
ed67a44f5f wip 2022-09-10 16:51:00 +02:00
Dennis
5fa9c334ee prod 2022-08-27 20:04:00 +02:00
Dennis
d1f50c8dd9 prod 2022-08-27 20:03:25 +02:00
Dennis
cbd6a227ee Merge branch 'develop' 
# Conflicts:
#	public/build/assets/app.1ce28008.css
#	public/js/1535.js
#	public/js/1587.js
#	public/js/1603.js
#	public/js/1970.js
#	public/js/1984.js
#	public/js/2035.js
#	public/js/2502.js
#	public/js/2669.js
#	public/js/2741.js
#	public/js/3067.js
#	public/js/344.js
#	public/js/3495.js
#	public/js/3506.js
#	public/js/3686.js
#	public/js/4104.js
#	public/js/4282.js
#	public/js/4482.js
#	public/js/4598.js
#	public/js/4627.js
#	public/js/4710.js
#	public/js/4967.js
#	public/js/5035.js
#	public/js/5168.js
#	public/js/547.js
#	public/js/5503.js
#	public/js/5597.js
#	public/js/5727.js
#	public/js/5867.js
#	public/js/630.js
#	public/js/6341.js
#	public/js/6366.js
#	public/js/6658.js
#	public/js/6734.js
#	public/js/6887.js
#	public/js/696.js
#	public/js/6974.js
#	public/js/7007.js
#	public/js/7022.js
#	public/js/7319.js
#	public/js/7414.js
#	public/js/7644.js
#	public/js/7790.js
#	public/js/7942.js
#	public/js/8162.js
#	public/js/8399.js
#	public/js/8502.js
#	public/js/8665.js
#	public/js/8899.js
#	public/js/8968.js
#	public/js/9039.js
#	public/js/9049.js
#	public/js/9053.js
#	public/js/917.js
#	public/js/9202.js
#	public/js/9488.js
#	public/js/9617.js
#	public/js/9737.js
#	public/js/9972.js
#	public/js/9989.js
#	public/js/9991.js
#	public/js/app.js
 2022-08-19 09:39:27 +02:00
Dennis
8c001cf984 wip 2022-08-19 09:25:01 +02:00
Dennis
a73adb9acf wip 2022-08-18 13:34:40 +02:00
Dennis
b1667ff445 wip 2022-08-17 09:59:02 +02:00
Dennis
37ea8aa6b0 remove old files 2022-08-17 09:33:12 +02:00
Dennis
d4c495eaee wip 2022-08-17 09:32:33 +02:00
Dennis
ff8982c2ee w 2022-08-15 10:06:14 +02:00
Dennis
95e7682cc2 wip 2022-08-09 09:18:37 +02:00
Dennis
251c29b4bd wip 2022-08-09 09:13:42 +02:00
Ralph J. Smit
e601222b4f Tweak system page design 2022-08-06 17:32:12 +02:00
Ralph J. Smit
60c951a1f8 Build files 2022-08-06 17:20:41 +02:00
Ralph J. Smit
560100e592 Build assets 2022-08-06 15:45:28 +02:00
Ralph J. Smit
0f5ef71936 Create manifest.json 2022-08-06 15:43:19 +02:00
Ralph J. Smit
0fddf4f348 Support ticket system 2022-08-06 15:36:27 +02:00
Ralph J. Smit
9d1b12b0a3 Admin panel v1 2022-08-05 18:11:23 +02:00
Dennis
b63d4e753b Merge branch '120-move-mix-to-vite' into V3 
# Conflicts:
#	composer.lock
#	package.json
#	public/css/app.css
#	public/js/app.js
#	resources/deprecated/Admin/Alerts/Create.vue
#	resources/deprecated/Admin/Alerts/Edit.vue
#	resources/deprecated/Admin/Alerts/Index.vue
#	resources/deprecated/Admin/Documentation/Articles/Create.vue
#	resources/deprecated/Admin/Documentation/Articles/Edit.vue
#	resources/deprecated/Admin/Documentation/Articles/Index.vue
#	resources/deprecated/Admin/Documentation/Create.vue
#	resources/deprecated/Admin/Documentation/Edit.vue
#	resources/deprecated/Admin/Documentation/Index.vue
#	resources/deprecated/Admin/Packages/Create.vue
#	resources/deprecated/Admin/Packages/Edit.vue
#	resources/deprecated/Admin/Packages/Index.vue
#	resources/deprecated/Admin/Servers/Index.vue
#	resources/deprecated/Admin/Services/Index.vue
#	resources/deprecated/Admin/Services/Provider/Edit.vue
#	resources/deprecated/Admin/Services/Providers.vue
#	resources/deprecated/Admin/Services/Server/Edit.vue
#	resources/deprecated/Admin/Services/Servers.vue
#	resources/deprecated/Admin/Services/Site/Edit.vue
#	resources/deprecated/Admin/Services/Sites.vue
#	resources/deprecated/Admin/Sites/Index.vue
#	resources/deprecated/Admin/Support/Index.vue
#	resources/deprecated/Admin/Support/Show.vue
#	resources/deprecated/Admin/Terms.vue
#	resources/deprecated/Admin/Users/Create.vue
#	resources/deprecated/Admin/Users/Edit.vue
#	resources/deprecated/Admin/Users/Index.vue
#	resources/deprecated/Admin/Users/Show.vue
#	resources/js/Pages/Sites/Dns.vue
 2022-07-27 13:30:56 +02:00
Dennis
fbe7641cb7 wip 2022-07-27 13:30:13 +02:00
Dennis Smink
62084f590e wip 2022-07-21 15:24:59 +02:00
Dennis Smink
c7edf262f6 Merge branch 'develop' 
# Conflicts:
#	public/css/app.css
#	public/js/1042.js
#	public/js/1304.js
#	public/js/1438.js
#	public/js/1582.js
#	public/js/1973.js
#	public/js/2232.js
#	public/js/2306.js
#	public/js/2426.js
#	public/js/2658.js
#	public/js/2668.js
#	public/js/2693.js
#	public/js/2940.js
#	public/js/2999.js
#	public/js/3038.js
#	public/js/3292.js
#	public/js/3739.js
#	public/js/4144.js
#	public/js/43.js
#	public/js/4379.js
#	public/js/4485.js
#	public/js/4596.js
#	public/js/4695.js
#	public/js/47.js
#	public/js/4710.js
#	public/js/4766.js
#	public/js/4791.js
#	public/js/4804.js
#	public/js/4946.js
#	public/js/5641.js
#	public/js/565.js
#	public/js/5766.js
#	public/js/5865.js
#	public/js/6038.js
#	public/js/6282.js
#	public/js/6289.js
#	public/js/6340.js
#	public/js/6424.js
#	public/js/6511.js
#	public/js/6545.js
#	public/js/684.js
#	public/js/6861.js
#	public/js/701.js
#	public/js/7054.js
#	public/js/7210.js
#	public/js/7399.js
#	public/js/7611.js
#	public/js/7767.js
#	public/js/8027.js
#	public/js/8309.js
#	public/js/8371.js
#	public/js/8607.js
#	public/js/8786.js
#	public/js/883.js
#	public/js/908.js
#	public/js/9195.js
#	public/js/9281.js
#	public/js/9353.js
#	public/js/app.js
 2022-07-21 15:24:23 +02:00
GitHub Actions
39e5d20444 Run Laravel Mix en build front-end assets 2022-07-20 14:04:52 +00:00
GitHub Actions
a85be2d666 Run Laravel Mix en build front-end assets 2022-07-20 14:02:51 +00:00
GitHub Actions
0c7398c7ac Run Laravel Mix en build front-end assets 2022-07-20 13:59:07 +00:00
Ralph J. Smit
2df37131d1 Build assets #1 2022-07-20 15:49:48 +02:00
Ralph J. Smit
705739d2d3 Merge branch '120-move-mix-to-vite' into develop-test 2022-07-20 15:47:01 +02:00
Ralph J. Smit
0cd7c7e4f6 Remove Mix files 2022-07-20 15:37:55 +02:00
Dennis Smink
57f783490b ww 2022-07-20 08:26:14 +02:00
Dennis Smink
eaab262629 Merge branch '61-ploi-core-design' into develop 
# Conflicts:
#	public/js/app.js
 2022-07-20 08:26:10 +02:00
Dennis Smink
e2e05f9cbf wip 2022-07-20 08:25:33 +02:00
Dennis Smink
24ce8bc60d Merge branch '26-duplicate-check' into develop 
# Conflicts:
#	app/Http/Controllers/SiteController.php
#	package-lock.json
#	public/js/app.js
 2022-07-20 08:17:59 +02:00
Dennis Smink
75592aaeb2 Do this check server sided 2022-07-20 08:16:42 +02:00
Dennis Smink
c11ad19220 w 2022-07-20 08:08:09 +02:00
Dennis Smink
db799a7d6a w 2022-07-20 08:06:53 +02:00
Dennis Smink
7fea371857 Merge branch '25-add-ssl-for-alias-domains-automatically' into develop 
# Conflicts:
#	public/js/app.js
 2022-07-20 08:06:48 +02:00
Dennis Smink
d7b3899e71 Few fixes 2022-07-20 08:06:37 +02:00
Ralph J. Smit
92bb321a68 WIP 2022-07-19 21:46:33 +02:00
Ralph J. Smit
57c8997dd0 Fix 2022-07-19 21:32:14 +02:00
Ralph J. Smit
2df031a60f Check whether domain already exists when creating site 2022-07-19 21:17:21 +02:00
Ralph J. Smit
77384a1abe Request new certificate automatically after creating new alias 2022-07-19 19:04:01 +02:00
GitHub Actions
d7632d8289 Run Laravel Mix en build front-end assets 2022-07-19 13:12:48 +00:00
Ralph J. Smit
3c510906ee General stuff 2022-07-01 21:31:35 +02:00
Dennis
c9179fbf90 proper mix 2022-07-01 07:52:51 +02:00
Dennis
fe5268971a Merge branch '114-refresh-system-version-in-system-tab' into develop 
# Conflicts:
#	public/js/app.js
 2022-07-01 07:52:21 +02:00
Dennis
81fcfac803 Merge branch '76-the-use-of-html-tags-or-markdown-in-alert-messages' into develop 
# Conflicts:
#	public/js/app.js
 2022-07-01 07:50:17 +02:00
Ralph J. Smit
4a2faf0bce Build files 2022-06-30 18:18:34 +02:00