mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-23 01:35:49 +03:00
Code Issues Projects Releases Packages Wiki Activity
3240 commits 203 branches 553 tags 406 MiB
Commit graph

3240 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard van der Hoff
a39a7c8334 Update to more recent mock-request 
Just copy-and-paste the updated version from js-sdk in here.
 2017-05-18 12:18:57 +01:00
Luke Barnard
b290a28123 Merge pull request #3952 from vector-im/dbkr/electron_copy_link_location 
Desktop: 'copy link address'
 2017-05-18 11:49:41 +01:00
David Baker
16899d3b1f Bump electron version to 1.6.8 2017-05-18 11:38:03 +01:00
David Baker
dfb30e91de Desktop: 'copy link address' 
Add 'copy link address' to link context menu in electron app
 2017-05-18 11:32:10 +01:00
Richard van der Hoff
ca3921f3a0 Merge pull request #3943 from vector-im/rav/reduce_rageshake_size 
Reduce rageshake log size to 1MB
 2017-05-17 15:59:10 +01:00
Richard van der Hoff
15ab1732a2 Reduce rageshake log size to 1MB 
... 50MB turned out to be quite a lot.
 2017-05-17 14:46:06 +01:00
Luke Barnard
338ab4d046 Merge pull request #3942 from vector-im/luke/improve-country-dd-2 
CSS for putting country dd on same line as phone input
 2017-05-17 14:29:48 +01:00
Luke Barnard
089740a840 CSS for putting country dd on same line as phone input 
(For login and registration)
 2017-05-17 14:25:43 +01:00
David Baker
7ea0ecd125 Merge branch 'new_release_process_stable' into develop 
This reverts PRs on riot-web marked as notready, turning the develop
branch into a more stable version.
 2017-05-17 10:43:02 +01:00
David Baker
9fc9de3af5 Revert "Merge pull request #3654 from vector-im/matthew/quick-search" 
This reverts commit 8f20fcfa6b, reversing
changes made to 751f715e77.
 2017-05-16 17:21:49 +01:00
David Baker
844ea390c8 Revert "clear the searchbox after quick-search" 
This reverts commit ddd12edc06.
 2017-05-16 17:13:55 +01:00
David Baker
fdf326c9f0 Revert "Cancel quick-search on Escape, clearing it and returning focus to composer." 
This reverts commit 52a119244b.
 2017-05-16 17:13:39 +01:00
David Baker
9399b7ddf0 Revert "fix incoming call box" 
This reverts commit b3431bb750.
 2017-05-16 16:35:17 +01:00
David Baker
03476705b1 Revert "better solution to incomingcallbox weirdness" 
This reverts commit be52787473.
 2017-05-16 16:35:06 +01:00
David Baker
3cead032c2 Revert "Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2" 
This reverts commit e6133820a2, reversing
changes made to d1db602b3a.
 2017-05-16 16:27:58 +01:00
Matthew Hodgson
c8ac60768d Merge pull request #3919 from vector-im/t3chguy/patch-1 
fix #3894
 2017-05-15 21:15:03 +01:00
Michael Telatynski
cef26a5b20 fix #3894 2017-05-15 21:14:01 +01:00
Matthew Hodgson
fe61a7eefd fix off-by-one pixel errors in login field heights - fixes https://github.com/vector-im/riot-web/issues/3738 2017-05-15 02:32:25 +01:00
Matthew Hodgson
582a34c937 cursor pointer for avatar upload in user settings 2017-05-15 02:24:34 +01:00
Matthew Hodgson
5181eb3ea5 Merge pull request #3894 from vector-im/t3chguy/change_release_vector2riot 
change vector->riot on the surface
 2017-05-15 01:43:57 +01:00
Matthew Hodgson
c3477a30a7 oops, rebuild modernizr to pull in new tests 2017-05-15 01:22:32 +01:00
Matthew Hodgson
8e2e6cee35 require indexeddb & webworkers in modernizr 2017-05-15 01:07:25 +01:00
Matthew Hodgson
25a727b8d8 use full date formats on timestamps - fixes https://github.com/vector-im/riot-web/issues/3874 2017-05-15 00:26:02 +01:00
Michael Telatynski
ea0b166da7 change wording to not confuse users building repo 
change default repos to match their current naming

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-11 17:49:31 +01:00
Michael Telatynski
f248477f82 stage 0.5 rebrand (rename dist release) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-11 17:46:08 +01:00
Luke Barnard
0e0918d07c Merge pull request #3888 from vector-im/pr/3799 
move manifest.json outward so it is scoped properly
 2017-05-11 13:20:33 +01:00
