Commit Graph

4737 Commits

Author SHA1 Message Date
manuroe 57ce342ba7 Podfile: come back to develop 2018-08-07 18:23:05 +02:00
manuroe 51831fc05f Merge pull request #1954 from vector-im/lazy_loading
Lazy loading
2018-08-07 16:21:05 +00:00
manuroe e3f3f945c1 Fix compilation issue while merging room versioning and lazy_loading 2018-08-07 18:20:22 +02:00
manuroe 3fc495cc26 Merge remote-tracking branch 'origin/develop' into lazy_loading
# Conflicts:
#	CHANGES.rst
#	Riot/Modules/Room/RoomViewController.m
2018-08-07 18:06:58 +02:00
SBiOSoftWhare ee8772d38c Merge pull request #1946 from vector-im/riot_1938
Support room versioning
2018-08-07 16:57:20 +02:00
SBiOSoftWhare 196a2d55e4 Update room predecessor strings in Vector.strings 2018-08-07 16:50:04 +02:00
SBiOSoftWhare 0a242e2f44 [RoomViewController] Now use RoomPredecessorBubbleCell to display room predecessor informations. 2018-08-07 11:27:37 +02:00
SBiOSoftWhare 23cfc557be Create RoomPredecessorBubbleCell in order to display room predecessor info when needed 2018-08-07 11:26:35 +02:00
SBiOSoftWhare 039ac75b21 [RoomBubbleCellData] Update way to put tag `RoomBubbleCellDataTagRoomCreateWithPredecessor 2018-08-07 11:25:04 +02:00
SBiOSoftWhare ab91d3f69a [EventFormatter] Update room create event type processing when content has room predecessor info. 2018-08-07 11:23:03 +02:00
SBiOSoftWhare 2e0b51b8e2 [RoomViewController] Fix a crash when user highlight a message and write to room is forbidden. 2018-08-06 14:08:28 +02:00
manuroe deae5c35dc Merge pull request #1951 from vector-im/ll_fix_search_display
Lazy-loading: Fix search display
2018-08-06 08:01:39 +00:00
manuroe 138ca4e2de Lazy-loading: Fix search display
Use profile info sent in the search response.
2018-08-03 17:01:53 +02:00
manuroe b1fa52c50b Merge pull request #1950 from vector-im/lazy_loading_server_side
Lazy loading server side
2018-08-03 12:09:27 +00:00
manuroe 75e53c8467 Lazy-loading server side: Fix Giom's remark 2018-08-03 14:06:01 +02:00
manuroe 7aa5447fd0 Lazy-loading server side: Add "Settings > LABS > Lazy load rooms members" option 2018-08-02 16:29:50 +02:00
manuroe 80f7253db9 Lazy-loading server side: Update code in extensions 2018-08-02 12:05:38 +02:00
manuroe 4130c91803 Lazy-loading server side: Use MXRoomState.membersCount when possible 2018-08-02 11:50:34 +02:00
manuroe 0e65352e0c Lazy-loading server side: Use MXRoomSummary.membersCount when possible 2018-08-02 11:36:40 +02:00
manuroe 2ab0b51af7 Lazy-loading server side: Use new async [MXRoom members:lazyLoadedMembers:] 2018-08-01 17:25:38 +02:00
manuroe 4dada194af Lazy-loading server side: Use MXRoomState.members instead of [MXRoom members:] when possible 2018-08-01 17:12:46 +02:00
manuroe 0beebd548d New async [MXRoom state:]: Fix issue using preloadRoomsData 2018-07-31 16:53:08 +02:00
SBiOSoftWhare e79e907b3a Update changes 2018-07-27 18:54:09 +02:00
SBiOSoftWhare 06e0f5458d [RoomViewController] Use simple cell in order to display room create predecessor information 2018-07-27 18:53:51 +02:00
SBiOSoftWhare 20ba14e1e2 [RoomBubbleCellData] Add room create with predecessor tag in order to identify this particular case 2018-07-27 18:49:36 +02:00
SBiOSoftWhare 34b7f012c8 [EventFormatter] Handle room create predecessor string building 2018-07-27 18:45:23 +02:00
SBiOSoftWhare e5e12c1c45 Add room create predecessor related localizable strings 2018-07-27 18:42:32 +02:00
SBiOSoftWhare ba8fb67efc [RoomActivities] Improve display room replacement 2018-07-27 18:33:46 +02:00
SBiOSoftWhare 78a8ac46a7 [RoomViewController] Handle obsolete room (m.room.tombstone event type) and display replacement room in activities view 2018-07-27 11:56:51 +02:00
SBiOSoftWhare e5e3a24f33 [RoomActivitiesView] Add room replacement display 2018-07-27 11:48:38 +02:00
SBiOSoftWhare 4e5e21bc7a Add room replacement related strings in Vector.strings 2018-07-27 11:34:23 +02:00
manuroe c2c0a96aa6 Podfile: temporary modification to point at lazy_loading dev branches 2018-07-25 18:04:38 +02:00
SBiOSoftWhare ee532754c6 Merge pull request #1944 from vector-im/riot_1911 Replies: Implement sending 2018-07-24 16:53:07 +02:00
SBiOSoftWhare 544e87d7fd Fix boolean condition when updating placholder in RoomInputToolbarView 2018-07-24 16:53:07 +02:00
SBiOSoftWhare 5f2425d0a3 Fix MXKSlashCommands import from RoomViewController 2018-07-24 16:53:07 +02:00
SBiOSoftWhare b8f747cf84 Update join slash command constant in RoomViewController from MXKSlashCommands 2018-07-24 16:53:07 +02:00
SBiOSoftWhare 3c0655aba8 Add send reply to changes 2018-07-24 16:53:06 +02:00
SBiOSoftWhare d4e20e8933 [RoomViewController] Handle sending a reply by highlighting a message on timeline for supported events. 2018-07-24 16:53:06 +02:00
SBiOSoftWhare 1874b5bac6 Add send reply mode in RoomInputToolbarView in order to update text input placeholder when sending a reply. 2018-07-24 16:53:06 +02:00
SBiOSoftWhare 236d05f2c3 Add english string localizations for room message send reply 2018-07-24 16:53:06 +02:00
manuroe c7a7a7c3f1 Merge pull request #1945 from vector-im/MXFileStore_async_state
MXStore: Use the new async [MXStore stateOfRoom:] method
2018-07-24 14:38:57 +00:00
manuroe 4312e7550b Merge pull request #1943 from vector-im/async_timeline_and_state
MXRoom: Make access to liveTimeline data async
2018-07-24 14:33:05 +00:00
manuroe 402623efaf New async [MXRoom state:]: Fix issue reported in Steve's review 2018-07-24 16:30:48 +02:00
SBiOSoftWhare 85e086dc75 Merge pull request #1944 from vector-im/riot_1911
Replies: Implement sending
2018-07-24 13:48:18 +02:00
SBiOSoftWhare 0b0ae14833 Fix boolean condition when updating placholder in RoomInputToolbarView 2018-07-24 13:32:40 +02:00
SBiOSoftWhare 0a889def31 Fix MXKSlashCommands import from RoomViewController 2018-07-24 13:31:37 +02:00
SBiOSoftWhare 3627fdbcbb Update join slash command constant in RoomViewController from MXKSlashCommands 2018-07-24 12:24:12 +02:00
manuroe 9f136409a1 MXStore: Use the new async [MXStore stateOfRoom:] method 2018-07-24 11:39:13 +02:00
SBiOSoftWhare 79b3caedd5 Add send reply to changes 2018-07-23 18:48:23 +02:00
manuroe e33b38e11f New async [MXRoom state:]: Use new [MXRoom listenToEventsOfTypes:] 2018-07-23 18:14:45 +02:00