Commit Graph

168 Commits

Author SHA1 Message Date
Erik Johnston
2b81f46030 Add placeHolder prop for EditableText 2015-07-15 15:04:39 +01:00
Erik Johnston
dfd54f3b95 Basic structure of user settings 2015-07-15 15:04:24 +01:00
Erik Johnston
844a883ad8 Merge branch 'master' of github.com:matrix-org/matrix-react-sdk into vector 2015-07-15 13:59:24 +01:00
David Baker
fe98d6ec69 Merge pull request #3 from matrix-org/editable_text
Add an editable text atom
2015-07-15 13:58:26 +01:00
Erik Johnston
5cd92229eb Add an editable text atom 2015-07-15 13:55:43 +01:00
Erik Johnston
2fc08aeb12 Merge branch 'master' of github.com:matrix-org/matrix-react-sdk into vector 2015-07-15 10:36:47 +01:00
David Baker
e0fae13b76 Merge pull request #2 from matrix-org/create_room
CreateRoom organism
2015-07-15 10:24:44 +01:00
Matthew Hodgson
c69606df44 oops 2015-07-15 04:29:30 +01:00
Matthew Hodgson
8db6c17220 fix header 2015-07-15 04:26:25 +01:00
Matthew Hodgson
b739e7be9e fix avatar spacing 2015-07-15 04:21:32 +01:00
Matthew Hodgson
ce38d4ea12 moar graphics 2015-07-15 04:16:51 +01:00
Matthew Hodgson
9b384e52b5 implement latest skin 2015-07-15 04:16:38 +01:00
Matthew Hodgson
c0bd574997 improve padding on membership list 2015-07-15 00:36:54 +01:00
Matthew Hodgson
9a51cace34 fix bad membership list horizontal scrolling 2015-07-15 00:31:47 +01:00
Erik Johnston
4f7dcdf566 Naming conventions 2015-07-14 17:52:13 +01:00
Erik Johnston
bb06b752b4 Document CreateRoom phases 2015-07-14 17:40:49 +01:00
Erik Johnston
c4764af9a2 Add phases to CreateRoom organism 2015-07-14 17:27:22 +01:00
Erik Johnston
a077abfb99 Remove console.log 2015-07-14 17:04:44 +01:00
Erik Johnston
03b715b8bf Add onRoomCreated callback to CreateRoom organism 2015-07-14 17:01:06 +01:00
Erik Johnston
a748c090fb Move all element specific code into skins/ 2015-07-14 16:59:11 +01:00
Erik Johnston
b53e710d20 Add invite selection to create room dialog 2015-07-14 16:53:49 +01:00
Erik Johnston
ed52cdf6df Add basic CreateRoom organism. Supports setting room name and selecting preset 2015-07-14 15:17:49 +01:00
Matthew Hodgson
77e76972f0 avatars for joins & parts 2015-07-14 14:31:13 +01:00
Matthew Hodgson
dff9353339 tabs->spaces everywhere; sorry folks - \!blame sublime 2015-07-14 12:11:01 +01:00
Matthew Hodgson
69d1844773 fix NPE for invites 2015-07-14 12:10:15 +01:00
Matthew Hodgson
6b0167375c badges and broken avatars 2015-07-14 02:13:00 +01:00
Matthew Hodgson
341fe868e4 group messages together from the same user 2015-07-14 00:25:51 +01:00
Matthew Hodgson
a5d24329c2 https for google fonts 2015-07-13 17:01:35 +01:00
Matthew Hodgson
10b3f250ec make it work in safari 2015-07-13 14:56:58 +01:00
Matthew Hodgson
18066d848a relative paths 2015-07-13 02:11:05 +01:00
Matthew Hodgson
06dfbbf821 fine tune header bar 2015-07-13 02:02:56 +01:00
Matthew Hodgson
20f1c075fc fix message tile layout a bit 2015-07-13 01:59:07 +01:00
Matthew Hodgson
bfe0cdcfd1 vector wireframes 2015-07-13 01:51:24 +01:00
Matthew Hodgson
98baa0cb0a improve css consistency 2015-07-12 16:36:43 +01:00
Matthew Hodgson
a1ab40064e fix CSS namespacing 2015-07-12 14:52:37 +01:00
Matthew Hodgson
c4b2530cc0 unbreak the custom app (broken by adding linkify to the underlying app) 2015-07-12 14:27:26 +01:00
Matthew Hodgson
c33899e93a bump to the same react version as the custom app 2015-07-12 14:26:51 +01:00
Matthew Hodgson
49e687f584 typo 2015-07-12 14:09:53 +01:00
David Baker
63d7ff3ed6 Build the logic too into the same hierarchy as it is unbuilt so it can be used either processed or unprocessed. Does involve having a dir called 'src' in the built products directory, and abusing jsx as a cross-platform version of cp (there is no jsx in the src dir). 2015-07-10 18:09:30 +01:00
David Baker
ed2cc33616 Linkify user IDs and room aliases (to nothing at the moment because we don't have anything to do with them) 2015-07-10 14:37:13 +01:00
David Baker
27d92fa98a Open files in new window too 2015-07-09 17:45:03 +01:00
David Baker
a00510c1ca Linkify URLs 2015-07-09 15:41:19 +01:00
David Baker
0daab63b4a Bad workaround for some join events having no sender 2015-07-09 11:31:58 +01:00
David Baker
b6319fcf50 Add webkit prefixed flex direction too. 2015-07-08 22:12:00 +01:00
David Baker
fa3e8587cc This never got used in the end 2015-07-08 21:11:48 +01:00
David Baker
12566c0c9c Separate with space too 2015-07-08 19:57:58 +01:00
David Baker
6a92fdc5e6 Fix file size display 2015-07-08 19:52:44 +01:00
David Baker
03451d8c7d Sort rooms for prev/next purposes 2015-07-08 19:47:58 +01:00
David Baker
bdfef5eedd damn you javascript 2015-07-08 18:28:30 +01:00
David Baker
c14886a1ee rename to mostRecentActivityFirst to disambiguate from sorting by when you joined a room, which this is not. 2015-07-08 18:21:57 +01:00