Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-25 15:08:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,583 Commits 530 Branches 158 Tags 486 MiB
6233822244
Commit Graph

11583 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Valere
ec53ce9d00
Merge pull request #141 from vector-im/feature/edit_aggregation 
Support incoming message edition
 2019-05-21 16:21:46 +02:00
Benoit Marty
52d9adad70 WIP 2019-05-21 15:42:09 +02:00
Valere
118a4392a2 Fix / Support redaction of a m.replace event 
+ refactoring
 2019-05-21 15:33:16 +02:00
Valere
b8c3bdbbf6 Cleaning 2019-05-21 14:27:57 +02:00
Valere
d49007538b Fix / Annotate emote also 2019-05-21 14:26:46 +02:00
Valere
6f103101b6 Show edited annotation in timeline + simple edit history 2019-05-21 14:12:18 +02:00
Valere
a5a9fa3750 Color provider need to be aware of theme 2019-05-21 14:10:19 +02:00
Valere
efcac6b3e4 Fix / Missing schema for realm 2019-05-21 09:50:10 +02:00
Valere
8cb884f10e Support message edition 2019-05-20 18:52:48 +02:00
Benoit Marty
6d8000b957 Log 2019-05-20 17:13:08 +02:00
Benoit Marty
f5bd215f36 rework 2019-05-20 16:55:45 +02:00
Benoit Marty
532a028e41 Split again 2019-05-20 16:13:50 +02:00
Valere
2581bf69e0
Merge pull request #139 from vector-im/feature/undo_reaction 
Undo Reaction
 2019-05-20 14:28:36 +02:00
Valere
2da4823e33 Fix / crash on logout 
cannot access deleted object from delete
 2019-05-20 13:58:45 +02:00
Valere
70c4b7528d Fix doc 2019-05-20 12:49:35 +02:00
Valere
5dfc0b3c0e Toggle Quick React (agree/disagree like/dislike) 2019-05-20 12:43:02 +02:00
Valere
44d1d063e9 Fix / theme update after rebase was displaying emojis grayed out 2019-05-20 10:16:00 +02:00
Valere
71e50b1bb9 Fix / Missing inject after rebase 2019-05-20 10:16:00 +02:00
Valere
64c307077f Refactoring / PruneWorker should be a task not a worker 2019-05-20 10:16:00 +02:00
Valere
71e364b42f Fix / Hide reactions on redacted message 2019-05-20 10:16:00 +02:00
Valere
054d339b48 Fix / Reaction stays highlighted when undone 
When undoing my reaction, the reactji stays selected as if i have done the reaction
 2019-05-20 10:16:00 +02:00
Valere
e3b9031e71 Fix / day separator flicker when adding reaction 
When adding a reaction, the tmp local echo force the display of a new 'day separator' at the bottom if there was no new message for this day yet (then disappears just after -flicker-)
 2019-05-20 10:16:00 +02:00
Valere
3fa9d7a1d4 Fix formatting 2019-05-20 10:16:00 +02:00
Valere
6eafa3c43d Undo Reaction 2019-05-20 10:16:00 +02:00
Valere
207579c59f Fix / margin end-right missing for compatibility 2019-05-20 10:14:40 +02:00
ganfra
2780ca30a8 Merge branch 'feature/invites' into develop 2019-05-17 17:38:09 +02:00
Benoit Marty
e0e41d9e5c Create common action 2019-05-17 15:33:38 +02:00
Benoit Marty
340830d45f Test passed 2019-05-17 15:21:44 +02:00
Benoit Marty
de4662b9d5 Remove all async thread 2019-05-17 15:05:07 +02:00
Benoit Marty
c66e82c4ae Create OneTimeKeysManager 2019-05-17 12:39:18 +02:00
Benoit Marty
a2210a6b0d WIP 2019-05-17 11:20:22 +02:00
Valere
41c54029b5
Merge pull request #138 from vector-im/feature/send_reaction-phase1 
Send reaction view quick react and picker
 2019-05-17 09:05:58 +02:00
Valere
f9142fedfd Increment reaction when reaction pill clicked in timeline 2019-05-16 18:33:32 +02:00
Benoit Marty
102bc9c01b SAS Tested 2019-05-16 17:28:51 +02:00
Valere
ef26519993 Send reaction view quick react and picker 
+ fix / Error when to many reactions in cells (more than placeholders -8-)
+ fix / DefaultTimeline quick map access was not shifted when items inserted at given index
 2019-05-16 16:35:54 +02:00
Valere
e27367e3f2
Merge pull request #137 from vector-im/feature/aggregations_relations 
Feature/aggregations relations
 2019-05-16 16:22:47 +02:00
Benoit Marty
e70fd8e351 canonicalize 2019-05-16 15:36:51 +02:00
Valere
dc9db9a438 Fix / was using wrong emoji for agree 2019-05-16 10:56:37 +02:00
Valere
6fe455dac0 Support AddedByMe in reaction + context menu reflect agree/like state 2019-05-16 10:49:52 +02:00
Benoit Marty
1436667e7d Crypto 2019-05-16 10:34:17 +02:00
Valere
a9a1fe2aa0 Fix / hide keyboard when showing context action sheet 
+ fix reaction colors
 2019-05-16 09:33:49 +02:00
Valere
d68b447874 Relations Model + Aggregation + Reactions Summary 2019-05-16 09:21:10 +02:00
Valere
11e3a5def8 Moved reactions view to a stub 2019-05-16 09:20:24 +02:00
Valere
6aae943e77
Merge pull request #135 from vector-im/feature/reaction_timeline_ux 
Reactions: Display existing reactions below the message
 2019-05-15 11:24:00 +02:00
ganfra
8d0322c0c3 Hot fix LL not working 2019-05-15 11:11:38 +02:00
ganfra
f60a5f568f Invitation : start polishing but theme has to be rework. Waiting for Nad inputs. 2019-05-14 11:55:48 +02:00
Valere
00fd866cc8 Reactions: Display existing reactions below the message 
- Reaction Button Bellow the message
- Upgrade to constraint layout 2.0.0 beta (for Constraint Helpers / Flow)
- Added tap on member name action
- Cleaning
 2019-05-14 11:07:53 +02:00
Valere
8929898397
Merge pull request #134 from vector-im/feature/refactor_timeline_layouts 
Refactoring / Use view ViewStub to avoid layout xml duplication
 2019-05-13 16:59:13 +02:00
Valere
73d5110d67 Code review / Renamed base item class name 2019-05-13 16:29:33 +02:00
Valere
0c559976d6 Default avatar style so small 2019-05-13 09:38:52 +02:00