b71bcb4e9b
Merge remote-tracking branch 'origin/develop' into develop
2017-10-15 00:02:53 +00:00
f143315618
Merge pull request #5142 from turt2live/travis/pinned_messages
...
Message/event pinning
2017-10-15 01:02:49 +01:00
4a5e2e347b
Translated using Weblate (German)
...
Currently translated at 100.0% (210 of 210 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-10-14 23:11:20 +00:00
6926c96f36
Hide pinning messages behind a labs settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 16:41:44 -06:00
6f819606c1
Merge pull request #4054 from ollieh/issues/3771
...
Sorting of networks within a protocol based on name
2017-10-14 23:21:51 +01:00
3e066d3aef
Merge branch 'develop' into travis/pinned_messages
2017-10-14 16:11:17 -06:00
2667ed2561
Merge pull request #4988 from vector-im/t3chguy/hide_notification_body
...
allow hiding of notification body for privacy reasons
2017-10-14 23:07:31 +01:00
5bb2992f93
Merge pull request #5281 from turt2live/travis/display-name-lightbox
...
Don't use MXIDs on the lightbox if possible
2017-10-14 22:46:13 +01:00
b70bd1987a
Merge pull request #5267 from turt2live/travis/alone_warning_css
...
CSS for lonely room message
2017-10-14 22:44:58 +01:00
5c1e2a8a82
Merge pull request #5037 from turt2live/travis/code_block_border
...
Bring back dark theme code block border
2017-10-14 22:32:45 +01:00
6f81142bde
Merge pull request #5282 from turt2live/travis/unset_avatar
...
CSS for remove avatar buttons
2017-10-14 22:11:02 +01:00
56e775c56a
Remove user avatar button CSS
2017-10-13 21:14:08 -06:00
c7723ba0b0
Remove room avatar button CSS
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-13 20:56:39 -06:00
1adb63ac74
Don't use MXIDs on the lightbox if possible
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-13 20:18:55 -06:00
f5397acfa1
v0.12.7-rc.3
2017-10-13 16:36:57 +01:00
bdd96c6a9a
Prepare changelog for v0.12.7-rc.3
2017-10-13 16:36:56 +01:00
e0de9cbdfe
v0.12.7-rc.3
2017-10-13 16:36:07 +01:00
f555f2036e
react-sdk rc.3
2017-10-13 16:35:41 +01:00
3b2650e5ea
Merge remote-tracking branch 'origin/develop' into release-v0.12.7
2017-10-13 16:33:55 +01:00
d1476e0cc7
Merge pull request #5275 from vector-im/dbkr/hide_join_group
...
Hide the join group button
2017-10-13 16:27:50 +01:00
b727944b11
Bump electron version
2017-10-13 16:27:01 +01:00
398e0839f1
Hide the join group button
...
Until it actually does something
2017-10-13 16:15:17 +01:00
adceda7588
v0.12.7-rc.2
2017-10-13 15:06:18 +01:00
577db02140
Prepare changelog for v0.12.7-rc.2
2017-10-13 15:06:18 +01:00
4bd53eb821
v0.12.7-rc.2
2017-10-13 15:05:34 +01:00
b3da206a92
react-sdk rc.2
2017-10-13 15:03:43 +01:00
f8554ca2f2
v0.12.7-rc.1
2017-10-13 11:15:41 +01:00
470ea8d6a7
Prepare changelog for v0.12.7-rc.1
2017-10-13 11:15:40 +01:00
79154e26fc
v0.12.7-rc.1
2017-10-13 11:14:31 +01:00
64cfc9b717
js & react sdk rc.1
2017-10-13 11:13:54 +01:00
bbcf46bb69
Merge branch 'develop' of github.com:vector-im/riot-web into develop
2017-10-12 18:12:14 +01:00
832465655b
Merge pull request #5203 from vector-im/t3chguy/riot.im-logos
...
switch to new logos, and use import rather than VAR
2017-10-12 17:49:29 +01:00
392fea1207
Merge pull request #5266 from turt2live/travis/doc_integs
...
Clarify what an integrations server is
2017-10-12 17:48:30 +01:00
0c093b5ca2
Merge pull request #5269 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2017-10-12 17:47:39 +01:00
8216d8999c
Merge branch 'develop' of https://github.com/vector-im/riot-web into develop
...
Conflicts:
src/i18n/strings/cs.json
src/i18n/strings/fr.json
src/i18n/strings/nb_NO.json
src/i18n/strings/nl.json
src/i18n/strings/pt_BR.json
2017-10-12 16:24:36 +00:00
7d12e2f64b
Translated using Weblate (Portuguese)
...
Currently translated at 100.0% (223 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt/
2017-10-12 16:22:01 +00:00
bbf859aad7
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 54.7% (122 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nb_NO/
2017-10-12 16:22:01 +00:00
783aebe5eb
CSS for lonely room message
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 21:13:55 -06:00
eb6ce753aa
Clarify what an integrations server is
...
Possibly helps resolve #1698
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 19:52:10 -06:00
6df69138a2
switch to new logos, and use import rather than VAR
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-11 16:46:05 +01:00
ca0d8e425e
Merge branch 'develop' of github.com:vector-im/riot-web into develop
2017-10-11 16:00:34 +01:00
ae1a5a50b0
Move inline CSS for flair
...
Also, move vertical align from mx_Flair to img otherwise the SenderProfile has increased height when Flair is present, causing bug with scroll position
2017-10-11 16:00:26 +01:00
e405d6cbd6
Merge pull request #5167 from vector-im/t3chguy/quickfix
...
Remove trailing comma in JSON
2017-10-11 16:40:29 +02:00
508ff4f917
Merge pull request #3849 from psaavedra/set_default_federate_by_settings
...
Added default_federate property
2017-10-11 16:28:25 +02:00
83f7af5d7e
Merge pull request #5197 from vector-im/dbkr/say_which_homeserver
...
CSS for greying out login form
2017-10-11 14:12:20 +01:00
27a81c25d2
CSS for greying out login form
2017-10-11 14:06:12 +01:00
e39730d52e
Say which translation file failed ( #5196 )
...
So we can see which i18n file is invalid when it fails
2017-10-11 09:56:38 +01:00
415ffac978
Translated using Weblate (Russian)
...
Currently translated at 100.0% (223 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2017-10-10 17:29:36 +00:00
16764382a5
Translated using Weblate (Italian)
...
Currently translated at 100.0% (223 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
2017-10-10 17:29:36 +00:00
fd7ddd9ec8
Translated using Weblate (Galician)
...
Currently translated at 100.0% (223 of 223 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
2017-10-10 17:29:36 +00:00
Weblate