Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,339 Commits 3 Branches 492 Tags 100 MiB
0c3537ac1a
Commit Graph

2339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
0c3537ac1a Remove presets from karma.conf 
seemt o be picked up from .babelrc
 2016-10-13 09:51:10 +01:00
David Baker
e6caf9ece4 move babelcheck.js to scripts/ 2016-10-13 09:50:40 +01:00
David Baker
34c60c69d8 shebang 2016-10-13 09:41:09 +01:00
David Baker
5ff915476a Reminder to restore links + stage2, not stage 0 2016-10-12 18:08:52 +01:00
David Baker
e5d2ebc57c Add babelcheck.js 
As per 4bea0c0818
 2016-10-12 17:46:11 +01:00
David Baker
64815b1b0b Remove babel-polyfill 
Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...)
 2016-10-12 17:23:01 +01:00
David Baker
59120d3019 Merge branch 'babelrc' of https://github.com/aviraldg/vector-web into aviraldg-babelrc 2016-10-12 17:17:10 +01:00
David Baker
9245ab01f1 js-sdk & react-sdk develop 2016-10-12 11:52:18 +01:00
David Baker
59fe9279d1 0.8.3 2016-10-12 11:49:58 +01:00
David Baker
046c9ef920 Prepare changelog for v0.8.3 2016-10-12 11:49:57 +01:00
David Baker
bca22f26c5 js-sdk & react-sdk release versions 2016-10-12 11:49:21 +01:00
Richard van der Hoff
2b68b88b14 Merge pull request #2453 from vector-im/rav/center_images_in_dialog_buttons 
Centre images in dialog buttons
 2016-10-11 19:09:46 +01:00
Richard van der Hoff
97cedfc712 Centre images in dialog buttons 
Some dialogs put a spinner in the button... need to line them up.
 2016-10-11 17:50:49 +01:00
Matthew Hodgson
86cb3e9376 Merge pull request #2448 from aviraldg/fix-quote 
Only show quote option if RTE is enabled
 2016-10-11 14:39:42 +01:00
Aviral Dasgupta
42993a78ed Only show quote option if RTE is enabled 2016-10-11 19:07:15 +05:30
Richard van der Hoff
2a5ca9d3df Merge pull request #2443 from vector-im/dbkr/matrix_network_join_button 
Fix join button for 'matrix' networks
 2016-10-10 11:40:32 +01:00
David Baker
323bd79d0e Fix join button for 'matrix' networks 
Fixes https://github.com/vector-im/vector-web/issues/2435
 2016-10-10 11:21:20 +01:00
Matthew Hodgson
60adbffacf try to fix the create room label 2016-10-10 02:38:38 +01:00
Richard van der Hoff
f827a2963e Merge pull request #2422 from vector-im/dbkr/fix_no_freenode_rooms 
Don't stop paginating if no rooms match
 2016-10-06 10:39:45 +01:00
David Baker
5e293c0f45 Don't stop paginating if no rooms match 
Always show the scrollpanel otherwise we stop paginating if there
are no matching rooms in the first request (as per comment).

Fixes no freenode rooms being shown.
 2016-10-05 18:06:43 +01:00
David Baker
cd7adfed0a Back to develop react & js sdk 2016-10-05 16:59:25 +01:00
David Baker
902bf3a0a6 0.8.2 2016-10-05 16:55:45 +01:00
David Baker
f736e5243c Prepare changelog for v0.8.2 2016-10-05 16:55:44 +01:00
David Baker
fb2c2ed09a Use released version of react-sdk & js-sdk 2016-10-05 16:54:24 +01:00
David Baker
ea38968be9 Merge pull request #2379 from vector-im/dbkr/join_3p_location 
Add native joining of 3p networks to room dir
 2016-10-05 14:00:21 +01:00
David Baker
562b047362 Typo 2016-10-05 13:49:30 +01:00
David Baker
381c9009fb Doc roomDirectory config section 2016-10-04 16:21:39 +01:00
David Baker
c0a4574069 For single instance, allow domain present & match 2016-10-04 15:30:46 +01:00
David Baker
de9bf4bb47 Actually use variable 2016-10-04 15:18:07 +01:00
Richard van der Hoff
c57bfccb9e Merge pull request #2406 from vector-im/dbkr/linkify_213 
Update to linkify 2.1.3
 2016-10-04 11:59:07 +01:00
David Baker
52cae92dd7 Update to linkify 2.1.3 
To pull in https://github.com/SoapBox/linkifyjs/pull/166
 2016-10-04 11:28:28 +01:00
David Baker
b80b08f04f Specify width on icons & comment 2016-10-04 11:14:36 +01:00
David Baker
304e5b997a PR Freedback 2016-10-04 11:04:01 +01:00
David Baker
6b4dbfbd62 Change default brand to Riot 
& update sample config
 2016-10-04 10:23:38 +01:00
David Baker
000ca35727 Don't pop up errors when this API fails for guests 2016-10-03 16:30:57 +01:00
David Baker
776fe2ad70 Different way of getting fields for 3p location 
Try to match protocol insance from 'domain' field and use its
fields for all but the last field. Assume the last takes the user
input.
 2016-10-03 13:42:55 +01:00
Aviral Dasgupta
9174b32ef1 Upgrade to babel6 and enable some presets. 2016-10-02 17:28:24 +05:30
Richard van der Hoff
602727b7ad Merge pull request #2383 from vector-im/dbkr/sign_in_not_log_in 
Use 'Sign In' / 'Sign Out' universally
 2016-09-30 11:31:15 +01:00
Richard van der Hoff
56deea9f10 Merge pull request #2382 from vector-im/dbkr/networkdropdown_size_jump 
Prevent network dropdown resizing slightly
 2016-09-30 10:59:15 +01:00
Richard van der Hoff
8e0be29c13 Merge pull request #2380 from vector-im/dbkr/roomdir_no_results 
Room directory: indicate when there are no results
 2016-09-30 10:23:23 +01:00
David Baker
b71b1b5535 Use more variables 2016-09-30 09:39:30 +01:00
Matthew Hodgson
5b3524f174 better wordwrap on RightPanels 2016-09-29 17:41:34 +01:00
David Baker
f9a70a8b04 Use 'Sign In' / 'Sign Out' universally 
Rather than a mix of 'sign in/out' and 'log in/out'
 2016-09-29 17:40:19 +01:00
David Baker
b652ea5024 Prevent network dropdown resizing slightly 
Dropdown resized by 2px when opened
 2016-09-29 16:49:44 +01:00
David Baker
2a37a0cb19 Room directory: indicate when there are no results 
Fixes https://github.com/vector-im/vector-web/issues/2250
 2016-09-29 15:45:45 +01:00
David Baker
761600f325 Add native joining of 3p networks to room dir 
Use the 3rd party location lookup API to accept third-party locations
in their native form and look up the corresponding portal room for
that location.

Also give the network dropdown some placeholder text.

Fixes https://github.com/vector-im/vector-web/issues/2374
 2016-09-29 15:30:54 +01:00
David Baker
65f14c7d21 Stop random rooms appearing when switching network 
in the public room directory
 2016-09-28 14:18:40 +01:00
David Baker
864ba52bc5 Relative img paths please 2016-09-28 12:03:35 +01:00
David Baker
fdb5020c0c Oops, fix undefined variable 2016-09-28 11:56:07 +01:00
Richard van der Hoff
62344b5194 Merge pull request #2362 from vector-im/dbkr/roomdir_filter_3pnetworks 
Room dir: New filtering & 3rd party networks
 2016-09-28 11:38:03 +01:00