OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
6,022 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

6022 Commits (ddc20e2a60226d4dada594bfd41e24134b990dde)

Author SHA1 Message Date
Matthew Hodgson ddc20e2a60
Merge pull request #6500 from vector-im/matthew/fix_layering 
move everything not explicitly riot (or status) branded into matrix-react-sdk
 2018-04-18 16:30:57 +01:00
Matthew Hodgson 104a4150ae PR feedback; fix staticness and add ;s 2018-04-18 16:20:42 +01:00
Matthew Hodgson e046a72750 flesh out status todo comment 2018-04-18 16:20:32 +01:00
Matthew Hodgson df3fb83da3 move deps to sdk for stuff now in the sdk 2018-04-18 10:53:17 +01:00
Matthew Hodgson 7ee534388b convert VectorHomePage into ES6 and have it nicely override HomePage 2018-04-18 10:20:35 +01:00
Matthew Hodgson c8b26a1002 fix tests 2018-04-16 00:23:34 +01:00
Matthew Hodgson 5c341154b7 fix theming during tests correctly 2018-04-16 00:19:08 +01:00
Matthew Hodgson 8684fae473 kill theming 404s when UTing 2018-04-16 00:14:09 +01:00
Matthew Hodgson 7c1eafd050 merge develop 2018-04-15 23:55:09 +01:00
Matthew Hodgson 0243ec0096 switch karma image loc 2018-04-15 23:52:52 +01:00
Matthew Hodgson ce36dec767 run prune-i18n to bring translations inline now most are moved to react-sdk 2018-04-15 23:22:26 +01:00
Matthew Hodgson b8d4866824 run gen-i18n to refresh translations now most are moved to react-sdk 2018-04-15 23:22:06 +01:00
Matthew Hodgson a46b718b4a copy resources from their new locations 2018-04-13 01:49:52 +01:00
Matthew Hodgson d6931252c1 move rageshake to sdk 2018-04-13 01:35:55 +01:00
Matthew Hodgson aefb782892 move conference handler to matrix-react-sdk 2018-04-13 01:25:08 +01:00
Matthew Hodgson 3d20a64502 export enum via method for convenience from matrix-react-sdk 2018-04-13 01:25:00 +01:00
Matthew Hodgson be34c84704 fix theme paths 2018-04-13 00:57:48 +01:00
Matthew Hodgson 534155fcd5 point to new CSS locations 2018-04-13 00:43:15 +01:00
Matthew Hodgson f569fddf15 make VectorHomePage override HomePage 2018-04-13 00:42:58 +01:00
Matthew Hodgson 41d6995da4 fix braindead typo 2018-04-12 21:59:55 +01:00
Matthew Hodgson 8757c8cae0 move notif UTs to sdk 2018-04-12 20:24:44 +01:00
Matthew Hodgson e899fece3c move themes to res to match sdk 2018-04-12 20:21:26 +01:00
David Baker c8a3471135 Merge branch 'master' into develop 2018-04-12 13:07:09 +01:00
David Baker 740b221769 v0.14.1 2018-04-12 13:02:27 +01:00
David Baker e455453bcd Prepare changelog for v0.14.1 2018-04-12 13:02:26 +01:00
David Baker 7a2866feb9 v0.14.1 2018-04-12 12:59:27 +01:00
David Baker c631858ab3 Bump js-sdk & react-sdk 2018-04-12 12:57:04 +01:00
Travis Ralston 8dd616462a Revert "Merge pull request #5286 from turt2live/travis/presence" 
This reverts commit 3e72d8d969.
 2018-04-12 12:56:23 +01:00
Matthew Hodgson 976c818406
Merge pull request #5881 from turt2live/travis/remove-presence 
Remove presence management
 2018-04-12 11:46:26 +01:00
Matthew Hodgson 3ecbfae371 move everything not explicitly riot (or status) branded into matrix-react-sdk 2018-04-11 23:49:52 +01:00
Travis Ralston 5845a1ec7a Merge branch 'develop' into travis/remove-presence 2018-04-11 15:18:30 -06:00
Luke Barnard 8644a5ead9 Merge branch 'master' into develop 2018-04-11 12:04:58 +01:00
Luke Barnard eaeb495349 v0.14.0 2018-04-11 12:01:45 +01:00
Luke Barnard 1b602495b1 Prepare changelog for v0.14.0 2018-04-11 12:01:44 +01:00
Luke Barnard b2a0031fe1 v0.14.0 2018-04-11 11:57:33 +01:00
Luke Barnard 5fc37032ad Bump js-sdk to 0.10.0, react-sdk to 0.12.1 2018-04-11 11:42:56 +01:00
Matthew Hodgson 65a500c047 remove spurious opacity from createGroupButton and rename it to not be a total misnomer... 2018-04-11 10:22:14 +01:00
Luke Barnard b7aa0db66d
Merge pull request #6480 from NotAFile/NotAFile-patch-1 
change vector-web repo to riot-web in changelog
 2018-04-10 17:00:08 +01:00
NotAFile 7262291dda
change vector-web repo to riot-web in changelog 
closes #6479

Signed-off-by: Adrian Tschira <nota@notafile.com>
 2018-04-10 15:57:16 +02:00
Luke Barnard 08da6b6185 Move membershipBusy spinner next to leave/join group button 2018-04-10 13:54:39 +01:00
Luke Barnard b751c74374 Move membershipBusy spinner next to leave/join group button 2018-04-10 13:53:00 +01:00
Matthew Hodgson df5ffb5a6d remove spurious opacity from createGroupButton and rename it to not be a total misnomer... 2018-04-09 22:59:28 +01:00
Luke Barnard 74454567bc v0.14.0-rc.6 2018-04-09 17:16:37 +01:00
Luke Barnard c87f06100b Prepare changelog for v0.14.0-rc.6 2018-04-09 17:16:37 +01:00
Luke Barnard da988c85e4 v0.14.0-rc.6 2018-04-09 17:13:11 +01:00
Luke Barnard 8eaabceb0c Bump react version number 2018-04-09 17:09:11 +01:00
Luke Barnard ec2adc4516 v0.14.0-rc.5 2018-04-09 15:46:35 +01:00
Luke Barnard b58e85c5cb Prepare changelog for v0.14.0-rc.5 2018-04-09 15:46:34 +01:00
Luke Barnard 233c3d2c98 v0.14.0-rc.5 2018-04-09 15:43:22 +01:00
Luke Barnard 60079d4206 Bump matrix-js-sdk, matrix-react-sdk versions 2018-04-09 15:36:43 +01:00