Commit graph

521 commits

Author SHA1 Message Date
dependabot[bot]
5a4915e817
Bump flexbox from 1.1.1 to 2.0.1
Bumps [flexbox](https://github.com/google/flexbox-layout) from 1.1.1 to 2.0.1.
- [Release notes](https://github.com/google/flexbox-layout/releases)
- [Commits](https://github.com/google/flexbox-layout/compare/1.1.1...2.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 23:21:14 +00:00
dependabot[bot]
612dd21264
Bump big_image_viewer_version from 1.6.2 to 1.7.0
Bumps `big_image_viewer_version` from 1.6.2 to 1.7.0.

Updates `BigImageViewer` from 1.6.2 to 1.7.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.6.2...v1.7.0)

Updates `GlideImageLoader` from 1.6.2 to 1.7.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.6.2...v1.7.0)

Updates `ProgressPieIndicator` from 1.6.2 to 1.7.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.6.2...v1.7.0)

Updates `GlideImageViewFactory` from 1.6.2 to 1.7.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.6.2...v1.7.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 23:18:49 +00:00
dependabot[bot]
7d287d7c63
Bump kluent-android from 1.61 to 1.65
Bumps kluent-android from 1.61 to 1.65.

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 23:18:28 +00:00
dependabot[bot]
2c065b8c43
Bump autofill from 1.0.0 to 1.1.0
Bumps autofill from 1.0.0 to 1.1.0.

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 23:18:19 +00:00
Benoit Marty
e50d2f7809
Merge pull request #2856 from vector-im/dependabot/gradle/junit-junit-4.13.2
Bump junit from 4.13 to 4.13.2
2021-02-20 00:13:21 +01:00
Benoit Marty
f8e0fdba48
Merge pull request #2855 from vector-im/dependabot/gradle/daggerVersion-2.32
Bump daggerVersion from 2.31 to 2.32
2021-02-20 00:13:06 +01:00
Benoit Marty
160db6ada5
Merge pull request #2854 from vector-im/dependabot/gradle/com.jakewharton.rxbinding3-rxbinding-3.1.0
Bump rxbinding from 3.0.0 to 3.1.0
2021-02-20 00:12:46 +01:00
Benoit Marty
88104cecf6
Merge pull request #2853 from vector-im/dependabot/gradle/com.googlecode.htmlcompressor-htmlcompressor-1.5.2
Bump htmlcompressor from 1.4 to 1.5.2
2021-02-20 00:12:30 +01:00
Benoit Marty
ea1f533501
Merge pull request #2852 from vector-im/dependabot/gradle/androidx.sharetarget-sharetarget-1.1.0
Bump sharetarget from 1.0.0 to 1.1.0
2021-02-20 00:12:10 +01:00
Benoit Marty
61043ee58a
Merge pull request #2851 from vector-im/dependabot/gradle/com.google.zxing-core-3.4.1
Bump core from 3.3.3 to 3.4.1
2021-02-19 23:44:20 +01:00
dependabot[bot]
2c605d9ffb
Bump junit from 4.13 to 4.13.2
Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.2.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.2.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.13...r4.13.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 21:52:31 +00:00
dependabot[bot]
7a81eec6d8
Bump daggerVersion from 2.31 to 2.32
Bumps `daggerVersion` from 2.31 to 2.32.

Updates `dagger` from 2.31 to 2.32
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.31...dagger-2.32)

