mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity
2709 commits 185 branches 531 tags 233 MiB
Commit graph

2709 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Hodgson
fa535996ae fix textarea bg 2017-01-20 02:22:11 +00:00
Matthew Hodgson
17e215036d Merge pull request #3002 from vector-im/rav/fix_eventmenu_icon 
Fix link to image for event options menu
 2017-01-19 18:48:52 +00:00
Richard van der Hoff
8ad0ff24f8 Fix link to image for event options menu 
This has to be relative, because we don't know if riot is going to be mounted
at the top-level of the domain or not (it's not, on riot.im).

Links are relative to the final location of the CSS, which is under
bundles/<hash>, so need ../..
 2017-01-19 18:35:43 +00:00
Richard van der Hoff
693285ac0e Merge pull request #2999 from vector-im/dbkr/carlos22_single_instance 
Make riot desktop single instance
 2017-01-19 18:04:09 +00:00
Richard van der Hoff
36450764f3 rethemendex fixes 
- set cwd before doing cwd-specific operations
- don't include 'themes' directory, otherwise it's a bit circular.
 2017-01-19 17:02:57 +00:00
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
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
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
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
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
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
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
5b95986705 fix various SCSS snafus 2017-01-18 20:05:18 +00:00
Matthew Hodgson
ec1a2f6abf fix CSS regression in searchbox 2017-01-18 19:29:53 +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
acb85b7b72 f1x0r CSS comment 2017-01-18 16:06:02 +00:00
Matthew Hodgson
708fd640f7 unbreak switching after vdh's webpack changes 2017-01-18 14:06:20 +00:00
Matthew Hodgson
14eec6d982 Merge branch 'develop' into matthew/postcss 2017-01-18 12:44:42 +00:00
Matthew Hodgson
69bedf0d37 review feedback 2017-01-18 12:42:48 +00:00
David Baker
83145e80e5 Auto-hide the electron menu bar 
From https://github.com/vector-im/riot-web/issues/2962

This allows all the shortcuts to still work, and the menu bar can
be un-hidden with the alt key.
 2017-01-18 10:39:59 +00:00
Richard van der Hoff
5206410f21 Deployment script 
Factor some bits out of redeploy.py, so that they can be used in a deployment
script suitable for riot.im/app.
 2017-01-17 22:43:23 +00:00
Matthew Hodgson
0cd895b417 kill the moofle 2017-01-17 19:19:30 +00:00
Matthew Hodgson
6c88201e23 use ye olde rel='alternate stylesheets' for theming 2017-01-17 19:14:16 +00:00
Richard van der Hoff
641a5c244c Merge pull request #2969 from vector-im/rav/keep_old_bundles 
Update redeploy script to keep old bundles
 2017-01-17 14:59:12 +00:00
David Baker
6257019926 Merge pull request #2967 from vector-im/dbkr/include_version_in_update_check 
Include current version in update check explicitly
 2017-01-17 14:42:03 +00:00
Matthew Hodgson
c9c58ab0ec fix up the contextual menu button 2017-01-17 14:10:09 +00:00
David Baker
cf92e7f64b Clarify comment 2017-01-17 14:04:42 +00:00
Richard van der Hoff
8371006d90 Update redeploy script to keep old bundles 
... so that people using old versions of the master chunk can still load other
webpack chunks.
 2017-01-17 13:55:33 +00:00
David Baker
3b109f7612 Include current version in update check explicitly 
Hopefully fix https://github.com/vector-im/riot-web/issues/2847
 2017-01-17 13:16:08 +00:00
David Baker
ebc2ad54d6 Merge pull request #2966 from vector-im/rav/move_bundle_again 
Add another layer of directory to webpack chunks
 2017-01-17 12:04:28 +00:00
Richard van der Hoff
4a1b04e57b Add another layer of directory to webpack chunks 2017-01-17 12:00:20 +00:00
David Baker
205676a97d Back to develop js-sdk & react-sdk 2017-01-17 11:30:59 +00:00
David Baker
0456cadff6 Merge branch 'master' into develop 2017-01-17 11:30:31 +00:00
Richard van der Hoff
aa6d584ae3 Merge pull request #2965 from vector-im/rav/fix_font_links 
Fix links to fonts and images from CSS
 2017-01-17 11:00:27 +00:00
Richard van der Hoff
ef07a6035e Fix links to fonts and images from CSS 
https://github.com/vector-im/riot-web/pull/2961 put the CSS in a subdirectory,
which meant that links from CSS to images and fonts were broken. Fix them up.
 2017-01-17 10:48:38 +00:00
David Baker
86b66120d0 Merge pull request #2961 from vector-im/rav/build_hash_in_filename 
Put parent build hash in webpack output filenames
 2017-01-17 09:58:27 +00:00
Matthew Hodgson
3bdb330f5b cheeky hack to get the ctxt menu colors right 2017-01-17 09:57:01 +00:00
Matthew Hodgson
4f8d3b0e2b more factoring 2017-01-17 02:00:34 +00:00
Matthew Hodgson
87fd136e21 factor out remaining # colours 2017-01-16 23:13:47 +00:00
Matthew Hodgson
cab5bf8849 fix a lone lost opera vendor prefix 2017-01-16 19:00:44 +00:00
Matthew Hodgson
d74dfc9ee7 strip out unneeded -ms- prefixes 2017-01-16 18:58:37 +00:00