filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,936 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

4936 Commits

Author SHA1 Message Date
SpiritCroc 3ab88153c0 SchildiChat icon 2020-07-18 15:14:57 +02:00
SpiritCroc 969f3202de Fix db upgrade from previous version 2020-07-17 16:23:36 +02:00
SpiritCroc 1d1267ea6a Update settings icons from v1.0 2020-07-17 15:34:42 +02:00
SpiritCroc 8c3963eb5d Fix some accent colors introduced in v1.0 2020-07-17 15:27:24 +02:00
SpiritCroc e857052e37 Redo hidden bottom bar and combined chats view for v1.0 merge 2020-07-17 15:20:31 +02:00
SpiritCroc 95850440bd Merge remote-tracking branch 'upstream/master' into sc 
Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt
	vector/src/main/res/drawable/bg_login_server.xml
	vector/src/main/res/drawable/bg_login_server_checked.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
 2020-07-17 13:39:52 +02:00
SpiritCroc af627f4d9b Restore some Riot icons to ease upstream merge 
and prepare the rebrand (both upstream and downstream)
 2020-07-17 12:09:24 +02:00
SpiritCroc e37769aae4 SchildiChat 2020-07-17 11:35:40 +02:00
Benoit Marty fca669ff98 Merge branch 'release/1.0.0' 2020-07-15 14:27:24 +02:00
Benoit Marty 1d2e62fed7 Prepare release 1.0.0 2020-07-15 14:27:08 +02:00
Benoit Marty 7651eb5c3c Revert "Temporary remove the _dev suffix added to version" 
This reverts commit 7237ec7310.
 2020-07-15 14:14:44 +02:00
Benoit Marty a06484c260
Merge pull request #1691 from vector-im/rebranding 
Rebranding!
 2020-07-15 14:13:11 +02:00