Updates `dagger-compiler` from 2.31 to 2.32
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.31...dagger-2.32)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 21:52:23 +00:00
dependabot[bot]
5a70e3c638
Bump rxbinding from 3.0.0 to 3.1.0
Bumps [rxbinding](https://github.com/JakeWharton/RxBinding) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/JakeWharton/RxBinding/releases)
- [Changelog](https://github.com/JakeWharton/RxBinding/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JakeWharton/RxBinding/compare/3.0.0...3.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 21:52:16 +00:00
dependabot[bot]
aeb96bb1c0
Bump htmlcompressor from 1.4 to 1.5.2
Bumps htmlcompressor from 1.4 to 1.5.2.

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 21:52:08 +00:00
dependabot[bot]
062c415fc2
Bump sharetarget from 1.0.0 to 1.1.0
Bumps sharetarget from 1.0.0 to 1.1.0.

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 21:52:07 +00:00
dependabot[bot]
0c0119d85c
Bump core from 3.3.3 to 3.4.1
Bumps [core](https://github.com/zxing/zxing) from 3.3.3 to 3.4.1.
- [Release notes](https://github.com/zxing/zxing/releases)
- [Changelog](https://github.com/zxing/zxing/blob/master/CHANGES)
- [Commits](https://github.com/zxing/zxing/compare/zxing-3.3.3...zxing-3.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 21:52:06 +00:00
dependabot[bot]
ff5d613e23
Bump glide_version from 4.11.0 to 4.12.0
Bumps `glide_version` from 4.11.0 to 4.12.0.

Updates `glide` from 4.11.0 to 4.12.0
- [Release notes](https://github.com/bumptech/glide/releases)
- [Commits](https://github.com/bumptech/glide/compare/4.11.0...v4.12.0)

Updates `compiler` from 4.11.0 to 4.12.0
- [Release notes](https://github.com/bumptech/glide/releases)
- [Commits](https://github.com/bumptech/glide/compare/4.11.0...v4.12.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 21:52:06 +00:00
Benoit Marty
747a5ded1a Version++ 2021-02-19 21:10:27 +01:00
Benoit Marty
809c0e720e Prepare release 1.1.0 2021-02-19 19:30:38 +01:00
SpiritCroc
4418821058 Increment version
Change-Id: I0a0b686aa4cdbaa636bf06286c8a108ac8d8079b
2021-02-19 14:39:57 +01:00
Benoit Marty
80a6823af4 Remove transitive dependency 2021-02-10 16:55:07 +01:00
Benoit Marty
1ec4424c0a Upgrade Jitsi library from 2.9.3 to 3.1.0 2021-02-10 12:15:32 +01:00
SpiritCroc
04f4e13230 Merge tag 'v1.0.17' into sc
Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt

Note:
Upstream added their own "pass theme to widgets" implementation, which
currently does not respect "black" themes (but treats them as "dark"
themes).
For now, let's integrate our own implementation into the new one.

Change-Id: If99f2f87e20215595fc36996bb530bf5f247b0cb
2021-02-10 11:05:22 +01:00
Benoit Marty
aaeca96336 Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-09 21:23:55 +01:00
Benoit Marty
08b65b57e4 Version++ 2021-02-09 21:08:46 +01:00
ganfra
0ed327646a Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-08 16:45:15 +01:00
Benoit Marty
1212bb8d70 Change app name from "Element (Riot.im)" to "Element" 2021-02-08 12:39:35 +01:00
SpiritCroc
c2ce787310 Merge tag 'v1.0.16' into sc
Change-Id: Ia65e40a4acaee3f26a5680f05b3ae1bf8327d4d6

Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
2021-02-04 17:10:15 +01:00
ganfra
6cd462f852 Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-04 16:52:06 +01:00
Benoit Marty
d11ed8c4ef Version++ 2021-02-04 15:17:46 +01:00
Benoit Marty
a65f846929 Version++ 2021-02-03 17:09:32 +01:00
ganfra
f4fd8af3b4 Merge branch 'develop' into feature/fga/voip_v1_start 2021-01-29 18:46:19 +01:00
ganfra
940563f663 Merge branch 'feature/fga/voip_dial_pad' into feature/fga/voip_v1_start 2021-01-29 16:37:46 +01:00
SpiritCroc
417bf48dd1 Increment version
Change-Id: Ic68c2a792c589c03f6fe274e937ebfa18a69b47a
2021-01-23 11:58:10 +01:00
Benoit Marty
4dcd7846b0
Merge pull request #2616 from vector-im/feature/ons/android_11_migration
Migrate to Android 11, API 30.
2021-01-22 17:17:04 +01:00
ganfra
d29ab94617 VoIP: start reworking audio device management [WIP] 2021-01-21 13:03:33 +01:00
SpiritCroc
53c498b728 Merge tag 'v1.0.14' into sc
Change-Id: I0d3df2f8c5f4e611f3268c4c4d2784f7eac89bb5

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/UrlsExtractor.kt
	vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
	vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	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_keys_backup_setup_step3.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
2021-01-16 11:21:09 +01:00
ganfra
2c0b7ce0f4 Dagger: update to 2.31 and use new AssistedInject 2021-01-15 15:23:24 +01:00
Benoit Marty
72ee1ace48 Version++ 2021-01-15 11:14:59 +01:00
ganfra
fae1382429 VoIP: introduce DialPadFragment by reusing lib (AOSP extract) 2021-01-07 11:15:37 +01:00
Onuray Sahin
23623b8895 Migrate to Android 11, API 30. 2021-01-04 17:12:49 +03:00
SpiritCroc
7ecf8073ef Increment version
Change-Id: Icd9bbfe6db69fc8a7b2de5626f4292d3664f4c5e
2020-12-27 11:29:47 +01:00
ganfra
14288b545b Merge branch 'develop' into feature/fga/voip_v1_start 2020-12-22 11:38:41 +01:00
SpiritCroc
8da4044de6 Merge tag 'v1.0.13' into sc
Change-Id: Ica0f7dfed8acda02772a90e30bfba3f9d284c538
2020-12-22 09:24:31 +01:00
Benoit Marty
2b780a8b76
Merge pull request #2542 from vector-im/feature/bma/view_bindings
View bindings
2020-12-18 15:57:34 +01:00
Benoit Marty
0518e5f18d Version++ 2020-12-18 11:03:01 +01:00
Benoit Marty
706736273c Migrate to ViewBindings (#1072) - WIP 2020-12-16 00:46:52 +01:00
Benoit Marty
838340bbc8 Remove dependency to Butterknife 2020-12-15 20:33:55 +01:00
SpiritCroc
38b82fb823 Merge tag 'v1.0.12' into sc
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.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/layout/item_bottom_sheet_action.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/values-v23/theme_status.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/values/theme_status.xml

Note to self: need to check if URL preview works with wrap_content

Change-Id: I028b2873a33bb1a770f2da96d576b97202b5bcf9
2020-12-15 15:55:14 +01:00
Benoit Marty
6cdb192955 Version++ 2020-12-15 14:18:35 +01:00
Valere
7da8b13cde Chat Effects 2020-12-15 09:39:16 +01:00
Onuray Sahin
d54571d0a6 Emoji library added with Google style. 2020-12-09 18:45:33 +03:00
ganfra
76ed775f6f VoIP: start to show in-app notification 2020-12-09 11:17:49 +01:00
SpiritCroc
3defe44eff Increment version
Change-Id: Ic7a599e412c312fb5489500d2eb7ee1808a0b6bb
2020-12-05 11:02:41 +01:00
ganfra
efec711ced Merge branch 'develop' into feature/fga/voip_v1_start 2020-12-03 13:01:54 +01:00
Benoit Marty
c4577f28b2 Remove unnecessary dependency (we have -ktx dependency) 2020-12-02 16:43:52 +01:00
Benoit Marty
89a7ec6d4b Use fragment-ktx and preference-ktx dependencies (fix lint issue KtxExtensionAvailable) 2020-12-02 12:46:15 +01:00
Benoit Marty
42bc4d2445 Upgrade some dependencies and Kotlin version 2020-12-02 12:09:56 +01:00
ganfra
4a3f0c8898 VoIP: update in call ui (blur) 2020-12-01 18:36:00 +01:00
SpiritCroc
0b4f56d7a0 Merge remote-tracking branch 'upstream/master' into sc
Change-Id: Icb4d672fc9d301803b300d6ac25b348780f11e6c

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/res/layout/fragment_known_users.xml
	vector/src/main/res/layout/fragment_user_list.xml
2020-11-29 12:51:43 +01:00
Benoit Marty
b84d7f0834 Version** 2020-11-27 20:42:02 +01:00
SpiritCroc
ac89fb97f8 Increment version
Change-Id: Ic11038b22a85eb4ee863bb865439ae3c9751da1b
2020-11-24 16:13:49 +01:00
Benoit Marty
07c805a019 Create sanity test with all screens path
Introduce `com.schibsted.spain:barista`
2020-11-09 16:56:20 +01:00
SpiritCroc
164848e0aa Increment version
Change-Id: Id0642c0e557b85b4209713028ba7c1d1223a070d
2020-11-07 11:37:55 +01:00
SpiritCroc
58d99e10a0 Merge remote-tracking branch 'upstream/master' into sc
Change-Id: I004362e70c17eba5828e10ec9bf8b37568f64f01

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/res/menu/menu_timeline.xml
2020-11-05 13:15:55 +01:00
Benoit Marty
17fed39b27 Version++ 2020-11-04 16:00:16 +01:00
SpiritCroc
07e6cf2a8d Increment version
Change-Id: I4a7d9c5fdd0cfa93a614fb214ddd953de6bbffaa
2020-11-02 13:20:05 +01:00
Benoit Marty
60556d0fa0 Version code: apply workaround from https://issuetracker.google.com/issues/171133218 2020-10-22 16:10:08 +02:00
Benoit Marty
c05147a019 Merge branch 'hotfix/bma/versionCode' into develop 2020-10-19 12:31:35 +02:00
Benoit Marty
a59c92f55a Fix issue with VersionCode 2020-10-19 12:29:20 +02:00
SpiritCroc
5853709c97 Increment version
Change-Id: Id0f9498606265ff48842ca210358ee1541b18c38
2020-10-17 17:05:03 +02:00
SpiritCroc
44d3c0118a Merge remote-tracking branch 'upstream/master' into sc
Change-Id: If0e38334e7e479134cd05283f857e4871bb7692f

Conflicts:
	vector/build.gradle
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/res/drawable/ic_settings_root_advanced.xml
	vector/src/main/res/drawable/ic_settings_root_call.xml
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/drawable/ic_settings_root_general.xml
	vector/src/main/res/drawable/ic_settings_root_help_about.xml
	vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
	vector/src/main/res/drawable/ic_settings_root_labs.xml
	vector/src/main/res/drawable/ic_settings_root_legacy.xml
	vector/src/main/res/drawable/ic_settings_root_notification.xml
	vector/src/main/res/drawable/ic_settings_root_preferences.xml
	vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
	vector/src/main/res/layout/fragment_home_drawer.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_bottom_sheet_action.xml
	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/view_avatar_selector.xml
2020-10-17 15:28:18 +02:00
Benoit Marty
1b7158a61d Version++ 2020-10-16 17:34:10 +02:00
ganfra
9bf615e90c Fix composer: update constraints layout and fix some glitches 2020-10-16 11:24:59 +02:00
SpiritCroc
ca60a769d2 Increment version
Change-Id: I7ffc24a91c8960d0fdbba2881dc887bb09e43721
2020-10-13 15:42:19 +02:00
Constantin Wartenburger
7e5ee8f951
Made it backwards compatible 2020-10-11 22:09:19 +02:00
Benoit Marty
9e0ebc94c5 Upgrade other dependencies, and remove unused dependencies 2020-10-06 15:44:30 +02:00
Benoit Marty
1a0dba7422 Upgrade Moshi to 1.11.0, Dagger to 2.29.1, Epoxy to 4.1.0 2020-10-06 14:47:57 +02:00
Benoit Marty
5056615eb0 Upgrade kotlin version from 1.3.72 to 1.4.10 and kotlin coroutines version from 1.3.8 to 1.3.9 2020-10-06 12:33:40 +02:00
SpiritCroc
96aa885819 Increment version
Change-Id: I68a3f7a7806795a2f5ae7a1b582bb6d9e572872b
2020-09-30 12:23:15 +02:00
Valere
2908a5d345 Added first ui bootstrap test 2020-09-30 10:13:59 +02:00
Benoit Marty
487bbe42a9
Merge branch 'develop' into feature/ui_test 2020-09-29 16:13:44 +02:00
ganfra
8bc0afa75e Timeline: add glide preloading 2020-09-29 15:42:21 +02:00
Benoit Marty
b14d22550b PR Review
Cleanup and Add command line to run the UI tests
2020-09-29 15:12:25 +02:00
Valere
bc2c345e21 First automated UI tests 2020-09-29 12:51:27 +02:00
SpiritCroc
1cc4c7177f Increment version
Change-Id: I1f2ddbb0e8ff82db6f3f321dc073f29426e8d5ac
2020-09-27 14:11:52 +02:00
SpiritCroc
43b99a2a9a Merge remote-tracking branch 'upstream/master' into sc
Change-Id: Id1192801aa01317d36af3d0619ab281200ecfc80

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	vector/src/main/java/im/vector/app/core/utils/UserColor.kt
	vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginHeaderItem.kt
	vector/src/main/res/layout/activity_signed_out.xml
	vector/src/main/res/layout/fragment_login.xml
	vector/src/main/res/layout/fragment_login_captcha.xml
	vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
	vector/src/main/res/layout/fragment_login_reset_password.xml
	vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
	vector/src/main/res/layout/fragment_login_reset_password_success.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_login_server_url_form.xml
	vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/fragment_login_terms.xml
	vector/src/main/res/layout/fragment_login_wait_for_email.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/values-land/styles_login.xml
	vector/src/main/res/values/styles_login.xml
2020-09-27 13:55:40 +02:00
Benoit Marty
6958d114a9 Version++ 2020-09-25 14:09:25 +02:00
Benoit Marty
f271968238 Upgrade library PFLockScreen-Android 2020-09-24 08:20:17 +02:00
SpiritCroc
7bdc4c30ec Increment version
Change-Id: I1c958f87747b78f856a7a6ad502a4ebc75f4af05
2020-09-22 10:22:29 +02:00
SpiritCroc
2e9195df2b Merge remote-tracking branch 'upstream/master' into sc_1.0.7
Change-Id: Iccb1b1f0bee6b77c9f15d917c8073910841b6ff8

Conflicts:
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
2020-09-17 12:03:17 +02:00
Benoit Marty
216138394f Version++ 2020-09-17 09:32:35 +02:00
SpiritCroc
cf24ca90f9 Increment version
Change-Id: Ice9536342a8eeff003019350a07e27f805426562
2020-09-10 18:14:11 +02:00
SpiritCroc
1d7681a893 Don't do ABI extra versioning
Doesn't work with F-Droid automatic update detection

Change-Id: I6bafe05f151e240fee37cd714ab2ac076a7a1a69
2020-09-10 18:14:06 +02:00
ganfra
c2880a5832 Strict mode: add a build entry to enable whenever we want to check 2020-09-09 11:52:05 +02:00
SpiritCroc
bdd71769a0 Merge remote-tracking branch 'upstream/master' into sc
Change-Id: Ibdd2790a7f2a8a1f126ef7af2032fe72f7dd777e
2020-09-08 18:52:59 +02:00
Benoit Marty
bf0b6d738a Version++ 2020-09-08 17:49:26 +02:00
SpiritCroc
372ae6e162 Increment version
Change-Id: I7de06d933fdddf3b4cd05538f0c5b3f29066b6c8
2020-09-02 11:58:48 +02:00
Valere
9d2ea19d7d Upgrade to worker 2.4.0 2020-08-31 16:20:12 +02:00
Benoit Marty
59fa2e28c2 Fix sonar analysis version name issue 2020-08-27 18:15:53 +02:00
Onuray Sahin
776d892d27 Increase version of uCrop library which supports Android 10. 2020-08-26 12:27:12 +03:00
SpiritCroc
c7ae49df1b Increment version
Change-Id: I2e30e69f149fa363d8a0391fd4c4682575a234ae
2020-08-24 17:54:08 +02:00
SpiritCroc
3b23ed9830 Increment version
Change-Id: Ia0033b834c7b1a9145ead4247fe70d427ef53ae9
2020-08-24 15:56:04 +02:00
SpiritCroc
4dfdfba42c Increment version
Change-Id: I2b9b613775e1698a9b4339e153eb9b677f0898c7
2020-08-24 11:35:41 +02:00
Benoit Marty
328dc9ea5b
Merge pull request #1979 from vector-im/feature/update_dependencies
Update some dependencies, including coroutines for working debugging
2020-08-24 10:11:57 +02:00
SpiritCroc
5b5cfa5bf1 Increment version 2020-08-23 15:27:39 +02:00
SpiritCroc
7b4b5be759 Merge tag 'v1.0.5' into sc
Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_file_stub.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/values-v21/styles_login.xml
	vector/src/main/res/values/theme_dark.xml
	vector/src/main/res/values/theme_light.xml
	vector/src/main/res/values/theme_status.xml
2020-08-22 11:23:45 +02:00
SpiritCroc
c2e1a33864 Merge commit '67fc2feacb8e2563cc25f61ed6da48cb4de57ed7' into sc
Merge v1.0.5 pt. 1

Conflicts:
	vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/values/theme_dark.xml
	vector/src/main/res/values/theme_light.xml
2020-08-22 09:52:54 +02:00
ganfra
1f890324b4 Update some dependencies, including coroutines for working debugging 2020-08-21 17:17:51 +02:00
Benoit Marty
04fa7d9628 Version++ 2020-08-21 17:04:05 +02:00
Benoit Marty
4cba1388f9 Add support for biometrics (not only Fingerprint) 2020-08-20 14:11:23 +02:00
SpiritCroc
72faa81e2a Increment version 2020-08-18 15:17:34 +02:00
Benoit Marty
05ecbf0f86 Build Jitsi lib version android-sdk-2.9.3, commit abcbbbea12e3ef88012b14723bb8cd42dbefc988
And host it in https://github.com/vector-im/jitsi_libre_maven/tree/master/android-sdk-2.9.3
2020-08-14 21:33:25 +02:00
SpiritCroc
17430b06a2 Increment version 2020-08-14 10:45:38 +02:00
Valere
42a24300a1 Initial commit jitsi 2020-08-14 09:31:24 +02:00
SpiritCroc
2a5342087d gplay version: ignore branch for version suffix 2020-08-09 17:02:17 +02:00
SpiritCroc
8602aba2a5 Increment version 2020-08-09 16:41:50 +02:00
SpiritCroc
459e20aac9 Merge tag 'v1.0.4' into sc 2020-08-07 12:34:18 +02:00
Valere
33f6e7e337 Version ++ 2020-08-03 14:04:31 +02:00
Valere
db6045778e Update change log 2020-08-03 12:11:50 +02:00
ganfra
995c552f2a
Merge branch 'develop' into feature/pin_code 2020-07-31 11:41:42 +02:00
SpiritCroc
9f7bf14a22 Merge tag 'v1.0.3' into sc
1.0.3

Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/values/strings.xml
	vector/src/main/res/values/styles_login.xml
2020-07-31 11:22:57 +02:00
Valere
531623178a Version ++ 2020-07-31 00:52:22 +02:00
ganfra
eb0d350097 Merge branch 'develop' into feature/pin_code 2020-07-30 17:24:48 +02:00
Valere
b732ea6c69 Version ++ 2020-07-29 11:39:23 +02:00
Valere
9197275343 version++ 2020-07-29 09:00:29 +02:00
ganfra
ecdef52829 Continue PIN code library integration (fork required) 2020-07-28 20:22:59 +02:00
SpiritCroc
adaed3fd64 Increment version 2020-07-28 13:55:09 +02:00
SpiritCroc
6170800f9c Increment version 2020-07-24 12:10:03 +02:00
SpiritCroc
af7cbeea11 Increment version 2020-07-20 16:46:11 +02:00
SpiritCroc
fea41d3901 Increment version 2020-07-20 15:55:18 +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
ganfra
f5fbb2bc4f Setup screens for Pin 2020-07-17 13:29:18 +02:00
SpiritCroc
e37769aae4 SchildiChat 2020-07-17 11:35:40 +02:00
Benoit Marty
53f0b77fb0 Version++ 2020-07-15 14:32:15 +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
7237ec7310 Temporary remove the _dev suffix added to version 2020-07-13 21:50:26 +02: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
Benoit Marty
5063188b25 Version++ 2020-07-11 23:00:16 +02:00
ganfra
3fc9fe3017 Merge branch 'develop' into feature/fix_small_issues 2020-07-10 20:13:47 +02:00
Onuray Sahin
93fe00a299 Merge branch 'develop' into rebranding_rebase
* develop: (123 commits)
  Fixes #1647 share not working
  Put xmx to 2048m
  Update changelog after PR merged
  Version++
  Prepare release 0.91.04-beta
  Add the new value to the ViewEvent, because the state is maybe not up to date.
  Fix lint error, following the upgrade of the libs
  Revert to gradle build 3.5.3
  Clean code
  Fix leaving selected group
  QuickFix / crash when  starting in airplane mode
  Group: rework a bit how and when we fetch data about groups
  EventInsert: add InsertType to avoid trying to process events we shouldn't
  Upload device keys only once to the homeserver and fix crash when no network (#1629)
  Upgrade some dependencies
  Add a delay to avoid crash. Sounds like a workaround...
  Handle certificate error in case of Direct Login
  Handle JobCancellationException
  Simplify the server selection screen: remove the "Continue" button
  Re-activate Wellknown support with updated UI (#1614)
  ...

# Conflicts:
#	vector/build.gradle
#	vector/src/main/res/values/strings.xml
2020-07-10 13:05:52 +03:00
Valere
4a2a6d34ae Initial commit 2020-07-08 20:09:55 +02:00
ganfra
0855806ae2 Fix edit being stuck 2020-07-07 22:14:11 +02:00
Benoit Marty
b7d86c3fa4
Merge branch 'develop' into feature/some_upgrade 2020-07-06 23:38:26 +02:00
Benoit Marty
89506b9e81 Version++ 2020-07-06 23:36:14 +02:00
Benoit Marty
9d4e903c4a Upgrade some dependencies 2020-07-06 15:59:49 +02:00
Benoit Marty
d4050a7b9d Due to a bug introduced in Android gradle plugin 3.6.0, we have to specify the ndk version to use 2020-07-02 23:39:42 +02:00
Benoit Marty
93fb40f323 (re-)Enable abortOnError for lint
And fix a first issue (on unused code)
2020-07-02 11:29:00 +02:00
Benoit Marty
f4314ebdae Version++ 2020-07-01 21:58:58 +02:00
Benoit Marty
3e97e03ccc Prepare release Riot.imX v0.91.3 for the beta channel 2020-07-01 21:51:30 +02:00
Onuray Sahin
cba9109206 Rename the application. 2020-06-30 14:52:50 +03:00
Onuray Sahin
482621e86f Set versionName to 1.0.0 2020-06-30 14:34:02 +03:00
Benoit Marty
0ad2058a1a Prepare version 0.91.2-beta 2020-06-28 23:05:47 +02:00
Benoit Marty
d436a7bad7 Increment version patch for a new release on the PlayStore 2020-06-27 00:14:32 +02:00
Benoit Marty
16a275529d Use temporary name Riot.imX 2020-06-27 00:14:32 +02:00
Benoit Marty
1c9907c5d2 Do not abort on error during lint check. 2020-06-26 21:08:41 +02:00
Benoit Marty
6bce62a598 Update version code to 40_091_00x to upgrade Riot-Android 2020-06-26 16:19:05 +02:00
Benoit Marty
629c73e630 Change applicationId from "im.vector.riotx" to "im.vector.app" 2020-06-26 16:19:05 +02:00
Valere
dc19652c2b WIP
refact WIP


TMP


WIP
2020-06-19 13:35:38 +02:00
SpiritCroc
b048a27a85 Increment version 2020-06-18 19:50:57 +02:00
Benoit Marty
f532d28fb3 Min SDK level set to 21 (#405) 2020-06-18 14:18:40 +02:00
Benoit Marty
ff39b22686 Add changelog entry for proguard 2020-06-16 11:18:33 +02:00
Benoit Marty
601e11980f
Merge pull request #1478 from vector-im/feature/proguard
Feature/proguard
2020-06-16 11:15:21 +02:00
Benoit Marty
914bfb105c Version++ 2020-06-15 23:28:57 +02:00
SpiritCroc
0ba49f5596 Merge remote-tracking branch 'upstream/develop' into sc 2020-06-15 15:50:57 +02:00
Benoit Marty
ade1f1b911
Merge pull request #1479 from vector-im/feature/memory_leaks
Feature/memory leaks
2020-06-15 14:47:16 +02:00
ganfra
c382f706a6 Leaks: disable leakcanary 2020-06-11 19:40:46 +02:00
ganfra
23cbed310a Proguard: activate it in release 2020-06-11 19:37:20 +02:00
ganfra
579d4f7a5b Merge branch 'develop' into feature/power_level 2020-06-10 17:21:04 +02:00
ganfra
d6329a1ab6 Start looking at memory leaks 2020-06-08 19:46:55 +02:00
SpiritCroc
c9a5dc5634 Increment version 2020-06-06 10:34:15 +02:00
SpiritCroc
933a79527c Increment version 2020-06-06 10:08:32 +02:00
ganfra
86dd8f3fd8 Update epoxy to last stable version 2020-06-05 20:14:36 +02:00
SpiritCroc
8cf2a51588 Merge tag 'v0.21.0' into sc
Conflicts:
	vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
2020-06-05 16:28:18 +02:00
Benoit Marty
d70b19fa93 SSO login is now performed in the default browser (#1400) - WIP
Use ChromeCustomTabs to host the SSO web page
2020-06-05 01:14:35 +02:00
SpiritCroc
761580c930 Increment version 2020-05-29 15:01:10 +02:00
SpiritCroc
3b5c092759 Increment version 2020-05-28 11:12:28 +02:00
Benoit Marty
b0a6eaaa96 Version++ 2020-05-28 10:45:58 +02:00
SpiritCroc
c755c5de0a Merge tag 'v0.20.0' into sc 2020-05-28 09:26:11 +02:00
Benoit Marty
f0f3e8ddb9 Uploads: auto-review 2020-05-25 17:05:17 +02:00
Benoit Marty
0992e76800 Uploads: add screen - WIP 2020-05-25 16:54:08 +02:00
SpiritCroc
81ac31a044 Add own versioning 2020-05-16 12:37:56 +02:00
Benoit Marty
48e58967b2 Version++ 2020-05-15 15:48:15 +02:00
SpiritCroc
ce48360022 Increase minSdk to 21
Allows to more easily use new mechanisms added in SDK 21.
Additionally, sdk 19 is not supported either way:
Caused by: java.lang.IllegalStateException: Expected Android API level 21+ but was 19
	at okhttp3.internal.platform.AndroidPlatform.<clinit>(AndroidPlatform.kt:232)
2020-05-14 15:42:27 +02:00
SpiritCroc
f13a647a4b Rebrand 2020-05-12 16:03:33 +02:00
Benoit Marty
6843ea113b Version++ 2020-05-04 16:06:41 +02:00
Benoit Marty
9c8ff7de7f Add Android test for EmojiDataSource 2020-04-28 14:15:50 +02:00
Onuray Sahin
8a4a288074
Merge branch 'develop' into feature/target-sdk-29 2020-04-08 14:15:02 +03:00
Valere
6474735662 Fix / devtools was not showing all json numbers 2020-04-03 10:31:44 +02:00
onurays
12429d8091 Merge develop into the branch. 2020-03-26 14:39:50 +03:00
Onuray Sahin
3bb5e127d6
Merge pull request #1155 from vector-im/feature/multipicker
Multiple attachment picker implementation
2020-03-26 14:30:02 +03:00
onurays
c63f3edb06 Initial fixes to support targetSdk 29. 2020-03-26 12:06:50 +03:00
Valere
b56a41bec7 Custom alert design 2020-03-24 14:56:57 +01:00
onurays
f7fd23b153 App integration to the new multipicker library. 2020-03-23 16:31:32 +03:00
onurays
6db0de321c Initial implementation of multipicker. 2020-03-20 12:12:59 +03:00
Valere
d3d6d44665 Post rebase fix 2020-03-17 14:40:05 +01:00
Valere
fc6225a7ac Gossiping refactoring 2020-03-17 14:40:05 +01:00
Valere
20dbe2dd0d version ++ 2020-03-17 14:18:08 +01:00
Valere
78d90c8f04 prepare release 0.18.1 2020-03-17 11:46:42 +01:00
Valere
54eca7525e Version ++ 2020-03-11 16:24:49 +01:00
onurays
05683967c0 Code review fixes. 2020-03-06 12:07:38 +01:00
Benoit Marty
9bb4c7ed25 Version++ 2020-02-27 12:34:33 +01:00
Benoit Marty
f8276e48e3 add kluent for test 2020-02-18 14:09:42 +01:00
Benoit Marty
13d3aa9ff1
Merge branch 'develop' into feature/attachment_process 2020-02-17 13:48:21 +01:00
Benoit Marty
db19ab0531
Merge branch 'develop' into feature/4s_msc1946 2020-02-14 17:45:44 +01:00
Benoit Marty
1660a0f846 Version++ 2020-02-14 15:16:00 +01:00
Valere
61ea4191dc Update json viewer lib 2020-02-14 10:48:18 +01:00
Valere
bf06b57bad Refactor Account Data
Auto stash before rebase of "develop"
2020-02-14 10:48:18 +01:00
Ganard
a26e959430 Attachements: introduce structure for preview, cropping and compressing 2020-02-13 19:51:20 +01:00
Benoit Marty
a7274b9df0 Version++ 2020-02-10 21:41:59 +01:00
Ganard
e6cd8a3a86 Merge develop into feature/stabilization_2 2020-02-03 13:59:20 +01:00
Benoit Marty
5fb4f274f9 Version ++ 2020-02-02 08:00:57 +01:00
Benoit Marty
435d8cbc55 Prepare v0.14.1 2020-02-02 07:55:46 +01:00
Benoit Marty
9e15891053 Version++ 2020-02-01 17:21:41 +01:00
Benoit Marty
53e36dca9c ZXing 3.3.3 because of https://github.com/zxing/zxing/issues/1170 2020-02-01 13:52:33 +01:00
Ganard
ec6d78bf96 Merge branch 'develop' into feature/stabilization_2 2020-01-31 15:47:33 +01:00
ganfra
9fc3fa7f19 Update some libs and remove incremental from dagger 2020-01-29 21:14:38 +01:00
Valere
109ff4f908 Merge branch 'cross_signing' into xsigning_sdk 2020-01-28 11:33:54 +01:00
Benoit Marty
c1259161e5 QRCode: generate and scan QRCodes 2020-01-22 15:03:56 +01:00
Benoit Marty
dca950140d
Merge branch 'develop' into feature/version_name 2020-01-22 11:45:27 +01:00
Benoit Marty
f5e6b4b857 F-Droid: fix the "-dev" issue in version name (#815) 2020-01-20 16:08:57 +01:00
Benoit Marty
8c32796d5c Ensure builds are reproducible (#842) 2020-01-17 16:06:58 +01:00
Benoit Marty
d1699279fe Version++ 2020-01-17 14:25:25 +01:00
Benoit Marty
717965bc37 Update comment 2020-01-13 15:12:39 +01:00
Benoit Marty
03b5b098c7 Change the way versionCode is computed (#827) 2020-01-10 17:29:34 +01:00
Benoit Marty
8c9c65837d Version++ 2020-01-09 15:32:37 +01:00
ganfra
8c4d8763a2 Merge branch 'develop' into feature/stabilization 2020-01-08 22:28:08 +01:00
Benoit Marty
d662b4a9b4 Exclude play-services-oss-licenses library from F-Droid build (#814) 2020-01-08 15:57:35 +01:00
ganfra
99c523b710 Update libs 2020-01-06 18:43:34 +01:00
ganfra
6ad914154a Update some libs 2019-12-30 10:46:25 +01:00
Benoit Marty
51d6b8828d Version++ 2019-12-19 16:46:01 +01:00
Benoit Marty
9d26ba3186 Fix rendering issue with HTML formatted body 2019-12-18 12:33:51 +01:00
Benoit Marty
cfee6a43fd
Merge pull request #760 from vector-im/feature/diff_match_patch_submodule
Use diff_match_patch sources as dependency
2019-12-16 15:02:29 +01:00
Benoit Marty
853518fbb2 Version++ 2019-12-11 18:34:06 +01:00
Valere
0b93f34fa0 Use diff_match_patch sources as dependency 2019-12-11 10:51:09 +01:00
Benoit Marty
4234c27af9 Version++ 2019-12-05 18:19:20 +01:00
Benoit Marty
6d8850b3d6 Prepare version 0.9.1 2019-12-05 18:17:36 +01:00
Benoit Marty
fb8ba32fb4 Version++ 2019-12-05 09:46:36 +01:00
Benoit Marty
3f4f7457c7
Merge pull request #689 from vector-im/feature/signin_signup
Login and Registration
2019-12-02 13:47:28 +01:00
Valere
a0d7aef92e Force android-gif-drawable version
BigImageViewer update (updated the android-gif-drawable dep)
2019-11-28 09:39:04 +01:00
Benoit Marty
2789268c23 Login screens: MSISDN: check format and compute country code 2019-11-22 12:15:19 +01:00
Benoit Marty
eb4355890e Login screens: setup autofill 2019-11-22 12:15:19 +01:00
Benoit Marty
ec2954200e Version++ 2019-11-19 09:58:48 +01:00
ganfra
6463f3439f Update Mvrx to 1.3 2019-11-12 15:11:52 +01:00
ganfra
3013d67c16 Fragment factory: start including the new version with FragmentFactory [WIP] 2019-11-04 19:33:56 +01:00
ganfra
3517873156 Timeline: Start handling code blocks. [WIP] 2019-10-29 19:08:48 +01:00
Benoit Marty
b766bce07d Version++ 2019-10-24 14:40:31 +02:00
ganfra
2974f8b200 Merge branch 'develop' into feature/attachments 2019-10-22 17:27:15 +02:00
ganfra
6cd04525aa Clean after Benoit's review 2019-10-15 11:37:22 +02:00
ganfra
13a5f784dc Merge branch 'develop' into feature/attachments 2019-10-11 17:05:03 +02:00