Commit graph

264 commits

Author SHA1 Message Date
a8e8c96f8b Upgrade to circlci 2018-08-09 21:02:41 -07:00
b5b61d2f3a Merge branch 'family-blog-update' into 'master'
About us update and add family blog

See merge request softinio/softinio.com!21
2018-07-30 04:11:12 +00:00
351dc05f46 About us update and add family blog 2018-07-29 21:10:03 -07:00
990680f3ec Merge branch 'correct-typo' into 'master'
Updated PDF resume with typo correction

See merge request softinio/softinio.com!20
2018-04-17 16:34:15 +00:00
a0a1cb43f0 Updated PDF resume with typo correction 2018-04-17 09:33:14 -07:00
146ea84292 Merge branch 'correct-typo' into 'master'
corrected typo

See merge request softinio/softinio.com!19
2018-04-17 16:23:01 +00:00
8bc8da5677 corrected typo 2018-04-17 09:20:56 -07:00
66a42a6cc7 Merge branch 'update-pipeline' into 'master'
Removed unnecessary steps in gitlab ci as already included in base Docker image

See merge request softinio/softinio.com!18
2018-04-17 15:49:06 +00:00
198df29334 Removed unnecessary steps in gitlab ci as already included in base Docker image 2018-04-17 08:45:15 -07:00
55e2654aca Added Resume page 2018-04-16 22:32:10 -07:00
542becc2b3 Merge branch 'template-update' into 'master'
Update Template and add gitlab link

See merge request softinio/softinio.com!16
2018-03-26 15:34:19 +00:00
b17c335e98 Added link to gitlab 2018-03-26 08:32:16 -07:00
b49188f88c Updated theme and README 2018-03-26 08:27:29 -07:00
bf75a472ee Merge branch 'new-docker-image-for-gitlab' into 'master'
Updated deploy to use own docker image

See merge request softinio/softinio.com!15
2018-03-16 18:13:02 +00:00
32a587a16d Updated deploy to use own docker image 2018-03-16 18:13:02 +00:00
3425cb9582 Merge branch 'new-docker-image-for-gitlab' into 'master'
Use new docker image for deploys

See merge request softinio/softinio.com!14
2018-03-16 16:32:15 +00:00
de164477ee Use new docker image for deploys 2018-03-16 09:22:47 -07:00
13e34a5278 Merge branch 'switch-to-jane-theme' into 'master'
Change to using new theme called Jane

See merge request softinio/softinio.com!13
2018-03-16 01:17:15 +00:00
709b7be673 Added missing license 2018-03-15 18:15:21 -07:00
37cf7a0191 Added missing assets 2018-03-15 18:10:31 -07:00
8d4ce8d565 Added back README 2018-03-15 18:06:31 -07:00
31e64a1bae Change to using new theme called Jane 2018-03-15 18:02:09 -07:00
1667656d4a Merge branch 'move-to-hyde-theme' into 'master'
Move to hyde theme

See merge request softinio/softinio.com!12
2018-02-21 16:17:48 +00:00
de8353d8e8 Updated about me with my current interests 2018-02-18 11:11:50 -08:00
84f69d93ee Removed USA from about me page 2018-02-18 10:55:23 -08:00
27bad9df42 Changed theme sidebar color 2018-02-18 08:56:46 -08:00
9747e19ece Removed my photo from sidebar 2018-02-18 00:32:26 -08:00
1a64efac69 Reverted back to hyde-x theme and removed all meetup related content 2018-02-18 00:25:45 -08:00
1e44952695 Merge branch 'add-ssl' into 'master'
add cloudfront cache invalidation to ci

See merge request softinio/softinio.com!11
2017-12-17 01:52:36 +00:00
33bdcbdb3c add cloudfront cache invalidation to ci 2017-12-16 20:51:32 -05:00
b876914371 Merge branch 'add-ssl' into 'master'
updated links to https

See merge request softinio/softinio.com!10
2017-12-17 01:25:26 +00:00
b128fa2d45 updated links to https 2017-12-16 20:23:15 -05:00
3591f6c475 Update README.md to remove wrecker icon as not longer used 2017-12-15 14:42:40 +00:00
8a22ce9e4e Merge branch 'move-to-gitlab' into 'master'
Added gitlabci settings

See merge request softinio/softinio.com!9
2017-12-15 14:41:56 +00:00
dd9e872160 Delete werker 2017-12-15 09:30:59 -05:00
cfbe724c4f Added gitlabci settings 2017-12-15 09:29:07 -05:00
Salar Rahmanian
b51410d901 Merge pull request #8 from softinio/correct-icons
corrected missing font
2017-06-28 15:23:34 -04:00
bb531d9865 corrected missing font 2017-06-28 15:22:34 -04:00
Salar Rahmanian
07ccec8f2c Merge pull request #7 from softinio/change-font
Changed font and removed anything copyrighted by spf13
2017-06-28 14:57:29 -04:00
1f6f6a8f3d Changed font and removed anything copyrighted by spf13 2017-06-28 14:56:44 -04:00
Salar Rahmanian
54c9858898 Merge pull request #6 from softinio/meetup-updates
added organizer section to all right asides
2017-06-25 14:53:09 -04:00
162debb605 added organizer section to all right asides 2017-06-25 14:50:34 -04:00
Salar Rahmanian
35ec04b950 Merge pull request #5 from softinio/meetup-updates
Meetup updates
2017-06-25 14:46:56 -04:00
ab64b97ee8 changed to low carb option 2017-06-25 14:46:21 -04:00
ee133fbc0a Correction to agenda 2017-06-25 14:45:21 -04:00
Salar Rahmanian
9aca925546 Merge pull request #4 from softinio/meetup-updates
Fixed issue with meetup section
2017-06-25 14:40:01 -04:00
2aff8acccf Fixed issue with meetup section 2017-06-25 14:39:37 -04:00
0ad2ead643 Fixed issue with meetup section 2017-06-25 14:38:02 -04:00
Salar Rahmanian
3d4a7610d7 Merge pull request #3 from softinio/meetup-updates
Added section for requesting to be sponsor or speaker
2017-06-25 14:18:59 -04:00
266c745858 Added section for requesting to be sponsor or speaker 2017-06-25 14:18:20 -04:00