gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,298 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

3298 Commits

Author SHA1 Message Date
David Baker 18afbc5bec Make dep install script work 2017-05-17 18:14:28 +01:00
David Baker 60d33f50a7 Create node_modules if it doesn't exist 2017-05-17 16:19:19 +01:00
David Baker 94ac4bf490 Use fetch dep script in jenkins script 2017-05-17 16:17:08 +01:00
David Baker fac8906102 Add script to fetch correct dep branches 
Fetch branches of js-sdk and react-sdk that match the current
branch name, if they exist. This will mostly be used in the
automated tests.
 2017-05-17 16:11:34 +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
Michael Telatynski 9352e5d78e Lets make it abundantly clear that we want attention. FLASH FLASH FLASH 
also improve favicon updating to not change if we're same as previous
not sure how intensive the nativeImage stuff is but cheap efficiency

For FLASH FLASH I moved the setBadgeCount stuff RPC -> IPC
should be more reliable now, its in electron-main
Win only:
if mainWindow is set and is not in focus make it FLASH
clear flash if notification gets cleared elsewhere
debounce focus handler so we don't set a million of them
if the app is backgrounded a while

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-17 10:39:43 +01:00
Michael Telatynski 826a571b60 apply same image to the window/taskbar too; as per request 
LETS MAKE IT CLEAR WE ARE NEEDY AND WANT ATTENTION

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-17 10:05:50 +01:00
Michael Telatynski 39b6c7c65d ignore electron_app subdirs properly, missed these too :L 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-17 09:53:33 +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 aa7728cad3 tidy up tray.js - it made my eyes hurt 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-13 12:41:13 +01:00
Michael Telatynski 808240eef9 shouldn't need this try-catch 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-13 12:40:17 +01:00
Michael Telatynski 6aae97b812 Update tray tooltip based on document.title 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-13 12:39:55 +01:00
Michael Telatynski 8927afca03 re-add electron node modules to gitignore 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-13 12:37:27 +01:00
Michael Telatynski bbda658b7f make Electron tray icon mimic the Favico.js one 
DRY: moved Favicon stuff into the base platform

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-13 12:37:13 +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