Benoit Marty 9b49e6a817 Use local file in a dialog though (else -> crash) 2020-07-13 23:03:16 +02:00
Benoit Marty bef0c7725b Use openUrlInChromeCustomTab because it's better and it fixes crash on API 21 (at least) 2020-07-13 22:43:19 +02:00
Benoit Marty 7237ec7310 Temporary remove the _dev suffix added to version 2020-07-13 21:50:26 +02:00
Benoit Marty 3abe5b8467 ktlint 2020-07-13 21:38:49 +02:00
Valere 0406854fa5 lighter bottom sheet separator 2020-07-13 19:25:59 +02:00
Valere ca6a398a72 Update add room icon 2020-07-13 19:25:44 +02:00
Valere 5e81ce8e3e Update tmp lab icon for notif tab 2020-07-13 19:25:35 +02:00
Onuray Sahin 8658090736 Fix tint color of settings. 2020-07-13 20:16:01 +03:00
Onuray Sahin 614ac88567 Create group room icon changed. 2020-07-13 20:06:39 +03:00
Onuray Sahin 797dcdb48b Merge branch 'riotx_develop' into rebranding_rebase 
* riotx_develop: (111 commits)
  Video calls are shown as a voice ones in the timeline (Fixes #1676)
  Fix regression: not able to create a room without IS configured (Fixes #1679)
  Fix / view attachment crash + freeze when offline
  Version++
  Prepare release 0.91.5
  Fix test compilation issue
  Fix crash after rebase
  Add TODO
  Copy Javadoc to the API class
  Move internal methods to internal task
  Latest renaming
  Rename CreateRoomParamsInternalBuilder to CreateRoomBodyBuilder for clarity
  Rename CreateRoomParamsBuilder to CreateRoomParams for clarity
  Rename internal class
  Expose other objects in the builder to create a room
  ktlint
  Display threePid invite along with the other invite (code is a bit dirty)
  Hide right arrow if threepid invite can not be revoked
  Disable fetching Msisdn, it does not work
  Revoke ThreePid invitation (#548)
  ...

# Conflicts:
#	vector/build.gradle
#	vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt
#	vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
#	vector/src/main/res/values/strings.xml
 2020-07-13 19:59:20 +03:00
Onuray Sahin 3a696ea9a1 Revert shield icons. 2020-07-13 19:21:22 +03:00
Onuray Sahin 1b19cb7449 Roll back ic_shield_black 2020-07-13 19:18:56 +03:00
Onuray Sahin ea81a5298b ic_shield_black icon changed. 2020-07-13 18:55:30 +03:00
Onuray Sahin ae65eb6a3e Advanced Settings icon changed. 2020-07-13 18:39:09 +03:00
Onuray Sahin 67e07a7932 Room action settings and leave icons changed. 2020-07-13 18:33:29 +03:00
Onuray Sahin 6ef15f3c1c ic_star icon changed. 2020-07-13 18:28:05 +03:00
Benoit Marty 0e3be83da2 Merge branch 'rebranding' of https://gitlab.matrix.org/new-vector/element/element-android into rebranding 2020-07-13 17:21:40 +02:00
Benoit Marty 8b5b7db241 Fix icons alignment issue 2020-07-13 17:21:33 +02:00
Onuray Sahin 1fd8a5fa91 Merge branch 'rebranding' of https://gitlab.matrix.org/new-vector/element/element-android into rebranding 
* 'rebranding' of https://gitlab.matrix.org/new-vector/element/element-android:
  Icon: "Modular" -> "Element Matrix Services"
 2020-07-13 18:11:45 +03:00
Onuray Sahin 34d7a86175 Update attachment and send icons. 2020-07-13 18:10:49 +03:00
Benoit Marty 21f1f89a4b Merge branch 'rebranding' of https://gitlab.matrix.org/new-vector/element/element-android into rebranding 2020-07-13 16:53:48 +02:00
Benoit Marty 159f286b2c Icon: "Modular" -> "Element Matrix Services" 2020-07-13 16:53:26 +02:00
Onuray Sahin 06454cc3e0 Sticker attachment icon changed. 2020-07-13 17:52:09 +03:00
Onuray Sahin be27b580d6 ic_fab_add_chat icon changed. 2020-07-13 17:40:16 +03:00
Onuray Sahin f91b6938f5 Remove stroke from shield icons. 2020-07-13 17:35:58 +03:00
Onuray Sahin a7fea8d012 Relace eye and eye_closed icons. 2020-07-13 17:26:23 +03:00
Onuray Sahin 18bc40fb66 Design review fixes for login screen. 2020-07-13 17:01:48 +03:00
Benoit Marty 1dec4bc96b Wording: "Modular" -> "Element Matrix Services" 2020-07-13 15:49:46 +02:00
Benoit Marty 0e28214b63 Do not display the name change popup for a new installation 2020-07-13 14:23:06 +02:00
Benoit Marty ca61751a8b
Merge pull request #1678 from vector-im/feature/attachement_pager_fix 
Fix / view attachment crash + freeze when offline
 2020-07-13 11:33:11 +02:00
Benoit Marty cce1c2252d
Merge pull request #1681 from vector-im/feature/other_fixes 
Video calls are shown as a voice ones in the timeline (Fixes #1676)
 2020-07-13 11:31:38 +02:00
Benoit Marty 6a4d887941
Merge branch 'develop' into feature/other_fixes 2020-07-13 11:31:25 +02:00
Benoit Marty 4de1759321
Merge pull request #1680 from vector-im/feature/fix_create_room 
Fix regression: not able to create a room without IS configured (Fixes #1679)
 2020-07-13 11:30:47 +02:00
Benoit Marty 139cd051ab Video calls are shown as a voice ones in the timeline (Fixes #1676) 2020-07-13 10:57:52 +02:00
Benoit Marty 33b2abc3b9 Fix regression: not able to create a room without IS configured (Fixes #1679) 2020-07-13 10:46:51 +02:00
Valere c63128cfbd Fix / view attachment crash + freeze when offline 2020-07-13 09:15:52 +02:00
Benoit Marty 5063188b25 Version++ 2020-07-11 23:00:16 +02:00
Benoit Marty b9f0c176d9 Merge branch 'release/0.91.5' 2020-07-11 22:58:48 +02:00