58997e59bc
updated links and gitignore
2022-05-26 22:03:45 +09:30
e31204a235
Merge branch 'angular-13-upgrade' into 'master'
...
update to angular 13
See merge request inkletblot/inkletblot-com-v2!18
2021-12-21 22:42:54 +00:00
aa125b836f
update to angular 13
2021-12-22 09:12:33 +10:30
877f94a89e
Merge branch 'projects-width' into 'master'
...
updated projects width, kinda broken with code though, need to make sure to keep things slim
See merge request inkletblot/inkletblot-com-v2!17
2021-12-21 10:58:52 +00:00
3dfb91424c
updated projects width, kinda broken with code though, need to make sure to keep things slim
2021-12-21 21:23:44 +10:30
1bd02ad4e5
Merge branch 'more-links' into 'master'
...
added some new links to links :)
See merge request inkletblot/inkletblot-com-v2!16
2021-12-21 04:37:42 +00:00
Solomon Laing
8cb4204800
added some new links to links :)
2021-12-21 15:04:28 +10:30
26cc45cb45
Merge branch 'develop' into 'master'
...
minor updates due to domain changes, project filtering and cicd
See merge request inkletblot/inkletblot-com-v2!15
2021-07-07 05:30:31 +00:00
16c8d4c6ae
Update .gitlab-ci.yml to use ssh jump host
2021-07-07 05:27:35 +00:00
Solomon Laing
9e12a95bfe
added basic filter to projects so gitlab and uncategorized are separate
2021-07-07 14:52:51 +09:30
Solomon Laing
8789390c67
updated links due to domain changes
2021-07-07 14:28:10 +09:30
c13b67dd82
Merge branch 'develop' into 'master'
...
retheme of nav and removal of scrolling bug
See merge request inkletblot/inkletblot-com-v2!14
2021-06-15 10:51:00 +00:00
1e24dc45dd
Merge branch 'feature/nav-theme' into 'develop'
...
Feature/nav theme
See merge request inkletblot/inkletblot-com-v2!13
2021-06-15 10:46:27 +00:00
Solomon Laing
2935df9b90
finished nav re-theme and fixed scrolling bug
2021-06-15 20:15:28 +09:30
a4e891c8b5
first go of nav restyle is complete, removed blue and replaced with visual que
2021-06-14 16:19:37 +09:30
86f7aa143a
first go of nav restyle is complete, removed blue and replaced with visual que
2021-06-14 16:14:19 +09:30
8f3a17266e
Merge branch 'inkletblot-master-patch-88271' into 'master'
...
Update .gitlab-ci.yml
See merge request inkletblot/inkletblot-com-v2!12
2021-06-13 09:41:51 +00:00
444f0f62fa
Update .gitlab-ci.yml
2021-06-13 09:40:03 +00:00
0e22c689c8
Merge branch 'develop' into 'master'
...
added image bounding for posts
See merge request inkletblot/inkletblot-com-v2!11
2021-06-13 09:38:52 +00:00
Solomon Laing
585826a60f
added image bounding for posts
2021-06-13 19:06:54 +09:30
a1341d5f06
Merge branch 'develop' into 'master'
...
Release of re-theme
See merge request inkletblot/inkletblot-com-v2!10
2021-06-13 06:14:51 +00:00
72b99bb748
Merge branch 'feature/re-theme' into 'develop'
...
completed first re-theme, colors are red and brown/grey now also layout is drasitaclly changed
See merge request inkletblot/inkletblot-com-v2!9
2021-06-13 06:08:07 +00:00
Solomon Laing
979481b39c
completed first re-theme, colors are red and brown/grey now also layout is drasitaclly changed
2021-06-13 15:36:11 +09:30
671d34d552
Merge branch 'develop' into 'master'
...
pushing through some changes to links
See merge request inkletblot/inkletblot-com-v2!8
2021-06-06 04:49:56 +00:00
0bbe8e4627
Merge branch 'bugfix/dead-links-removal' into 'develop'
...
added some links and removed old borked ones
See merge request inkletblot/inkletblot-com-v2!7
2021-06-06 04:47:29 +00:00
Solomon Laing
8ea795def4
added merge only ci test
2021-06-06 14:17:20 +09:30
Solomon Laing
17c578a1e2
added merge only ci test
2021-06-06 14:16:24 +09:30
Solomon Laing
ff1e72b3df
added merge only ci test
2021-06-06 14:12:46 +09:30
Solomon Laing
8147d0db77
added some links and removed old borked ones
2021-06-06 14:07:25 +09:30
f906145242
Merge branch 'develop' into 'master'
...
Release of projects
See merge request inkletblot/inkletblot-com-v2!6
2021-06-06 04:04:24 +00:00
2c6d486967
Merge branch 'feature/projects' into 'develop'
...
Projects is complete
See merge request inkletblot/inkletblot-com-v2!5
2021-06-06 04:00:53 +00:00
Solomon Laing
ac430a46d1
first release of projects ready
2021-06-06 13:27:11 +09:30
Solomon Laing
5d754396da
updated code (started to) for new api, npm install is busted due to out of date deps I think, moving to different computer
2021-06-06 12:10:25 +09:30
Solomon Laing
17e74a18a3
got basic implementation of project cards and the suppporting services/routing working. need to style project page now and will have first pass done
2021-06-06 12:10:25 +09:30
Solomon Laing
036f48b3f0
Got api request working.
...
I added the necessary header to the api server and then changed the content type of the request to text/plain to disabled the preflight OPTIONS request which the server was erroring on.
Not sure about the security of all this but it's a very basic website and I don't think it'll be an issue.
2021-06-06 12:10:25 +09:30
Solomon Laing
fbb00cdecc
started implementation of projects page. currently need to work out cors
2021-06-06 12:10:25 +09:30
Solomon Laing
fd70c64fc2
updated npm deps, I think?
2021-06-05 21:10:17 +09:30
a6ef143e11
Update .gitlab-ci.yml
2021-06-05 11:24:49 +00:00
solomon laing
eec0319361
Merge branch 'develop' into 'master'
...
Develop
See merge request inkletblot/inkletblot-com-v2!4
2021-04-13 00:04:02 +00:00
solomon laing
49c751b284
Merge branch 'feature/homepage' into 'develop'
...
added home page content, I am yet to add mobile layouts but the content of teh page is complete.
See merge request inkletblot/inkletblot-com-v2!3
2021-04-13 00:01:20 +00:00
Solomon Laing
49baafc3c7
added home page content, I am yet to add mobile layouts but the content of teh page is complete.
2021-04-05 21:16:31 +09:30
solomon laing
e5375d5df7
Merge branch 'develop' into 'master'
...
Develop
See merge request inkletblot/inkletblot-com-v2!2
2021-04-02 11:43:20 +00:00
9d568df286
minor stylings for initial release
2021-04-02 22:06:19 +10:30
8fd679489c
merged master into develop
2021-04-02 22:06:12 +10:30
5ee955e93c
merged master into develop
2021-04-02 22:05:47 +10:30
4e309f4d30
merged master into develop
2021-04-02 22:04:26 +10:30
Solomon Laing
ff3de207cf
updated gitlab-ci
2021-04-01 20:57:51 +10:30
Solomon Laing
9aeb084045
updated gitlab-ci
2021-04-01 20:49:53 +10:30
Solomon Laing
68a5f93c52
updated gitlab-ci
2021-04-01 20:31:20 +10:30
Solomon Laing
2ab5e33e0f
updated gitlab-ci
2021-04-01 20:28:44 +10:30
