Commit Graph

62959 Commits

Author SHA1 Message Date
Richard van der Hoff
16bb75be66 Merge pull request #2997 from vector-im/dbkr/carlos22_electron_tray
Add electron tray icon
2017-01-19 16:04:12 +00:00
David Baker
537194608e Make riot desktop single instance
So launching a new instance will focus the old one, meaning that
if you have Riot minimised to the tray and launch it via the
desktop shortcut / start menu, you don't end up with more & more
copies of the app.

This doesn't really prevent you from running multiple copies of
the app to fake multi account support since they share a data
directory anyway.
2017-01-19 16:01:37 +00:00
lukebarnard
789c7b60cc CSS for avatars that appear when users are typing 2017-01-19 16:51:41 +01:00
Kegan Dougal
81d437ac1e POST reports to localhost for now. Also send live console logs 2017-01-19 15:47:55 +00:00
Richard van der Hoff
61c5253dbf Give the 'Light' theme link a title too
... mostly to make it appear on the Firefox style menu.
2017-01-19 15:41:58 +00:00
Richard van der Hoff
a88f9fdd73 (hopefully) fix theming on Chrome
Jump through some hoops to make Chrome behave sensibly on non-default themes.
2017-01-19 15:36:57 +00:00
Kegan Dougal
608c1b0208 Finish implementing consume()
- Fetches all logs in order and concatenates correctly.
- Purges old logs correctly.
2017-01-19 15:03:47 +00:00
David Baker
d11bcdad5f Add electron tray icon
From https://github.com/vector-im/riot-web/pull/2960

Makes riot minimise to the tray on windows / linux.
2017-01-19 14:29:07 +00:00
Richard van der Hoff
686a3c693a Merge pull request #2994 from vector-im/dbkr/carlos22_notif_fixes
Fixes to electron desktop notifs
2017-01-19 14:03:02 +00:00
Kegsay
89fa47dc26 Merge pull request #622 from kyrias/commonmark-fix-escaping
Fix escaping markdown by rendering plaintext
2017-01-19 13:39:07 +00:00
Richard van der Hoff
1b6735d729 Configure travis to test riot-web after building 2017-01-19 13:30:22 +00:00
David Baker
bee4ca2b28 Fixes to electron desktop notifs
Merge the notification part of https://github.com/vector-im/riot-web/pull/2960

 * Show and focus the window when the notification is clicked,
   rather than just restoring it.
 * Implement requestNotificationPermission and return a resolved
   promise (although in practice it should never be called)
2017-01-19 13:25:56 +00:00
David Baker
231adbcd31 Add copyright header 2017-01-19 13:02:08 +00:00
Kegan Dougal
89d514a532 Query IndexedDB for all results with index=0 2017-01-19 12:02:19 +00:00
lukebarnard
6b1d138918 Make scrolling to bottom whilst expanded seem less weird inertially 2017-01-19 12:45:26 +01:00
David Baker
9e0c7a11d0 Merge pull request #628 from matrix-org/luke/feature-team-reg-auto-join-rooms
Implement auto-join rooms on registration
2017-01-19 11:44:37 +00:00
Richard van der Hoff
5978aff632 Merge pull request #2975 from vector-im/dbkr/auto_hide_menu_bar
Auto-hide the electron menu bar
2017-01-19 11:44:36 +00:00
David Baker
92096c40ac Merge pull request #2987 from vector-im/rav/karma_tweaks
A couple of tweaks to the karma config
2017-01-19 11:40:02 +00:00
David Baker
6c4bf58ba5 Merge pull request #2974 from vector-im/rav/deploy_script
Deploy script
2017-01-19 11:32:46 +00:00
David Baker
5f8170f4cd Merge remote-tracking branch 'origin/develop' into dbkr/add_searching_known_users 2017-01-19 11:12:49 +00:00
Johannes Löthberg
9c1c657a1e Markdown: delete remaining pre-split relics
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-19 11:55:36 +01:00
lukebarnard
e08f97a549 Reduce animation time to 200ms 2017-01-19 11:52:15 +01:00
David Baker
b58a67f6b1 Add more punctuation. Also s/let/const/ 2017-01-19 10:51:43 +00:00
Richard van der Hoff
fdc213cbb8 Megolm export: fix test 2017-01-19 10:44:01 +00:00
Richard van der Hoff
8b60cb9df0 Megolm export: Clear bit 63 of the salt 2017-01-19 10:43:41 +00:00
David Baker
242f5e0301 PR feedback
* Doc & properly indent escapeRegExp
 * Add close bracket to the list of punctuation chars we search after
