Commit Graph

679 Commits

Author SHA1 Message Date
erinn 32b617d3ec new scaling system pass two
the build was successful Details
2020-12-17 08:10:57 -08:00
erinn c87bf93b0e update translations
the build was successful Details
2020-12-16 19:44:58 -08:00
erinn 722fa37db9 Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui into newzoom
the build failed Details
2020-12-16 19:41:18 -08:00
erinn 72af3dbeeb addressing comments on #457
the build was successful Details
2020-12-16 19:31:17 -08:00
Dan Ballard 1f98899f6b drone: android auto increment AndroidManifest versionCode for second android build (arm64) - fix: don't overwrite file while reading
the build was successful Details
2020-12-15 17:58:17 -08:00
Dan Ballard b586248bda drone: android auto increment AndroidManifest versionCode for second android build (arm64)
the build failed Details
2020-12-15 17:24:45 -08:00
Sarah Jamie Lewis f44cb450a5 Merge pull request 'build.gradle include' (#455) from android-packaging into master
the build was successful Details
Reviewed-on: #455
2020-12-15 13:27:10 -08:00
Sarah Jamie Lewis f354f5a81a Merge branch 'master' into android-packaging
the build was successful Details
2020-12-15 13:27:02 -08:00
Dan Ballard e6145d6e12 extend build.gradle to have seperate paths for arm7 and arm64 and perform the appropriate link/rename so androiddeployqt and therecipeqt can pick up as tho it was not a splits build
the build was successful Details
2020-12-15 00:06:46 -08:00
erinn 290b0b26db new scaling system pass one
the build was successful Details
2020-12-14 17:22:20 -08:00
Sarah Jamie Lewis ee1a8dbed5 Merge pull request 'linux build can now access assets in various */share/cwtch/assets folders. linux installer installs multiple sized icons' (#456) from dan/ui:share into master
the build was successful Details
Reviewed-on: #456
2020-12-11 19:02:27 -08:00
Dan Ballard 4bb5a52b9f linux build can now access assets in various */share/cwtch/assets folders. linux installer installs multiple sized icons
the build was successful Details
2020-12-11 18:53:43 -08:00
Sarah Jamie Lewis bf27590afe build.gradle include
the build was successful Details
2020-12-11 15:47:37 -08:00
erinn 4cdb507e5e Merge pull request 'new spanish and italian translations' (#454) from dan/ui:esIt into master
the build was successful Details
Reviewed-on: #454
2020-12-11 15:33:02 -08:00
Dan Ballard 3dbcf07396 new spanish and italian translations
the build was successful Details
2020-12-11 14:15:23 -08:00
Dan Ballard afcceac8cf Merge pull request 'Bugfix: Copy Address Regression' (#452) from group-add into master
the build was successful Details
Reviewed-on: #452
2020-12-11 12:48:33 -08:00
Sarah Jamie Lewis 66c46714b7 Bugfix: Copy Address Regression
the build was successful Details
2020-12-11 12:04:27 -08:00
Dan Ballard 288e14ede2 drone: add android arm64-v6a step (fix?)
the build was successful Details
2020-12-10 13:02:02 -08:00
Dan Ballard 1962cf9df5 drone: add android arm64-v6a step (fix?)
the build failed Details
2020-12-10 12:47:25 -08:00
Dan Ballard ae8702cda2 drone: add android arm64-v6a step
the build failed Details
2020-12-10 12:35:18 -08:00
Dan Ballard 85dc5b5714 adding android libs for arm64-v8a 2020-12-10 12:31:54 -08:00
Dan Ballard 4932c728ec drone: android upload sign (strip newline/spaces)
the build was successful Details
2020-12-09 17:38:47 -08:00
Dan Ballard 0f15141f73 drone: android upload sign (typo)
the build failed Details
2020-12-09 17:31:18 -08:00
Dan Ballard db0e8a2395 drone: android upload sign (typo)
the build failed Details
2020-12-09 17:26:59 -08:00
Dan Ballard be1959b60c drone: android upload sign
the build failed Details
2020-12-09 17:20:49 -08:00
Sarah Jamie Lewis dfb12a2ab0 Merge pull request 'only show settings icon in history warning for default state' (#449) from assetry into master
the build was successful Details
Reviewed-on: #449
2020-12-09 14:11:14 -08:00
erinn 17c946de6d only show settings icon in history warning for default state
the build was successful Details
2020-12-09 14:09:46 -08:00
Sarah Jamie Lewis 9958bb605b Merge pull request 'fix acks, fix lists and bulletin for groups' (#448) from assetry into master
the build was successful Details
Reviewed-on: #448
2020-12-08 23:06:14 -08:00
Sarah Jamie Lewis 826c8b3a1d Merge branch 'master' into assetry
the build was successful Details
2020-12-08 23:06:02 -08:00
erinn bb84e8f46f fix acks, fix lists and bulletin for groups
the build was successful Details
2020-12-08 23:03:22 -08:00
Sarah Jamie Lewis f168f6aee9 Merge pull request 'add missing assets' (#447) from assetry into master
the build was successful Details
Reviewed-on: #447
2020-12-08 20:36:19 -08:00
erinn bc33356ca4 add missing assets
the build was successful Details
2020-12-08 20:21:12 -08:00
Sarah Jamie Lewis dfdce13e46 Merge pull request 'remove debug info from chatoverlay' (#446) from historywarningfix into master
the build was successful Details
Reviewed-on: #446
2020-12-08 18:16:27 -08:00
erinn fa430b7d7c remove debug info from chatoverlay
the build was successful Details
2020-12-08 17:33:45 -08:00
Sarah Jamie Lewis 4d927c133d Merge pull request 'history warning, overlay model fixes, new zoom system beginnings' (#445) from historywarning into master
the build was successful Details
Reviewed-on: #445
2020-12-08 17:13:17 -08:00
erinn 0663488d6d nits
the build was successful Details
2020-12-08 16:58:07 -08:00
erinn 6263dbf1fa Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui into historywarning
the build was successful Details
2020-12-08 16:49:12 -08:00
erinn 1a556d05ce history warning and overlay model fixes
the build was successful Details
2020-12-08 16:37:08 -08:00
erinn 49bee4deb1 translations and new assets for history warning 2020-12-08 16:36:41 -08:00
erinn 240eb56ebe Merge pull request 'use log/privacy filter' (#444) from dan/ui:logPF into master
the build failed Details
Reviewed-on: #444
2020-12-07 16:15:26 -08:00
Dan Ballard 79052038e6 use log/privacy filter
the build was successful Details
2020-12-07 16:02:58 -08:00
erinn e5fce8634e Merge pull request 'Save state of root and profile panes open, and selected profile and conversation; jump to those when reloading' (#443) from dan/ui:stateful into master
the build failed Details
Reviewed-on: #443
2020-12-07 15:24:33 -08:00
erinn 09079dd224 Merge branch 'master' into stateful
the build was successful Details
2020-12-07 15:24:21 -08:00
Dan Ballard b920d3ab8b Save state of root and profile panes open, and selected profile and
the build was successful Details
conversation; jump to those when reloading
2020-12-07 15:18:19 -08:00
erinn 8b6e8d2e98 Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui into historywarning 2020-12-03 16:26:34 -08:00
erinn 473e0a02d0 history warning and beginnings of new zoom system and listoverlay fixes 2020-12-03 16:24:40 -08:00
Dan Ballard b837757617 Merge pull request 'Add Group now Works (with TofuBundle)' (#442) from group-add into master
the build was successful Details
Reviewed-on: #442
2020-12-03 15:15:31 -08:00
Sarah Jamie Lewis 6292b5a1b9 Add Group now Works (with TofuBundle)
the build was successful Details
2020-12-03 15:02:06 -08:00
Dan Ballard cfe0105992 Merge pull request 'fix resizing smaller' (#441) from resizefix into master
the build was successful Details
Reviewed-on: #441
2020-12-02 18:16:19 -08:00
erinn bbedeb81c7 fix resizing smaller
the build was successful Details
2020-12-02 18:10:52 -08:00