Michael Telatynski
3c5594e034 move manifest.json outward so it is scoped properly 
this will matter more when we add a service worker

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-11 13:12:26 +01:00
Luke Barnard
15db686f33 Merge pull request #3799 from t3chguy/manifest 
add to manifest
 2017-05-11 13:05:00 +01:00
Michael Telatynski
ffa53ca205 Update manifest.json 2017-05-11 11:17:55 +01:00
Luke Barnard
4c0e8cd372 Merge pull request #3886 from vector-im/luke/auto-reskindex 
Automatically update component-index
 2017-05-11 10:47:06 +01:00
Luke Barnard
6d94f35c33 Automatically update component-index 
Following changes to the react-sdk, reskindex can now be updated using the "-w" (watch) equivalent of the reskindex script.

-Alter npm scripts so that reskindex is run when building once and so that reskindex:start is runwhen developing
-Remove and stop tracking component-index, this will now only be created at build-time
 2017-05-11 10:37:13 +01:00
David Baker
e67e891040 Merge pull request #3877 from vector-im/t3chguy/electron_install_fix 
move electron -> electron_app because npm smart
 2017-05-10 13:48:18 +01:00
Michael Telatynski
c607b1bc89 npm is "smart" enough to try and install our electron wrapper as a module 
instead of the actual electron package. With no way to ignore directories.
I'd like to think of this as temporary, until I get to rip apart riot-web
and riot-electron

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-10 13:36:27 +01:00
Richard van der Hoff
41738ec025 Merge pull request #3863 from vector-im/rav/bug_report_endpoint 
Fix bug report endpoint in config.sample.json.
 2017-05-09 12:34:40 +01:00
Richard van der Hoff
f9ae456a64 Fix bug report endpoint in config.sample.json. 
Not sure why this was like this - has vector.im/bugs *ever* worked?
 2017-05-09 12:27:41 +01:00
David Baker
2983b36d4c Merge pull request #3851 from vector-im/dbkr/missed_icons 
Update 2 missed icons to the new icon
 2017-05-08 13:12:00 +01:00
David Baker
640aa98cf4 Update 2 missed icons to the new icon 
Electron icons for windows & Linux. Also add them to the script
that makes all the icon versions.
 2017-05-08 13:05:17 +01:00
David Baker
e6133820a2 Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2 
Make left panel better for new users (mk II)
 2017-05-08 10:37:59 +01:00
Matthew Hodgson
d1db602b3a Merge pull request #3839 from vector-im/t3chguy/patch-1 
match primary package.json
 2017-05-07 20:34:18 +01:00
Michael Telatynski
ea72e9c7a0 match primary package.json 
got mismatched after a release -> develop merge
 2017-05-07 20:33:13 +01:00
Matthew Hodgson
8e94d5240f merge master into develop post 0.9.9 2017-05-07 19:58:42 +01:00
Matthew Hodgson
1e5908a31e speed up burndown generation by ~250x 2017-05-07 19:34:16 +01:00
David Baker
40c98fc84f Merge pull request #3829 from vector-im/t3chguy/productName-missing 
Re-add productName
 2017-05-06 12:20:30 +01:00
Michael Telatynski
9c6b3819a5 Re-add productName 
so that electron-builder packages is as Riot rather than riot-web
 2017-05-06 10:24:13 +01:00
David Baker
6013a3e71d Merge pull request #3683 from t3chguy/t3chguy/electron_version_inconsistency 
Remove leading v in /version file, for SemVer and to match Electron ver
 2017-05-05 18:28:16 +01:00
David Baker
0deed1b511 Merge pull request #3790 from t3chguy/patch-2 
Fix scope of callback
 2017-05-05 18:25:29 +01:00
David Baker
2c36506342 Merge pull request #3622 from t3chguy/t3chguy/electron-persist-window-layout 
Remember and Recall window layout/position state
 2017-05-05 18:23:15 +01:00
Michael Telatynski
309afdb813 no point installing deps here, builder will do it for us 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 17:08:50 +01:00
Michael Telatynski
1ed1080bf3 Update README with npm run electron 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 17:05:03 +01:00
Michael Telatynski
a09f890619 Merge package.json, match version in electron/package.json 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 17:03:28 +01:00