Richard van der Hoff
|
21410354ab
|
Merge branch 'rav/jenkins_build' into develop
|
2016-02-25 16:59:44 +00:00 |
|
Richard van der Hoff
|
de50518282
|
s/version.txt/git-revision.txt/
|
2016-02-25 16:57:34 +00:00 |
|
Richard van der Hoff
|
025a026f45
|
Use js-sdk and react-sdk from jenkins artifacts
|
2016-02-25 15:31:04 +00:00 |
|
David Baker
|
49525f22c2
|
Changelog
|
2016-02-25 12:10:30 +00:00 |
|
David Baker
|
642c33e8d9
|
Mention package script in readme
|
2016-02-25 10:47:09 +00:00 |
|
David Baker
|
fa322e8488
|
Auto-create a sensible version file. Copy the vector dir so we can put it in there rather than creating files in the main vector dir.
|
2016-02-24 18:59:33 +00:00 |
|
David Baker
|
874123bbfa
|
Move package script out and make it tar into a versioned top level directory. It may as well be a shell script since it's unix specific anyway, and maintaining it inside package.json is now impractical.
|
2016-02-24 18:41:30 +00:00 |
|
David Baker
|
b088651211
|
Use the --tags option so it works with non-annoated tags (seriously, git?)
|
2016-02-24 15:05:13 +00:00 |
|
David Baker
|
a69c63cc60
|
Master is no longer stale.
|
2016-02-24 14:25:34 +00:00 |
|
David Baker
|
04b51f6f0f
|
Merge branch 'develop'
|
2016-02-24 14:24:57 +00:00 |
|
David Baker
|
ebd5399626
|
Bump to version 0.2.0
|
2016-02-24 14:24:15 +00:00 |
|
David Baker
|
5d63d2269e
|
Use newly released versions of js-sdk & react-sdk
|
2016-02-24 14:21:53 +00:00 |
|
David Baker
|
ef00bc6d56
|
Manually merge relevant remaining parts of https://github.com/vector-im/vector-web/pull/790 that aren't covered by @richvdh's PR.
|
2016-02-24 11:59:29 +00:00 |
|
David Baker
|
8e25a4ca36
|
Merge pull request #999 from vector-im/dbkr/more_readme_foolproofing
Make the README more idiot-proof
|
2016-02-24 11:50:13 +00:00 |
|
David Baker
|
1ecedd2769
|
Add back deployment info
|
2016-02-24 11:48:51 +00:00 |
|
David Baker
|
9c9e260410
|
Make the README more idiot-proof
|
2016-02-24 11:36:57 +00:00 |
|
David Baker
|
3f9f3e9d92
|
Merge pull request #998 from vector-im/rav/fix_the_sodding_deployment_instructions
Update the README to give clearer dev instructions
|
2016-02-24 11:24:48 +00:00 |
|
Richard van der Hoff
|
ca89c09e73
|
formatting
|
2016-02-23 21:00:27 +00:00 |
|
Richard van der Hoff
|
10f6277de2
|
Update the README to make the development instructions clearer
|
2016-02-23 20:55:37 +00:00 |
|
David Baker
|
acb443537a
|
Merge pull request #997 from vector-im/dbkr/fix_new_room_crash
Sender can be null, so null check.
|
2016-02-23 18:12:42 +00:00 |
|
David Baker
|
55c7c08ac2
|
Sender can be null, so null check.
|
2016-02-23 17:59:13 +00:00 |
|
Richard van der Hoff
|
72393bf75f
|
Merge branch 'rav/read_marker' into develop
|
2016-02-23 17:57:50 +00:00 |
|
David Baker
|
497cb8bc9c
|
Merge pull request #993 from vector-im/dbkr/keypair_3pid_invites
Pass through params for other URLs
|
2016-02-23 11:08:28 +00:00 |
|
David Baker
|
a063efe250
|
Remove no-longer accurate comment.
|
2016-02-23 10:57:50 +00:00 |
|
David Baker
|
45c8500f28
|
Pass through params for other URLs (in this case, for keypair invite signing urls)
|
2016-02-23 10:22:22 +00:00 |
|
Richard van der Hoff
|
b04ce6a376
|
Fix default hs url after it was broken in 77b45e72
|
2016-02-22 17:07:26 +00:00 |
|
Matthew Hodgson
|
f2fc4a88ae
|
gemini up roomdirectory
|
2016-02-22 09:35:11 +00:00 |
|
Matthew Hodgson
|
77b45e7231
|
oooooooops - remember opensans v13
|
2016-02-22 09:18:56 +00:00 |
|
Matthew Hodgson
|
484736bf57
|
oops, add sanitize-html
|
2016-02-21 00:05:44 +00:00 |
|
Matthew Hodgson
|
e91a108738
|
Merge pull request #972 from vector-im/matthew/room-directory
Skin RoomDirectory almost as per design
|
2016-02-20 23:59:02 +00:00 |
|
Matthew Hodgson
|
2ca5529faa
|
support hyperlinked topics
|
2016-02-20 23:54:47 +00:00 |
|
Matthew Hodgson
|
a35ab6bcef
|
tart up room directory
|
2016-02-20 13:36:48 +00:00 |
|
Matthew Hodgson
|
e33e9b5d4a
|
upgrade OpenSans and add semibold
|
2016-02-20 13:36:33 +00:00 |
|
Matthew Hodgson
|
3910877f8f
|
ensure local activity bumps rooms up the roomlist
|
2016-02-19 02:09:04 +00:00 |
|
Matthew Hodgson
|
f538a0d5de
|
scale local video feed to fit on the page properly
|
2016-02-19 01:16:55 +00:00 |
|
Matthew Hodgson
|
4e5b971d3a
|
accomodate 800px wide thumbs
|
2016-02-18 19:09:32 +00:00 |
|
Matthew Hodgson
|
ffb1584e10
|
horizontally scale images properly
|
2016-02-18 18:59:45 +00:00 |
|
Matthew Hodgson
|
dbf3439e35
|
fix statusbar layout some more
|
2016-02-18 18:13:23 +00:00 |
|
Matthew Hodgson
|
11ac6defed
|
tint searchbar
|
2016-02-18 17:32:15 +00:00 |
|
Richard van der Hoff
|
718c1cbe6f
|
Merge branch 'rav/update_status_bar' into develop
|
2016-02-17 21:16:22 +00:00 |
|
Matthew Hodgson
|
27222a54c7
|
somewhat cryptic hack to make empty RoomStatusBars not take up 41px rather than 36px of height
|
2016-02-17 18:54:46 +00:00 |
|
Matthew Hodgson
|
3263076ea6
|
Merge branch 'develop' into rav/update_status_bar
|
2016-02-17 18:37:40 +00:00 |
|
Matthew Hodgson
|
3c659dcf57
|
experimental fix for https://github.com/vector-im/vector-web/issues/947 and https://github.com/vector-im/vector-web/issues/946. may well introduce more problems
|
2016-02-17 12:43:42 +00:00 |
|
Matthew Hodgson
|
2cd3150c56
|
tart up mx_EventTile_selected
|
2016-02-15 20:22:45 +00:00 |
|
Matthew Hodgson
|
cdc1447804
|
fix search highlight css
|
2016-02-15 20:19:30 +00:00 |
|
Matthew Hodgson
|
11c9aff69a
|
fix radiobutton css
|
2016-02-15 22:06:16 +02:00 |
|
Matthew Hodgson
|
58959d014a
|
show vaguely accurate default avatar
|
2016-02-15 22:01:30 +02:00 |
|
Richard van der Hoff
|
1a9125a886
|
Fix horizontal alignment of top unread-messages bar
|
2016-02-15 18:10:11 +00:00 |
|
Matthew Hodgson
|
8e008572e5
|
CSS for setting display name prompt
|
2016-02-15 19:37:19 +02:00 |
|
Richard van der Hoff
|
18c6aa38e4
|
Styling and imgs to support new read_marker semantics
Support for adding a new 'Scroll up' bar in react-sdk
|
2016-02-15 17:22:55 +00:00 |
|