Commit graph

5080 commits

Author SHA1 Message Date
SpiritCroc
39c0c562a6 Update .gitignore for gplay builds 2020-08-09 17:02:51 +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
ba430f94f9 Change piwik url in case it gets used in the future
We don't want to report stats to upstream.
2020-08-09 13:39:26 +02:00
SpiritCroc
16f98145b1 Update privacy policy for FCM 2020-08-09 13:39:26 +02:00
SpiritCroc
5888c018e0 Adapt google-services.json package ids 2020-08-09 13:39:12 +02:00
SpiritCroc
459e20aac9 Merge tag 'v1.0.4' into sc 2020-08-07 12:34:18 +02:00
SpiritCroc
01eaed1cef Update README 2020-08-07 11:17:43 +02:00
SpiritCroc
b7424ef92a Fix accent color in bottom navigation icons 2020-08-06 17:30:48 +02:00
SpiritCroc
f0f7ef4dd8 Make single overview page optional
Allow tabbed layout like element
2020-08-06 17:30:44 +02:00
Valere
ee1d5faf0d Merge branch 'hotfix/fix_crash_invite_user' 2020-08-03 14:01:27 +02:00
Valere
7308c4a15c Merge branch 'hotfix/fix_crash_before_release' 2020-08-03 12:23:55 +02:00
Valere
db6045778e Update change log 2020-08-03 12:11:50 +02:00
Valere
2810923519 FIx / Crash when opening Invite User screen 2020-08-03 12:00:08 +02:00
SpiritCroc
2712ff9d84 We're on GPlay 2020-08-01 10:36:45 +02:00
SpiritCroc
21bce12f05 Update PRIVACY.md 2020-07-31 11:52:59 +02:00
SpiritCroc
f081874d50 PRIVACY.md: clear markdown from spans 2020-07-31 11:52:46 +02:00
Christian Pauly
fdca5b2f94 Update PRIVACY.md 2020-07-31 11:52:29 +02:00
SpiritCroc
687bf57d2d SchildiChat README 2020-07-31 11:51:40 +02:00
SpiritCroc
41aece007d Ignore vector/fdroid/release 2020-07-31 11:43:39 +02:00
SpiritCroc
e10a530d69 Fix splash theme 2020-07-31 11:42:13 +02:00
SpiritCroc
65be2c982a Revert "Fix rebranding assets on login screens."
This reverts commit 4cc3e87d64.

Conflicts:
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_login_header.xml
2020-07-31 11:35:48 +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
7fddfa45e8 Merge branch 'release/1.0.3' 2020-07-31 00:02:02 +02:00
Valere
258acaf814 Prepare release 1.0.3 2020-07-31 00:01:33 +02:00
Valere
2f6cdc6529
Merge pull request #1847 from vector-im/feature/crash_store_mvrx
Fix IllegalArgumentException reported from store on HomeActivity aunch
2020-07-30 18:07:11 +02:00
Valere
1f226ca6c7
Merge pull request #1845 from vector-im/feature/admin_e2e_config
Feature/admin e2e config
2020-07-30 18:06:27 +02:00
Valere
c90f5ed370 Fix IllegalArgumentException reported from store on HomeActivity aunch 2020-07-30 17:03:11 +02:00
Valere
ccb466edbe Update change log 2020-07-30 16:57:25 +02:00
Valere
1204f6d9ce UX feedback, reduce severity of message 2020-07-30 15:25:10 +02:00
Valere
562cfce9e2 Support HS admin option to disable E2EE for DMs
Fixes #1794
2020-07-30 12:08:30 +02:00
Valere
b732ea6c69 Version ++ 2020-07-29 11:39:23 +02:00
Valere
a048f79b37 Merge branch 'release/1.0.2' 2020-07-29 10:46:54 +02:00
Valere
3214f7d3d5 Merge branch 'release/1.0.2' into develop 2020-07-29 10:46:54 +02:00
Valere
06ef665f66 prepare release 1.0.2 2020-07-29 10:33:55 +02:00
Valere
e1a07f1da6
Merge pull request #1838 from vector-im/feature/session_store_migration
Feature/session store migration
2020-07-29 10:31:14 +02:00
Valere
5c32c7388a cleaning 2020-07-29 09:51:50 +02:00
Valere
c04f22d3bf quick fix plural 2020-07-29 09:51:20 +02:00
Valere
cbf43ea7b3 Session store migration 2020-07-29 09:50:12 +02:00
Valere
9197275343 version++ 2020-07-29 09:00:29 +02:00
Valere
cc4298209b Merge branch 'release/1.0.1' 2020-07-28 18:03:37 +02:00
Valere
f26ce64914 Merge branch 'release/1.0.1' into develop 2020-07-28 18:03:36 +02:00
Valere
e3f5b7cab3 Prepare release 1.0.1 2020-07-28 18:02:51 +02:00
Valere
dde9cdd8ac
Merge pull request #1821 from vector-im/feature/notification_off_alert
Check if migration disabled notif
2020-07-28 17:04:15 +02:00
Valere
0d0308d584
Merge pull request #1802 from vector-im/feature/fix_reply_tag
Feature/fix reply tag
2020-07-28 16:58:10 +02:00
Valere
a47ff99be7
Merge branch 'develop' into feature/fix_reply_tag 2020-07-28 16:58:00 +02:00
Valere
e619217687 Code quality 2020-07-28 16:56:55 +02:00
Valere
6f5b3371fe Check if migration disabled notif 2020-07-28 16:56:55 +02:00
Valere
f7b9fc3bb1
Merge pull request #1826 from vector-im/feature/banned_list
Added banned user screen
2020-07-28 16:53:58 +02:00
ganfra
700a2e9ce3
Merge pull request #1832 from vector-im/feature/fix_timeline_loading
Fix timeline non loading when there are lots of filtered events
2020-07-28 16:30:57 +02:00