SpiritCroc
|
72aa4bb999
|
Merge tag 'v1.1.10' into sc
Change-Id: I01e7b61adf9444e6894232235ee71ac8295b00ab
Conflicts:
library/ui-styles/src/main/res/color/bottom_navigation_icon_tint_selector.xml
library/ui-styles/src/main/res/drawable/splash.xml
library/ui-styles/src/main/res/values/theme_light.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/accountdata/RoomAccountDataTypes.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
vector/src/main/res/drawable/ic_attachment.xml
vector/src/main/res/drawable/ic_insert_emoji.xml
vector/src/main/res/drawable/ic_keyboard.xml
vector/src/main/res/layout/composer_layout.xml
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
vector/src/main/res/layout/fragment_home_detail.xml
vector/src/main/res/layout/fragment_login_server_url_form.xml
vector/src/main/res/layout/fragment_user_list.xml
vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_space_beta_header.xml
vector/src/main/res/layout/item_suggested_room.xml
vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
vector/src/main/res/values/styles_riot.xml
|
2021-06-23 13:38:41 +02:00 |
Benoit Marty
|
cfc99a93d7
|
Git ignore private folder
|
2021-06-17 17:58:13 +02:00 |
|
SpiritCroc
|
f4d0993a2b
|
Enable semi-automatic correct_strings.sh-patching
Change-Id: I072f2ff71e862a1a140c8879754669f7231745c2
|
2021-02-21 10:35:55 +01:00 |
Benoit Marty
|
c97d298166
|
Merge pull request #948 from vector-im/feature/artifacts_downloading
Feature/artifacts downloading
|
2020-02-10 14:52:25 +01:00 |
|
Benoit Marty
|
7d00aabc85
|
Share the same Copyright header. Disabled for XML files
|
2020-02-05 17:48:59 +01:00 |
|
Benoit Marty
|
c3bb421c1e
|
ignore .idea/inspectionProfiles
|
2020-02-04 11:53:09 +01:00 |
Valere
|
859c75df98
|
Initial commit
|
2020-01-21 10:25:57 +01:00 |
|
Benoit Marty
|
a916bd4ba8
|
Share the same code formatting rules
|
2020-01-16 14:05:14 +01:00 |
ganfra
|
8e3234d188
|
Clean some code
|
2019-10-21 18:08:42 +02:00 |
|
Benoit Marty
|
82fc97f619
|
Add dictionary specific to the project to VCS
|
2019-10-11 09:32:43 +02:00 |
|
Benoit Marty
|
72d3f1e909
|
Configure ktlint
|
2019-10-09 15:06:38 +02:00 |
|
Benoit Marty
|
a199eaa171
|
Setup various tools
|
2019-03-13 17:00:30 +01:00 |
ganfra
|
7e199494e7
|
Stop tracking .idea files
|
2018-11-09 09:50:23 +01:00 |
|
ganfra
|
b406e8301a
|
first commit
|
2018-10-03 17:58:12 +02:00 |