Commit graph

40876 commits

Author SHA1 Message Date
Aviral Dasgupta
001011df27 Initial version of rich text editor 2016-05-27 10:15:55 +05:30
David Baker
1664f46180 Add comment 2016-05-26 16:30:04 +01:00
David Baker
3a5e37aa84 This actually shouldn't be necessary. 2016-05-26 16:22:40 +01:00
David Baker
ed835752bc Hopefully fix memory leak with velocity 2016-05-26 13:51:51 +01:00
Jason Papakostas
6a6118e136 serve config.json statically instead of bundling it
issue #1344
2016-05-24 19:08:09 -05:00
Matthew Hodgson
07cc9bf77d how ironic 2016-05-24 11:44:30 +01:00
Matthew Hodgson
39a3d6fdd4 multiple URL preview support 2016-05-24 00:54:20 +01:00
Matthew Hodgson
bede9a814b remove spurious top border; fix #1472 2016-05-24 00:30:36 +01:00
Matthew Hodgson
d70842c3c7 fix padding of badges 2016-05-24 00:29:48 +01:00
Matthew Hodgson
a288c5b85d fix padding of badges 2016-05-20 12:21:45 +01:00
Matthew Hodgson
5835948a3d ignore @ prefixes when sorting memberlist 2016-05-19 23:00:28 +01:00
Matthew Hodgson
c38c57df1e put integrations manager into a modal 2016-05-19 14:12:08 +01:00
Matthew Hodgson
c4d408d095 CSS for IntegrationsManager 2016-05-18 17:02:39 +01:00
Matthew Hodgson
ac24d6707f Add integs mgt 2016-05-18 15:02:03 +01:00
Matthew Hodgson
e5835d2731 typo 2016-05-18 15:01:36 +01:00
Matthew Hodgson
817a3debec debug HS & IS 2016-05-18 11:42:51 +01:00
Matthew Hodgson
1459478ee0 use right check for end of timeline
and avoid bad interactions with forward pagination. thanks @richvdh
2016-05-17 21:32:20 +01:00
Matthew Hodgson
be5f29d03b Merge branch 'develop' into dbkr/scalar 2016-05-17 20:37:16 +01:00
Matthew Hodgson
24adf2847e better comment 2016-05-17 20:32:38 +01:00
Matthew Hodgson
7879be1704 implement basic local echo for resetting unread message count when opening a room without a scroll offset. hopefully largely fixes https://github.com/vector-im/vector-web/issues/967 2016-05-17 20:28:11 +01:00
Matthew Hodgson
d8c32db14b typos 2016-05-17 20:24:01 +01:00
Matthew Hodgson
2b3606d44d switch to lozenges, and improve overlap behaviour 2016-05-17 19:52:56 +01:00
Matthew Hodgson
5feb31911a better collapsed look & feel 2016-05-17 11:19:04 +01:00
Matthew Hodgson
9483e42508 switch from dots to per-room badges 2016-05-17 11:14:30 +01:00
Matthew Hodgson
fd09d5c570 switch badge count to per-conversation, and add per-room badges 2016-05-17 11:14:12 +01:00
David Baker
ffe892b4b1 Merge remote-tracking branch 'origin/develop' into dbkr/scalar 2016-05-17 10:30:32 +01:00
Matthew Hodgson
e640f65640 add close button to room search filter 2016-05-16 23:36:52 +01:00
Matthew Hodgson
8a9c85c97d fix wording 2016-05-16 23:00:17 +01:00
Kegan Dougal
bc166f19b7 Fix NPE when loading the Settings page which infini-spinnered 2016-05-16 16:04:06 +01:00
Matthew Hodgson
8fb521c83c 302 android to play store 2016-05-13 17:14:01 +01:00
Matthew Hodgson
5bde32f7fe handle slashcommands with no args 2016-05-13 17:07:50 +01:00
Matthew Hodgson
d9077584cd Merge branch 'dbkr/email_notifs' into develop 2016-05-13 15:16:35 +01:00
Matthew Hodgson
8467d5d760 302 to iTunes if you don't have the app installed 2016-05-11 01:48:02 +02:00
Matthew Hodgson
9cd8f7c7f3 Merge pull request #1469 from vector-im/dbkr/email_notifs
Add option to enable email notifications
2016-05-10 16:39:50 +02:00
Matthew Hodgson
62a1100fca Merge pull request #289 from matrix-org/dbkr/email_notifs
Support for enabling email notifications
2016-05-10 16:39:37 +02:00
David Baker
75979786fc Call it scalar_token for consistency 2016-05-06 15:06:23 +01:00
David Baker
bb9316edfa Pass the room id to scalar 2016-05-06 14:42:00 +01:00
David Baker
6da4b9d671 Add suport for showing the scalar UI 2016-05-06 14:19:56 +01:00
Matthew Hodgson
b86af8939a fix usersettings cancel fail on new accounts 2016-05-05 15:30:56 +01:00
Matthew Hodgson
c64f71a3cb refine memberlist cosmetics 2016-05-05 00:35:47 +01:00
Matthew Hodgson
af9838408b s/devices/notification targets/ 2016-05-04 11:58:37 +01:00
David Baker
6dd530e2a4 Comment getEmailPusher 2016-05-04 09:41:36 +01:00
Matthew Hodgson
974a187e74 fix annoying bug where URL previews with very long lines (e.g. vector permalinks) would get clipped 2016-05-03 17:49:42 +01:00
David Baker
efe1c767f0 Un-inline onChange 2016-05-03 11:36:44 +01:00
David Baker
6a596f034f Clarify comment 2016-05-03 11:21:05 +01:00
David Baker
fab7111fd7 Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs 2016-04-29 11:09:02 +01:00
Matthew Hodgson
3cf12f8626 fix typo 2016-04-28 15:43:42 +01:00
Richard van der Hoff
ca0c697b6e Avoid rerendering during Room unmount
might speed up room changing by a few milliseconds
2016-04-22 17:06:53 +01:00
Richard van der Hoff
0fd0b0c5f3 Whitespace fixes
Fix some trailing whitespace
2016-04-22 17:05:48 +01:00
David Baker
c3365f993b Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs 2016-04-22 16:25:09 +01:00