2017-01-19 10:24:21 +00:00
lukebarnard
e9eb38fd74 Update propTypes and do null checks 2017-01-19 11:05:08 +01:00
lukebarnard
e06dd6e34a Implement auto-join rooms on registration
Also: This fixes registration with a team: only the email localpart was being used to register.

When a registration is successful, the user will be joined to rooms specified in the config.json teamsConfig:

"teamsConfig" : {
  "supportEmail": "support@riot.im",
  "teams": [
    {
      "name" : "matrix",
      "emailSuffix" : "matrix.org",
      "rooms" : [
        {
          "id" : "#irc_matrix:matrix.org",
          "autoJoin" : true
        }
      ]
    }
  ]
}

autoJoin can of course be set to false if the room should only be displayed on the (forthcoming) welcome page for each team, and not auto-joined.
2017-01-19 10:56:04 +01:00
Richard van der Hoff
971314d75a Merge pull request #2990 from vector-im/rav/postcss-webpack-loader
Use the postcss-webpack-loader
2017-01-19 03:01:53 +00:00
Richard van der Hoff
c3fa6ff805 Use the postcss-webpack-loader
Use postcss-webpack-loader instead of webpack-cli to process the scss. Doing so
mostly means that we avoid the problem that webpack-dev-server fails to start
if we haven't already built the CSS. (It also simplifies package.json somewhat,
which is no bad thing)
2017-01-19 02:48:17 +00:00
Richard van der Hoff
d1fbbf90c0 Verify PGP signatures on tarballs when deploying 2017-01-18 22:58:04 +00:00
Matthew Hodgson
c5032ba1bc Update theming.md 2017-01-18 22:46:12 +00:00
Matthew Hodgson
128db1a679 Merge pull request #627 from matrix-org/matthew/fix-theme-npe
Matthew/fix theme npe
2017-01-18 22:11:07 +00:00
Richard van der Hoff
237f4df08e A couple of tweaks to the karma config
* allow the imgs to be served from the karma server to avoid 404s
* Use the source-map-loader for js
2017-01-18 21:42:14 +00:00
Matthew Hodgson
4e5689082d correctly load synced themes without NPE 2017-01-18 20:06:54 +00:00
Matthew Hodgson
4df968ecdf fix css snafu 2017-01-18 20:06:44 +00:00
Matthew Hodgson
5b95986705 fix various SCSS snafus 2017-01-18 20:05:18 +00:00
Johannes Löthberg
14ead373e2 Add markdown test-cases
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-18 20:54:34 +01:00
Matthew Hodgson
ec1a2f6abf fix CSS regression in searchbox 2017-01-18 19:29:53 +00:00
David Baker
7b7728c93a Make behaviour of ChatInviteDialog more consistent
* Pressing enter now always adds whatever was in the input box
   to the invite list, if it's a valid address (previously it
   added it to the list of it was a search result but submitted
   the form straight away if there were no results).
 * Remove isValidAddress as it was only used in the context of
   testing whether its return value was true or null (where null
   meant "unsure") so just use getAddressType instead.
2017-01-18 18:32:38 +00:00
Johannes Löthberg
30bd01cdf2 Markdown: Split up render function into toHTML/toPlaintext
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-18 19:29:11 +01:00
David Baker
f105ec2794 Attempt to sanitize ChatInviteDialog a bit
* Use binds rather than onFoo functions which aren't actually
   handler functions themselves but return them
 * Rename onKeyUp to moveSelectionDown etc,, reserving onKeyUp
   for "a key has been released" rather than, "the up arrow key
   has been pressed"
2017-01-18 17:51:39 +00:00
Kegan Dougal
811086ac8e Comment how we should consume logs 2017-01-18 17:18:02 +00:00
Matthew Hodgson
f20efc57f3 simple doc about theming 2017-01-18 17:05:13 +00:00
Matthew Hodgson
c0e5a1ba3b Merge pull request #2973 from vector-im/matthew/postcss
Switch CSS to using postcss, and implement a dark theme.
2017-01-18 16:46:53 +00:00
Matthew Hodgson
4d7ed9a58f Merge pull request #624 from matrix-org/matthew/postcss
Implement theming via alternate stylesheets
2017-01-18 16:46:37 +00:00
Matthew Hodgson
fc63067237 improve commentary 2017-01-18 16:36:27 +00:00
Kegan Dougal
5828ab1077 Generate unique IDs for each JS runtime to accomodate multiple tabs 2017-01-18 16:27:11 +00:00
Matthew Hodgson
acb85b7b72 f1x0r CSS comment 2017-01-18 16:06:02 +00:00
Kegan Dougal
e9884768f6 Persist console logs to an IndexedDB instance 2017-01-18 16:00:13 +00:00