641 Commits

All Branches

Search

Author	SHA1	Message	Date
Sarah Jamie Lewis	240778f7e0	Merge pull request 'script to fetch further syntax fix and version update, now android actually compiles for me :)' (#64) from fetch2 into trunk ... Reviewed-on: #64	2021-04-30 13:32:39 -07:00
Dan Ballard	fb36541de2	script to fetch further syntax fix and version update, now android actually compiles for me :)	2021-04-30 13:28:49 -07:00
Sarah Jamie Lewis	a7e587a34c	Merge pull request 'fix wget syntax and remove android .aar from git repo' (#63) from rm-aar into trunk ... Reviewed-on: #63	2021-04-29 16:20:04 -07:00
Dan Ballard	b43a104997	fix wget syntax and remove android .aar from git repo	2021-04-29 12:37:27 -07:00
erinn	97b5709c75	Merge pull request 'Accept/Reject Group invites & other bug fixes' (#62) from groups into trunk ... Reviewed-on: #62	2021-04-28 16:55:57 -07:00
Sarah Jamie Lewis	e3dc42d7bd	Accept/Reject Group invites & other bug fixes	2021-04-28 15:45:07 -07:00
Sarah Jamie Lewis	141a5b8f3d	Merge pull request 'fix message bubble rendering errors/lag' (#60) from flix into trunk ... Reviewed-on: #60	2021-04-28 15:06:14 -07:00
erinn	20f7d5c490	unbreaky my heart	2021-04-28 15:04:41 -07:00
erinn	66fcbb2ff6	unbreaking things	2021-04-28 14:21:19 -07:00
erinn	5e3c3b95a4	breaking things	2021-04-28 14:20:09 -07:00
Dan Ballard	b2bb4d3de5	.drone.yml enable fetch libs	2021-04-28 14:10:45 -07:00
Sarah Jamie Lewis	81362210d1	Merge pull request 'fetch' (#61) from fetch into trunk ... Reviewed-on: #61	2021-04-28 12:32:54 -07:00
Dan Ballard	f9d3ffd76a	script to fetch libcwtch-go libs for linux, android and windows based on commited version	2021-04-27 17:34:49 -07:00
Dan Ballard	d31e6f8894	Merge branch 'trunk' of git.openprivacy.ca:flutter/flutter_app into trunk	2021-04-27 14:08:45 -07:00
erinn	b166b551d9	fixing most things	2021-04-27 14:01:36 -07:00
erinn	c51da558c9	fixing more things	2021-04-27 13:39:07 -07:00
erinn	b34945807d	Merge pull request 'Update Tor Icons' (#59) from groups into trunk ... Reviewed-on: #59	2021-04-27 13:17:56 -07:00
Sarah Jamie Lewis	fb9322dad1	Update Tor Icons	2021-04-27 13:17:03 -07:00
erinn	94ba40a557	Merge branch 'trunk' of git.openprivacy.ca:flutter/flutter_app into flix	2021-04-27 13:02:33 -07:00
erinn	ab2d8b6330	fixing things	2021-04-27 13:02:27 -07:00
erinn	dfe9467f0c	Merge pull request 'Use ProfileImage for AddEditProfileView' (#58) from groups into trunk ... Reviewed-on: #58	2021-04-27 12:36:23 -07:00
Sarah Jamie Lewis	f0e7a1de88	Use ProfileImage for AddEditProfileView	2021-04-27 12:34:52 -07:00
Dan Ballard	76f22a9218	.drone.yml windows deploy pscp syntax fix	2021-04-27 12:31:09 -07:00
erinn	94db70735f	Merge pull request 'bugfixes from initial android testing' (#57) from groups into trunk ... Reviewed-on: #57	2021-04-27 12:16:33 -07:00
erinn	9276bbb100	Merge branch 'trunk' into groups	2021-04-27 12:15:49 -07:00
Sarah Jamie Lewis	75f03c2830	bugfixes from initial android testing	2021-04-27 08:17:14 -07:00
Dan Ballard	321cc5dfa5	.drone.yml windows deploy pscp syntax fix	2021-04-25 10:22:24 -07:00
Dan Ballard	80aaab8fe5	.drone.yml windows deploy pscp syntax fix	2021-04-25 08:10:04 -07:00
Dan Ballard	47b51e900c	.drone.yml windows deploy pscp syntax fix	2021-04-25 07:21:41 -07:00
Dan Ballard	36588198cf	.drone.yml windows deploy	2021-04-24 08:23:11 -07:00
Dan Ballard	5237b155e8	.drone.yml windows deploy i literally dont know renable envs	2021-04-23 17:53:20 -07:00
Dan Ballard	e764cb9daa	.drone.yml windows deploy i literally dont know renable cmds	2021-04-23 17:39:47 -07:00
Dan Ballard	51a4b7a26c	.drone.yml windows deploy i literally dont know	2021-04-23 17:15:02 -07:00
Dan Ballard	d686a1299a	.drone.yml windows deploy wat	2021-04-23 16:50:43 -07:00
Dan Ballard	346fc35558	.drone.yml windows deploy use openpriv/pscp	2021-04-23 15:46:16 -07:00
erinn	50f381a1f8	Merge pull request 'Fix Tab Controller Length' (#56) from groups into trunk ... Reviewed-on: #56	2021-04-23 14:43:03 -07:00
erinn	de62f2ff96	Merge branch 'trunk' into groups	2021-04-23 14:42:51 -07:00
Sarah Jamie Lewis	8ced262d8f	Fix Tab Controller Length	2021-04-23 14:40:18 -07:00
erinn	059aecd4d4	Merge pull request 'Handle Group Invite (Stub)' (#55) from groups into trunk ... Reviewed-on: #55	2021-04-23 14:30:31 -07:00
Sarah Jamie Lewis	23c43189f8	Handle Group Invite (Stub)	2021-04-23 14:25:27 -07:00
erinn	f0d873a011	Merge pull request 'Group Settings Stub' (#54) from groups into trunk ... Reviewed-on: #54	2021-04-23 13:07:51 -07:00
erinn	f826fb93b2	Merge branch 'trunk' into groups	2021-04-23 13:06:21 -07:00
Sarah Jamie Lewis	56c03fb954	Group Settings Stub	2021-04-23 12:59:27 -07:00
Dan Ballard	98a9e283c5	.drone.yml windows deploy use custom docker-scp v1 test ?????	2021-04-22 17:13:42 -07:00
Dan Ballard	958fff529c	.drone.yml windows deploy use custom docker-scp v1 test	2021-04-22 16:51:27 -07:00
Dan Ballard	2b3bfc46ab	.drone.yml windows deploy use custom docker-scp v1	2021-04-22 15:59:02 -07:00
Dan Ballard	431b0f9b3d	.drone.yml windows deploy use custom docker-scp	2021-04-22 14:56:15 -07:00
erinn	569ecf73b8	Merge pull request 'Bare bones groups support' (#53) from groups into trunk ... Reviewed-on: #53	2021-04-22 14:51:52 -07:00
erinn	ec891c177b	Merge branch 'trunk' into groups	2021-04-22 14:50:32 -07:00
Sarah Jamie Lewis	a5a8f59841	Bare bones groups support	2021-04-22 14:47:09 -07:00