| 
						
					 | 
					
						
						
						
						
							
						
						
							c0d9de4fcf
							
						
					 | 
					
						
						
							
							add main.scss
						
						
						
						
						
					 | 
					
						2021-06-08 21:41:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ec4bdbbec4
							
						
					 | 
					
						
						
							
							fix membership and unsupported event info
						
						
						
						
						
					 | 
					
						2021-05-21 02:00:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bf286929cb
							
						
					 | 
					
						
						
							
							calc font-width for emojiEvents
						
						
						
						
						
					 | 
					
						2021-05-19 14:00:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a6838e3703
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev'
						
						
						
						
						
					 | 
					
						2021-05-14 02:16:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9a1aa73cc8
							
						
					 | 
					
						
						
							
							paste images/files as attachment
						
						
						
						
						
					 | 
					
						2021-05-13 01:51:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3a8a25d2e1
							
						
					 | 
					
						
						
							
							add CapacitorStorageApi and some fixes
						
						
						
						
						
					 | 
					
						2021-05-10 00:35:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fdfb9c0361
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into matrix-chat-native
						
						
						
						
						
						
						
						# Conflicts:
#	package.json 
						
					 | 
					
						2021-05-09 16:54:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e48c516211
							
						
					 | 
					
						
						
							
							Merge branch 'dev'
						
						
						
						
						
					 | 
					
						2021-05-09 16:47:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9853c5327e
							
						
					 | 
					
						
						
							
							debug and add localStorage
						
						
						
						
						
					 | 
					
						2021-05-09 16:07:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f220bbc63b
							
						
					 | 
					
						
						
							
							add submodule matrix-chat-android
						
						
						
						
						
					 | 
					
						2021-05-04 18:23:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							520a5ca6d9
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into matrix-chat-native
						
						
						
						
						
					 | 
					
						2021-05-04 17:42:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							292b123f5a
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev'
						
						
						
						
						
					 | 
					
						2021-05-04 17:30:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							40812fc4a2
							
						
					 | 
					
						
						
							
							add createRooms from search
						
						
						
						
						
					 | 
					
						2021-05-03 23:00:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c57c1d348f
							
						
					 | 
					
						
						
							
							refactor newMessage, add fileUpload and soundRecorder
						
						
						
						
						
					 | 
					
						2021-05-02 00:28:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c35b5ba446
							
						
					 | 
					
						
						
							
							fix sendEvent, update eventContent file
						
						
						
						
						
					 | 
					
						2021-05-01 23:02:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							64d6273a52
							
						
					 | 
					
						
						
							
							send attachments and recordings
						
						
						
						
						
					 | 
					
						2021-05-01 01:05:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cce7af2178
							
						
					 | 
					
						
						
							
							add fileInput, refactor eventContent
						
						
						
						
						
					 | 
					
						2021-04-30 00:33:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb707fcde3
							
						
					 | 
					
						
						
							
							add emojiPicker and microphone
						
						
						
						
						
					 | 
					
						2021-04-28 18:55:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d3031a1e70
							
						
					 | 
					
						
						
							
							add popupQuestion.vue, search for users, join rooms
						
						
						
						
						
					 | 
					
						2021-04-28 05:59:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							286bc25446
							
						
					 | 
					
						
						
							
							some fixes
						
						
						
						
						
					 | 
					
						2021-04-28 05:56:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							337a8410cb
							
						
					 | 
					
						
						
							
							add screenshot and description to README.md
						
						
						
						
						
					 | 
					
						2021-04-14 10:32:37 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1d50bae135
							
						
					 | 
					
						
						
							
							fix event overflow
						
						
						
						
						
					 | 
					
						2021-04-14 02:09:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7d9535457f
							
						
					 | 
					
						
						
							
							fix media width
						
						
						
						
						
					 | 
					
						2021-04-11 22:40:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1dea2f76ad
							
						
					 | 
					
						
						
							
							add solveMarkdownLinks to eventUtils
						
						
						
						
						
					 | 
					
						2021-04-11 01:40:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							01fe023d06
							
						
					 | 
					
						
						
							
							fix if prop undefined for getMxc and event
						
						
						
						
						
					 | 
					
						2021-04-11 01:39:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							64d52b071d
							
						
					 | 
					
						
						
							
							show m.audio, m.image, m.video, m.file / add replyEvent.vue
						
						
						
						
						
					 | 
					
						2021-04-11 00:24:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dfaa87f5e7
							
						
					 | 
					
						
						
							
							fix getMXC add getMediaUrl / fix link color
						
						
						
						
						
					 | 
					
						2021-04-11 00:22:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8a9b5a478b
							
						
					 | 
					
						
						
							
							fix setReply / add manageScrollBottom
						
						
						
						
						
					 | 
					
						2021-04-09 21:05:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							30a7e4da81
							
						
					 | 
					
						
						
							
							fix login userid regex
						
						
						
						
						
					 | 
					
						2021-04-09 01:03:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							22c6170787
							
						
					 | 
					
						
						
							
							extract event from timeline.vue to message.vue & message.vue -> event.vue
						
						
						
						
						
					 | 
					
						2021-04-09 01:02:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2c22cae07f
							
						
					 | 
					
						
						
							
							add showNativeNotification
						
						
						
						
						
					 | 
					
						2021-04-09 00:48:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							550d79af28
							
						
					 | 
					
						
						
							
							Merge branch 'master' into matrix-chat-native
						
						
						
						
						
					 | 
					
						2021-04-08 23:43:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							289a230207
							
						
					 | 
					
						
						
							
							add NotificationHandler and listen to pushEvents
						
						
						
						
						
					 | 
					
						2021-04-07 23:16:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fda133486a
							
						
					 | 
					
						
						
							
							simplify loadEvents and load on mounted
						
						
						
						
						
					 | 
					
						2021-04-07 23:14:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							72c7886fc9
							
						
					 | 
					
						
						
							
							refactor router.js -> ./router/index.js
						
						
						
						
						
					 | 
					
						2021-04-07 23:11:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f237f7bf7a
							
						
					 | 
					
						
						
							
							send typing events
						
						
						
						
						
					 | 
					
						2021-04-07 23:08:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bbad002cec
							
						
					 | 
					
						
						
							
							refactor getAvatarUrl
						
						
						
						
						
					 | 
					
						2021-04-07 23:07:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							57d6238ed6
							
						
					 | 
					
						
						
							
							Merge branch 'master' into matrix-chat-native
						
						
						
						
						
					 | 
					
						2021-04-06 03:34:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8dd34b58ee
							
						
					 | 
					
						
						
							
							fix getReplyId
						
						
						
						
						
					 | 
					
						2021-04-06 03:33:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d66f2c990e
							
						
					 | 
					
						
						
							
							add reply to events / update sendEvent / refactor parseMessage to eventUtils / fix quotes
						
						
						
						
						
					 | 
					
						2021-04-06 03:15:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3b70b5b37c
							
						
					 | 
					
						
						
							
							load room by url / +getRoom to matrixUtils
						
						
						
						
						
					 | 
					
						2021-04-05 16:51:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							35e6bf86df
							
						
					 | 
					
						
						
							
							fix icon paths
						
						
						
						
						
					 | 
					
						2021-04-05 16:35:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f1967d4189
							
						
					 | 
					
						
						
							
							add matrixUtils
						
						
						
						
						
					 | 
					
						2021-04-04 04:44:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4a28e22b82
							
						
					 | 
					
						
						
							
							add androidStudioPath to config
						
						
						
						
						
					 | 
					
						2021-04-04 03:32:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a67fa94447
							
						
					 | 
					
						
						
							
							sort rooms by latest event and fix scrolling at reloading
						
						
						
						
						
					 | 
					
						2021-04-04 01:46:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							257f0c833c
							
						
					 | 
					
						
						
							
							init capacitor
						
						
						
						
						
					 | 
					
						2021-03-27 02:12:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f5388abeb0
							
						
					 | 
					
						
						
							
							fix admin and icons
						
						
						
						
						
					 | 
					
						2021-03-25 22:14:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6a92858ac1
							
						
					 | 
					
						
						
							
							fix update user and input styling
						
						
						
						
						
					 | 
					
						2021-03-24 16:06:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7292700cc9
							
						
					 | 
					
						
						
							
							add class AdminAPI and admin.vue
						
						
						
						
						
					 | 
					
						2021-03-24 01:41:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8ea5c46920
							
						
					 | 
					
						
						
							
							debug login error
						
						
						
						
						
					 | 
					
						2021-03-23 13:17:53 +01:00 | 
					
					
						
						
							
							
							
						
					 |