OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
9,446 Commits
218 Branches
563 Tags
447 MiB
Commit Graph

9446 Commits (941bb94234fbaae2c7c9aee93ac0c906839b0ada)

Author SHA1 Message Date
Michael Telatynski 941bb94234
fix reply fallback blunder 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-20 10:15:15 +01:00
Michael Telatynski 7e8288f7ae
i18n-gen, i18n-prune 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-20 09:39:14 +01:00
Michael Telatynski 563fc9adc7
fix bad copy-paste from other diff 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-20 09:37:25 +01:00
Michael Telatynski 06408f843b
post BigMerge fixup - merge in stuff from riot-web PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-20 09:23:27 +01:00
Michael Telatynski 58cd585e86
start of BigMerge fixup 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-20 09:12:02 +01:00
Matthew Hodgson 1aadaa3cc5
Merge pull request #1836 from matrix-org/matthew/fix_layering 
move everything not explicitly riot (or status) branded into matrix-react-sdk
 2018-04-18 16:30:55 +01:00
Matthew Hodgson 92c98aa3e5 displayName should be tracked as static 2018-04-18 16:19:37 +01:00
Matthew Hodgson 0571c596e3 move deps from vector-web to sdk; resolve version mismatches... 2018-04-18 10:53:01 +01:00
Matthew Hodgson f84573ec9f convert HomePage to ES6 and split out the vectory bit 2018-04-18 10:23:32 +01:00
Matthew Hodgson 6d1563449d fix missing NLs 2018-04-17 16:57:08 +01:00
Matthew Hodgson 7b53e36698 retheming commentary 2018-04-17 16:55:32 +01:00
Matthew Hodgson d91c7f5e54 Add comment about enum hijinks 2018-04-17 16:53:11 +01:00
Matthew Hodgson ce809e16d9 fix i18n thinko on createTrackedDialog 2018-04-17 16:51:17 +01:00
Matthew Hodgson eca5a965c5 add i18n which weren't correctly copied over from vector-web by copy-i18n 2018-04-17 16:50:24 +01:00
Matthew Hodgson 46f5c0d205 finish merging vector-im/riot-web#5881 into matrix-react-sdk 2018-04-16 01:13:03 +01:00
Matthew Hodgson f1f7673037 ignore lint errors in stuff moved over from vector-web for now 2018-04-16 01:12:41 +01:00
Matthew Hodgson 32dd7f976f merge vector-im/riot-web#5881 into matrix-react-sdk 2018-04-16 00:04:04 +01:00
Matthew Hodgson 4da804fd64 Merge branch 'develop' into matthew/fix_layering 2018-04-15 23:59:09 +01:00
Matthew Hodgson fe5e68de29 fix tests 2018-04-15 23:48:52 +01:00
Matthew Hodgson df564af8bd run prune-i18n to bring the translations back in line with normalised en_EN 2018-04-15 23:18:47 +01:00
Matthew Hodgson faa1924902 run gen-i18n to normalise en_EN and remove stuff still in vector-web 2018-04-15 23:18:18 +01:00
Matthew Hodgson cb5ff404e1 fix missing i18n 2018-04-15 23:16:31 +01:00
Matthew Hodgson a30fdaf293 copy all the i18n over from vector-web via copy-i18n.py 2018-04-15 23:00:38 +01:00
Matthew Hodgson 610747e76a fix paths and updateCheckStatusEnum 2018-04-13 16:49:59 +01:00
Michael Telatynski a90bd6cd4f
Allow collapsing ReplyThread from MessageContextMenu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-13 12:28:58 +01:00
Luke Barnard 19d3913e06
Merge pull request #1838 from matrix-org/dbkr/fix_velocity_exception 
Null check node before we pass it to velocity
 2018-04-13 10:58:43 +01:00
Michael Telatynski 8b1e411d6b
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-04-13 10:54:09 +01:00
David Baker ce74099698 Null check node before we pass it to velocity 
As presumably sometimes the node wasn't actually in the DOM for
whatever reason, so don't propagate exceptions out into the app.

Should fix https://github.com/vector-im/riot-web/issues/6515
 2018-04-13 10:44:37 +01:00
Matthew Hodgson 13765632e9 use new rageshake location 2018-04-13 01:36:41 +01:00
Matthew Hodgson efe466ef75 move rageshake to sdk 2018-04-13 01:34:16 +01:00
Matthew Hodgson 0336d99b9e move VectorConferenceHandler over and use getUpdateCheckStatusEnum via field rather than export 2018-04-13 01:29:38 +01:00
Matthew Hodgson 5f3e4444d0 fix theme paths 2018-04-13 01:25:34 +01:00
Matthew Hodgson 5d03eabb15 rethemedex 2018-04-13 00:54:41 +01:00
Matthew Hodgson 40a67ca8fe point imports at the new locations 2018-04-13 00:43:44 +01:00
Matthew Hodgson cc904be379 add NVL 2018-04-12 20:27:16 +01:00
Matthew Hodgson 7ae1b37b56 add notif UTs 2018-04-12 20:25:08 +01:00
David Baker 7e977d0016 Merge branch 'master' into develop 2018-04-12 12:54:46 +01:00
David Baker c06fc31bb2 v0.12.2 2018-04-12 12:50:52 +01:00
David Baker 4a1d0fc8ab Prepare changelog for v0.12.2 2018-04-12 12:50:51 +01:00
David Baker f38bb1f2c2 Bump js-sdk 2018-04-12 12:40:33 +01:00
Travis Ralston 3f069af067 Also remove the setting 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-04-12 12:40:07 +01:00
Travis Ralston 91a41392b4 Remove presence management 
The feature is incredibly buggy and doesn't work as expected due to server behaviour and client interaction. One of the major problems is the constantly confused presence state - this is caused by the mobile apps conflicting on the state of the web app, causing it to consider the user offline or online (and rarely away) depending on how riot-android/ios is behaving at the time.

This reverts two PRs:
* https://github.com/matrix-org/matrix-react-sdk/pull/1620
* https://github.com/matrix-org/matrix-react-sdk/pull/1482

The changes to the context menu positioning were not reverted as they are useful outside of presence management.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-04-12 12:36:51 +01:00
David Baker 760f21b1d9 Put Tinter loop body in a try/catch 
So whatever other random ways this process fails in don't cause it
to take out the whole app.
 2018-04-12 12:23:33 +01:00
David Baker 5f2d9b6c54 Null check stylesheet href 
As commented

Fixes https://github.com/vector-im/riot-web/issues/6489
 2018-04-12 12:23:24 +01:00
Matthew Hodgson d0827586e6
Merge pull request #1676 from turt2live/travis/remove-presence 
Remove presence management
 2018-04-12 11:47:21 +01:00
Michael Telatynski c77807bd22
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/en_EN.json
#	src/i18n/strings/eu.json
#	src/i18n/strings/fr.json
#	src/i18n/strings/lv.json
#	src/i18n/strings/ru.json
#	src/i18n/strings/zh_Hant.json
 2018-04-12 09:48:06 +01:00
Matthew Hodgson 8371774d13 move default ringtones over from riot-web 2018-04-12 00:25:36 +01:00
Matthew Hodgson 8ce4df7ce3 move non-Riot image resources over from riot-web 2018-04-12 00:25:07 +01:00
Matthew Hodgson 848403a0ab move default fonts over from riot-web 2018-04-12 00:24:51 +01:00
Matthew Hodgson cdb5d489a4 organise themes (even light & dark) in the SDK layer 2018-04-12 00:24:22 +01:00