OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,260 Commits
217 Branches
561 Tags
468 MiB
Commit Graph

3260 Commits (be869a8ac63d3f89955f33fe616bf69d0b2201d2)

Author SHA1 Message Date
Luke Barnard be869a8ac6 Add referral section to user settings (#661) 
This allows those who have registered to referrer other students to Riot and have their referral counted for the campaign competition. Also allows the base referral URL to be configurable (i.e. for Electron app, etc.) and be default this is `window.location.origin`.
 2017-01-31 15:55:42 +00:00
Luke Barnard c261ca1f5e Allow base referral URL to be configurable 2017-01-31 15:17:43 +00:00
Luke Barnard c2b0c603c0 Add referral section to user settings 
This allows those who have registered to referrer other students to Riot and have their referral counted for the campaign competition.
 2017-01-31 13:17:01 +00:00
Richard van der Hoff 91d33e3cc4 Merge pull request #660 from matrix-org/rav/megolm_export_fixes 
Two megolm export fixes:
 2017-01-31 13:13:20 +00:00
Richard van der Hoff c5f447260a Megolm import: Fix handling of short files 
Make sure we throw a sensible error when the body of the data is too short.
 2017-01-31 12:30:30 +00:00
Richard van der Hoff 62c8c20268 Megolm export: fix Android incompatibility 
I'd carefully added a workaround to maintain compatibility with the Android
AES-CTR implementation... to the wrong thing.
 2017-01-31 12:29:16 +00:00
Luke Barnard 878e5593ba Implement tracking of referrals (#659) 
* Implement tracking of referrals

This also modifies (or fixes) auto-joining.
 2017-01-31 11:13:05 +00:00
David Baker 9c99e78099 Merge pull request #658 from matrix-org/luke/rts-get-teams 
GET /teams from RTS instead of config.json
 2017-01-30 16:45:19 +00:00
Luke Barnard 4e9229e936 Get rid of dupl. declaration 2017-01-30 16:37:16 +00:00
Luke Barnard 1e279d2335 Finish with .done() 2017-01-30 16:35:34 +00:00
Luke Barnard f5efc8e765 Use const, not var 2017-01-30 16:33:16 +00:00
Luke Barnard eb4d7f04e7 Use busy spinner when requesting teams 2017-01-30 16:23:52 +00:00
Luke Barnard 318d871097 Formatting 2017-01-30 16:13:57 +00:00
Luke Barnard 4e0889454a GET /teams from RTS instead of config.json 
Now that the RTS contains config for teams, use GET /teams to get that information so that users will see be able to register as a team (but not yet auto-join rooms, be sent to welcome page or be tracked as a referral).
 2017-01-30 15:50:31 +00:00
David Baker f5458d34aa Fix inviting import fail 2017-01-27 21:57:34 +00:00
Luke Barnard d9a8acd431 Redo team-based registration (#657) 
For compatibility with referral campaign flows, re-implement team registration such that the team is selected through providing an email with a known team domain. The support email is now only shown when an email that _looks_ like a UK/US university email address, but is not known.
 2017-01-27 16:31:36 +00:00
Luke Barnard f462bd8f99 Expand status *area* unless status *bar* not visible (#655) 2017-01-26 18:07:42 +00:00
David Baker 853d94e2d4 Merge pull request #656 from matrix-org/luke/fix-setState-warnings-from-RoomView 
Guard onStatusBarVisible/Hidden with this.unmounted
 2017-01-26 18:06:41 +00:00
Luke Barnard 9c99dafba5 Guard onStatusBarVisible/Hidden with this.unmounted 2017-01-26 17:03:01 +00:00
David Baker f06de1f129 Merge pull request #654 from matrix-org/rav/fix_e2e_dialog_cancel 
Fix cancel button on e2e import/export dialogs
 2017-01-26 11:41:30 +00:00
David Baker e2edecc55b Merge pull request #653 from matrix-org/dbkr/invite_look_up_emails 
Look up email addresses in ChatInviteDialog
 2017-01-26 11:35:06 +00:00
David Baker c42b705497 Use a cancel function 
rather than checking queryList each time
 2017-01-26 10:54:07 +00:00
David Baker 23a25e550d Missed a `function` 2017-01-26 10:09:33 +00:00
David Baker bf66f77acb Set state in _lookupThreepid 2017-01-26 10:08:44 +00:00
Richard van der Hoff 81d95ecea0 Fix cancel button on e2e import/export dialogs 
Make sure that we preventDefault on the cancel button.

Fixes https://github.com/vector-im/riot-web/issues/3066
 2017-01-25 22:15:09 +00:00
David Baker e1e87807b5 Look up email addresses in ChatInviteDialog 
So email addresses known to the IS get a display name & avatar
 2017-01-25 18:51:28 +00:00
Kegsay c3616fd208 Merge pull request #652 from matrix-org/kegan/rageshake-glue 
Move BugReportDialog to riot-web
 2017-01-25 17:20:43 +00:00
David Baker 12642bdf2b Merge pull request #651 from matrix-org/rav/roomheader_theming_fix 
Fix dark theme styling of roomheader cancel button
 2017-01-25 17:02:07 +00:00
David Baker 8a5e19f64f Merge pull request #649 from matrix-org/rav/stack_dialogs 
Allow modals to stack up
 2017-01-25 16:45:50 +00:00
Kegan Dougal e9de34ec40 We no longer supply a BugReportDialog 2017-01-25 16:35:16 +00:00
Richard van der Hoff 5099f07562 Fix dark theme styling of roomheader cancel button 2017-01-25 16:33:29 +00:00
Kegan Dougal bea6df88e0 Move BugReportDialog to riot-web 2017-01-25 16:33:00 +00:00
Richard van der Hoff 55dc2e0161 Factor out common CancelButton 2017-01-25 16:32:06 +00:00
Kegsay e5fde759e6 Merge pull request #642 from matrix-org/kegan/rageshake-ui 
Add bug report UI
 2017-01-25 16:03:22 +00:00
David Baker a3b938427d Merge pull request #625 from matrix-org/dbkr/user_search_feedback 
Better feedback in invite dialog
 2017-01-25 15:59:47 +00:00
Kegan Dougal 602ce37ba7 Merge branch 'develop' into kegan/rageshake-ui 2017-01-25 15:52:00 +00:00
Richard van der Hoff dc7a169779 Merge pull request #647 from matrix-org/rav/megolm_backup_ui 
Import and export for Megolm session data
 2017-01-25 15:43:15 +00:00
David Baker ced1c45a34 Doc state in getinitialstate 2017-01-25 15:23:50 +00:00
Richard van der Hoff 9cadc2f55f Merge pull request #613 from matrix-org/luke/fix-join-part-collapsing-causality 
Overhaul MELS to deal with causality, kicks, etc.
 2017-01-25 15:20:30 +00:00
Richard van der Hoff ebe6cddd21 Merge remote-tracking branch 'origin/develop' into rav/megolm_backup_ui 2017-01-25 15:13:14 +00:00
Richard van der Hoff 69b55fd9d1 Merge pull request #650 from matrix-org/dbkr/fix_alt_up_down 
Re-add dispatcher as alt-up/down uses it
 2017-01-25 15:10:56 +00:00
Richard van der Hoff 7343ef968e Merge pull request #645 from matrix-org/rav/base_dialog 
Create a common BaseDialog
 2017-01-25 15:09:34 +00:00
David Baker e9804086ca Point to InviteAddressType 2017-01-25 15:03:01 +00:00
Richard van der Hoff adf8f50f6e Merge remote-tracking branch 'origin/develop' into rav/base_dialog 2017-01-25 15:01:11 +00:00
David Baker b34f63d3e7 Re-add dispatcher as alt-up/down uses it 
Alt-up/down still doesn't go through rooms in the right order,
but it should probably not error.
 2017-01-25 14:59:18 +00:00
David Baker fd8d5af63a Fix import of InviteAddressType 
and rewrite to import while we're at it
 2017-01-25 14:54:21 +00:00
David Baker 9020a7515c Correctly bail out on unknown address 2017-01-25 14:50:00 +00:00
Kegan Dougal b00e090600 Do not show the bug report section if there is no bug_report_endpoint_url 2017-01-25 14:43:47 +00:00
David Baker e567162d28 Merge pull request #648 from matrix-org/rav/fix_set_displayname 
Fix SetDisplayNameDialog
 2017-01-25 14:32:52 +00:00
Luke Barnard f9ca2a8e59 Fix _renderCommaSeparatedList 2017-01-25 11:28:12 +00:00