1627 Commits

Author SHA1 Message Date
88a850e8fc More progress and fixes 2022-01-29 22:21:10 +00:00
10c9194c5f Progress 2022-01-29 20:05:11 +00:00
94b477d8f7 Continued new volume management stuff. 2021-06-25 01:48:20 +01:00
ba38f4fd19 Restructuring and expanding storage system. 2021-06-23 21:22:06 +01:00
b18c9384b3 Merge branch 'feature/line-endings' into 'develop'
Fixed line endings

See merge request spexeah/asuro!13
2021-06-22 23:00:51 +00:00
d4ea9c52ff Fixed line endings 2021-06-22 23:57:27 +01:00
1e64931ec2 Merge branch 'feature/gitattributes' into 'develop'
added gitattributes

See merge request spexeah/asuro!11
2021-06-22 22:45:44 +00:00
9b2e49b725 added gitattributes 2021-06-22 23:42:43 +01:00
f1eac5e445 Merge branch 'develop' into 'master'
Develop

See merge request spexeah/asuro!10
2021-06-22 20:55:54 +00:00
07b7cb214d Update contributors.md 2021-06-22 20:55:23 +00:00
704b6a1757 Update license.md 2021-06-22 20:54:58 +00:00
847098987e Revert "Update license.md"
This reverts commit a12bba2cb13795304c71f937d3cc9985c326a547
2021-06-22 20:54:06 +00:00
b254ca5f77 Revert "Update LICENSE"
This reverts commit 8f48027d2bb63e39dc8278a7c40bfba71b50538c
2021-06-22 20:53:14 +00:00
8f48027d2b Update LICENSE 2021-06-22 20:49:26 +00:00
a12bba2cb1 Update license.md 2021-06-22 20:48:21 +00:00
edaa3b1293 Merge branch 'develop' into 'master'
Develop

See merge request spexeah/asuro!9
2021-06-22 20:35:45 +00:00
b12f7e3f3f Merge branch 'feature/apache-license' into 'develop'
Apache License

See merge request spexeah/asuro!8
2021-06-22 20:33:51 +00:00
42ba93bc57 Merge branch 'feature/cleanup' into 'develop'
Cleaned up junk from Kernel.pas

See merge request spexeah/asuro!7
2021-06-22 20:33:04 +00:00
0d56d0b191 Merge branch 'feature/graphics' into 'develop'
Added VBE & VGA insmods to GRUB

See merge request spexeah/asuro!6
2021-06-22 20:32:52 +00:00
64b3c9a7ba Apache License
Added the apache license to all source files, accounting for authors. Also added a license.md containing the apache license + contributors.md listing all contributors.
2021-06-22 21:31:17 +01:00
c2a62e2006 Added VBE & VGA insmods to GRUB
Added insmod vbe + insmod vga to the grub.cfg.
2021-06-22 20:49:52 +01:00
18746a2195 Cleaned up junk from Kernel.pas
Cleaned out a load of Hashmap test code from Kernel.pas
2021-06-22 20:48:01 +01:00
6d0fa06d74 Merge branch 'develop' into 'master'
Develop

See merge request spexeah/asuro!5
2021-06-20 21:18:01 +00:00
cd721ffd25 Merge branch 'feature/readme' into 'develop'
Readme.md added.

See merge request spexeah/asuro!4
2021-06-20 21:15:05 +00:00
4676665d22 Readme.md added.
Added a Readme file giving instructions on how to setup the Asuro development environment.
2021-06-20 22:14:23 +01:00
32565989ff Merge branch 'feature/vfs' into 'develop'
Added comments to init()

See merge request spexeah/asuro!3
2021-06-20 20:24:10 +00:00
224392358d Added comments to init()
Added comments to clearly indicate each step during the vfs init procedure.
2021-06-20 21:21:45 +01:00
c140fd7e57 Merge branch 'develop' into 'master'
Develop

See merge request spexeah/asuro!2
2021-06-20 20:17:11 +00:00
d269bb2d29 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	.gitignore
2021-06-20 21:14:16 +01:00
b78b0e040a Merge branch 'feature/ignore-generated-files' into 'develop'
Added Asuro.pas to .gitignore

See merge request spexeah/asuro!1
2021-06-20 20:07:25 +00:00
9986bb877c Real Update to compose file, fixed line endings issue 2021-06-20 21:06:25 +01:00
29f9a7396a Update to compose file, fixed line endings issue 2021-06-20 21:05:25 +01:00
57ba2f515a Added Asuro.pas to .gitignore
Asuro.pas is generated at compile-time by the compilation script.
2021-06-20 21:04:51 +01:00
bd9fbd2da6 Added lots of stuff
Added stuff to vfs + Dockerized the compilation & added some vscode cfg.
2021-06-20 02:49:56 +01:00
1dca0d18e2 Versioning not grabbing all branches for revision. 2020-10-29 15:38:43 +00:00
303e96f18d More version file fixes. 2020-10-29 15:35:00 +00:00
41d86dd3d5 version readded after accidental deletion. 2020-10-29 15:33:28 +00:00
7e9674a63d Cleanup 2020-10-29 15:27:40 +00:00
c6b7ba510d Cleanup and gitignore! 2020-10-29 15:23:40 +00:00
cb3a812cb9 Update .gitlab-ci.yml 2020-10-29 12:37:57 +00:00
85bb527f61 Update .gitlab-ci.yml 2020-10-29 12:15:58 +00:00
0d60e8b354 Update .gitlab-ci.yml 2020-10-29 12:15:33 +00:00
b4b668f204 Update .gitlab-ci.yml 2020-10-29 12:08:20 +00:00
7ebcc9ba25 Update .gitlab-ci.yml 2020-10-29 12:07:41 +00:00
e50a7a66ce Update .gitlab-ci.yml 2020-10-29 12:07:28 +00:00
fdbf7d028a Add .gitlab-ci.yml 2020-10-29 12:06:32 +00:00
e26889ea09 Changed versioning.sh to work with Git 2020-10-29 11:57:39 +00:00
5ef73b42cf removed VM references 2020-10-29 01:12:38 +00:00
9a549379f6 Corrected build scripts for SVN->Git 2020-10-29 00:51:43 +00:00
kieron
df71543dee Versioning Auto-Commit
git-svn-id: https://spexeah.com:8443/svn/Asuro@1578 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c
2020-10-27 19:06:20 +00:00