Commit Graph

7728 Commits

Author SHA1 Message Date
SBiOSoftWhare a2f0985e8f Merge pull request #5588 from vector-im/steve/5409_bubbles_constants
Message bubbles: Use layout constants instead magic numbers
2022-02-16 12:36:12 +01:00
David Langley 7ad04838ed Merge pull request #5428 from simonwiedmer/wiedmer_proximity_sensor
Fix proximity sensor and sleep timer
2022-02-16 11:10:17 +00:00
SBiOSoftWhare 5e432d32b4 BubbleRoomCellLayoutUpdater: Fix outgoing message issue. 2022-02-16 11:59:35 +01:00
Stefan Ceriu 02ab8eec9e Merge branch 'master' into develop 2022-02-16 12:45:06 +02:00
Doug b723c9a026 Only no-op the actual sending of a typing notification.
The logic around when to send a typing notification also includes logic around when to exchange encryption keys.
handleTypingNotification renamed to handleTypingState for clarity.
2022-02-16 12:42:00 +02:00
Doug 79aaf9f2c0 Use UIControlEventTouchUpInside for all toggles. 2022-02-16 12:42:00 +02:00
SBiOSoftWhare 23df7ed75e SettingsViewController: Fix indent issue. 2022-02-16 12:42:00 +02:00
SBiOSoftWhare 65d68c58dc Message bubbles: Move bubbles settings to labs section atm. 2022-02-16 12:42:00 +02:00
Doug 37a0c72169 Fix for images sometimes being sent unencrypted in an encrypted room. 2022-02-16 12:42:00 +02:00
SBiOSoftWhare 3db5c7a59e BubbleRoomTimelineCellDecorator: Use layout constants. 2022-02-15 17:27:44 +01:00
SBiOSoftWhare d392791ec3 FileWithoutThumbnailCellContentView: Use constants. 2022-02-15 17:11:51 +01:00
SBiOSoftWhare 9fc3233312 RoomMessageBubbleBackgroundView: Use constants. 2022-02-15 17:11:41 +01:00
SBiOSoftWhare 16aa2b1876 BubbleRoomCellLayoutConstants: Add new decoration constraints. 2022-02-15 17:11:03 +01:00
Anderas a9505c9140 Merge pull request #5585 from vector-im/andy/common_kit
Add CommonKit and Activity
2022-02-15 15:46:19 +00:00
SBiOSoftWhare 1a4ba860d9 BubbleRoomCellLayoutUpdater: User constants. 2022-02-15 15:53:52 +01:00
SBiOSoftWhare 70751a6aaa PollBaseBubbleCell: Use constants. 2022-02-15 14:46:54 +01:00
Andy Uhnak cbbff45a7a Add CommonKit and Activity
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-15 13:41:36 +00:00
ismailgulek 42ffda9918 Merge branch 'develop' into ismail/5562_search_aggregations 2022-02-15 16:15:53 +03:00
ismailgulek 0fe44bb480 Merge pull request #5561 from vector-im/ismail/5540_thread_list
Thread List API Implementation
2022-02-15 16:13:36 +03:00
ismailgulek 5dd278f7ea Display thread list api errors 2022-02-15 15:46:22 +03:00
SBiOSoftWhare 8aafab94dd Voice message cells: Use constants. 2022-02-15 12:12:49 +01:00
SBiOSoftWhare 106f1ad6c4 Poll cells: Use constants. 2022-02-15 12:10:32 +01:00
SBiOSoftWhare 9a9f4ebf7a Location sharing cells: Use constants. 2022-02-15 12:09:13 +01:00
SBiOSoftWhare dd43be272b File cells: Use constants. 2022-02-15 12:07:41 +01:00
SBiOSoftWhare 4b9afa0ee3 Text message bubbles: Use constants. 2022-02-15 12:05:31 +01:00
SBiOSoftWhare 0595b5b5fb BubbleRoomCellLayoutConstants: Update constants and add new ones. 2022-02-15 12:03:08 +01:00
aringenbach cdfa801bc7 Update filter placeholder and icon (#5520)
* Update filter placeholder and icon

* Use SwiftGen asset helper & add filter_on icon

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-14 10:25:21 +01:00
MaximeEvrard42 207194ba7a Merge pull request #5563 from vector-im/maximee/5346_replace_kick_wording
Replace "kick" by "remove" in all strings
2022-02-14 09:40:10 +01:00
Simon Wiedmer eda8dcd086 Merge remote-tracking branch 'upstream/develop' into wiedmer_proximity_sensor 2022-02-14 08:24:25 +01:00
Doug e1db1620ee Revert "Fix for images sometimes being sent unencrypted inside an encrypted room."
This reverts commit 3491e0d7aa2782c3e8379c1b40644af5492e8f83.
2022-02-11 18:17:39 +00:00
Doug 21e21cccc3 Fix for images sometimes being sent unencrypted inside an encrypted room. 2022-02-11 18:16:13 +00:00
Doug af615ea665 Fix spinner when clearing cache. 2022-02-11 15:42:12 +00:00
ismailgulek 7e46ee7e3f Avoid redundant live timeline loading if thread relation exists 2022-02-11 18:15:23 +03:00
ismailgulek 3a9a6d357f Use thread relation if exists when opening search results 2022-02-11 18:14:41 +03:00
ismailgulek c740a8110e Use thread protocols where possible 2022-02-11 18:11:44 +03:00
MaximeE 88a284e978 Merge branch 'develop' into maximee/5346_replace_kick_wording 2022-02-11 14:32:52 +01:00
MaximeE 590e5cf4f1 Replace kick by remove in all strings 2022-02-11 14:25:20 +01:00
ismailgulek e223bc6533 Merge branch 'develop' into ismail/5540_thread_list 2022-02-11 16:13:26 +03:00
Doug 936fa8638a Merge pull request #5560 from vector-im/doug/5559_fix_stuck_loading
Fix for the green spinner not being dismissed with a local synapse.
2022-02-11 13:11:53 +00:00
Doug f05fb9f3e5 Fix for the green spinner not being dismissed with a local synapse. 2022-02-11 12:29:06 +00:00
Andy Uhnak a90d8e287d Exclude all items from iCloud backup
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-11 11:45:17 +00:00
aringenbach 2f6546799e Add objective C support to SwiftGen assets helpers (#5533)
* Add objective C support to SwiftGen assets helpers

* Use dot notation in ObjC & fix minor issues

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-10 17:13:23 +01:00
ismailgulek 952d69477b Use new api to fetch thread list 2022-02-10 17:35:18 +03:00
Doug 1f933a271a Merge pull request #5467 from vector-im/doug/5160_ftue_use_case
Add the FTUE use case screen for new users.
2022-02-10 14:28:28 +00:00
SBiOSoftWhare c5e926d4e6 SettingsViewController: Fix indent issue. 2022-02-10 15:08:24 +01:00
SBiOSoftWhare 1e26681e34 Message bubbles: Move bubbles settings to labs section atm. 2022-02-10 14:59:45 +01:00
ismailgulek ff28bd7657 Use thread protocol when possible 2022-02-10 16:48:27 +03:00
Doug 56b70d254b Updates following PR feedback. 2022-02-10 12:59:13 +00:00
Doug 200a1623ce Merge pull request #5510 from aaronraimist/register-spec
Make registration spec compliant (fixes registration on Conduit)
2022-02-10 10:09:52 +00:00
ismailgulek 30fda7b926 Merge pull request #5539 from vector-im/ismail/5537_home_badges
Home Screen: Fix Section & TabBar Badges
2022-02-10 11:49:50 +03:00