enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Commit Graph

  • f3aeda7af9 merge develop Matthew Hodgson 2016-01-17 23:31:21 +00:00
  • 1467aacfa4 support saving tag changes (untested) Matthew Hodgson 2016-01-17 12:27:21 +00:00
  • 40d2018c17 fix checkbox css Matthew Hodgson 2016-01-17 12:26:54 +00:00
  • 06e1674f23 UI for tag management Matthew Hodgson 2016-01-17 05:13:16 +00:00
  • 5b5bd9aef1 remove create_room for now. lots of stupid bugfixes across the board. Matthew Hodgson 2016-01-17 03:59:31 +00:00
  • 82a159d651 make roomsettings actually work, including alias editing. (using staged UX rather than direct manipulation). loads of tweaks and fixes across the board Matthew Hodgson 2016-01-17 02:48:55 +00:00
  • a61afa0f31 fix css thinko Matthew Hodgson 2016-01-17 02:46:22 +00:00
  • 4e7c58e242 fix broken icon Matthew Hodgson 2016-01-17 02:46:15 +00:00
  • 8771369937 more layout Matthew Hodgson 2016-01-15 20:29:44 +00:00
  • 7045906d5d Show user settings screen on registration instead of the PostRegister stuff. David Baker 2016-01-15 18:58:18 +00:00
  • a90f63f72c null check David Baker 2016-01-15 18:49:12 +00:00
  • 52de322789 Change history scolling so it doesn't interfere with moving between lines, even when those lines are wrapped rather than hard line breaks. David Baker 2016-01-15 18:31:07 +00:00
  • d6c7631dcc Show User avatar URLs Kegan Dougal 2016-01-15 17:31:32 +00:00
  • 4d47d9875b Merge branch 'kegan/base-avatar' into kegan/invite-search Kegan Dougal 2016-01-15 17:19:34 +00:00
  • 855bef17fa Fold BaseAvatar state mainly into state.urls to avoid too many code paths. Kegan Dougal 2016-01-15 17:05:05 +00:00
  • 394fb2373b more layout tweaks for RoomSettings Matthew Hodgson 2016-01-15 16:50:12 +00:00
  • a849955c51 Merge pull request #93 from matrix-org/registration_field_validate David Baker 2016-01-15 16:38:46 +00:00
  • 90184235bb improve RoomSettings layout Matthew Hodgson 2016-01-15 16:33:50 +00:00
  • f476150591 fix changeavatar to avoid duplicate click on label Matthew Hodgson 2016-01-15 16:33:34 +00:00
  • eb8064f961 fix cursors for changeavatar Matthew Hodgson 2016-01-15 16:32:39 +00:00
  • 531aa153bb no more textarea in roomsettings Matthew Hodgson 2016-01-15 16:32:23 +00:00
  • d7ffe70d44 PushRules settings: Applied Amandine's review comments manuroe 2016-01-15 17:28:57 +01:00
  • ecfdd3593c Validate everything on form submit. Don't use pwd1 where we didn't define it & fix some error codes. David Baker 2016-01-15 16:17:27 +00:00
  • d8d79722ac Make RoomAvatar use BaseAvatar Kegan Dougal 2016-01-15 16:13:25 +00:00
  • 17489ae350 s/MemberAvatar/BaseAvatar/ and rename classes Kegan Dougal 2016-01-15 16:12:28 +00:00
  • 6bd09512de Merge pull request #94 from matrix-org/share_history_invite_warning David Baker 2016-01-15 15:57:42 +00:00
  • 293f5c7120 shrink auxpanel a bit for roomsettings Matthew Hodgson 2016-01-15 15:53:53 +00:00
  • 0caf5e0cdc manage permissions on whether people can actually edit name, topic, avatar etc or not Matthew Hodgson 2016-01-15 15:51:40 +00:00
  • 57e62bf0ba remove change avatar from here as it's now in the header Matthew Hodgson 2016-01-15 15:50:38 +00:00
  • 762dd69f0a more bottom margin on editable roomheader Matthew Hodgson 2016-01-15 15:48:29 +00:00
  • cb8b052dc0 PushRules settings: Show unmanaged rules into an "advanced section" manuroe 2016-01-15 16:45:27 +01:00
  • 1fcb4ba94f droptarget and usersettings and roomsettings layout tweaks Matthew Hodgson 2016-01-15 15:26:00 +00:00
  • aefecfc645 tweak roomheader layout when editing Matthew Hodgson 2016-01-15 15:23:41 +00:00
  • b8afccd445 fix droptarget behaviour Matthew Hodgson 2016-01-15 15:23:02 +00:00
  • 2638ee974e Add warning on inviting a user if sharing history with new users. David Baker 2016-01-15 15:18:55 +00:00
  • 80c2361805 Merge pull request #92 from matrix-org/invalid_user_name David Baker 2016-01-15 14:33:45 +00:00
  • 4a2c2d9656 fix broken merge and revert some of 243b2e45 and document evil magic numbers Matthew Hodgson 2016-01-15 14:22:17 +00:00
  • ea6ed81517 Merge pull request #630 from vector-im/read_marker_position David Baker 2016-01-15 13:57:25 +00:00
  • b60d14a408 Merge pull request #91 from matrix-org/show_upload_in_current_room_only David Baker 2016-01-15 13:45:23 +00:00
  • 02e41450b4 Do (more) client side validation of registration parameters. David Baker 2016-01-15 13:31:41 +00:00
  • 2dd2acd4e0 PushRules settings: BF adding a keyword when the keywords rule is OFF manuroe 2016-01-15 14:28:50 +01:00
  • 7cc5925ec4 increase initialSyncLimit enormously to avoid slow gappy /syncs for now Matthew Hodgson 2016-01-15 13:28:41 +00:00
  • f2dc1e835b placeholder for displayname Matthew Hodgson 2016-01-15 13:11:37 +00:00
  • e1e46be220 apply gemini scrollbar Matthew Hodgson 2016-01-15 13:11:14 +00:00
  • 828b1f4837 fix up look and feel of UserSettings a bit more Matthew Hodgson 2016-01-15 12:35:30 +00:00
  • 84b46dae4e make ChangeAvatar customisable size... Matthew Hodgson 2016-01-15 12:35:18 +00:00
  • 8e9e33fa2a fix NPE and make enter work again Matthew Hodgson 2016-01-15 12:34:53 +00:00
  • 41ae851df4 fix up user settings CSS somewhat Matthew Hodgson 2016-01-15 12:34:01 +00:00
  • cfb81a4aec Factor out avatar stuff to BaseAvatar. Make MemberAvatar use it instead. Kegan Dougal 2016-01-15 12:02:28 +00:00
  • c3469b5b51 PushRules settings: coding: separate UI and data management manuroe 2016-01-15 11:29:03 +01:00
  • aea833ec87 Display User objects in search results Kegan Dougal 2016-01-15 10:31:31 +00:00
  • 51ce76aeab M_INVALID_USERNAME to be consistent with param name David Baker 2016-01-15 10:08:16 +00:00
  • 266aee2c6b Factor out data model -> Entity logic to Entities.js Kegan Dougal 2016-01-15 09:58:48 +00:00
  • 7412fc7f97 PushRules settings: changed wordings manuroe 2016-01-15 10:51:42 +01:00
  • f868f7813b Room settings: Added notifications mute checkbox manuroe 2016-01-14 19:06:48 +01:00
  • 83a458938e Unbreak things Kegan Dougal 2016-01-14 17:41:04 +00:00
  • 69d8e50eeb Merge branch 'develop' into kegan/invite-search Kegan Dougal 2016-01-14 17:34:52 +00:00
  • b491447702 Merge pull request #89 from matrix-org/kegan/slash-command-tab-complete Kegsay 2016-01-14 17:34:20 +00:00
  • 66bc30c0bc Add /me to the list Kegan Dougal 2016-01-14 17:33:52 +00:00
  • dcfcc51f4c Catch new invalid user name error added in https://github.com/matrix-org/synapse/pull/499 and https://github.com/matrix-org/matrix-doc/pull/263 David Baker 2016-01-14 17:28:53 +00:00
  • d5deb283bf Add a SearchableEntityList and use it for invite box Kegan Dougal 2016-01-14 17:27:06 +00:00
  • d1f26e3911 camera icon Matthew Hodgson 2016-01-14 17:26:16 +00:00
  • c1aac1aaca roomsetting icons Matthew Hodgson 2016-01-14 17:25:21 +00:00
  • e4671205d8 right imagery Matthew Hodgson 2016-01-14 17:24:57 +00:00
  • 2899082cba deselect editabletext when tabbing away Matthew Hodgson 2016-01-14 17:24:52 +00:00
  • d767e72469 hide hoverover for 3pids Matthew Hodgson 2016-01-14 17:02:56 +00:00
  • 06ecf78e5f Merge branch 'develop' into matthew/roomsettings2 Matthew Hodgson 2016-01-14 16:50:12 +00:00
  • f2fa9fe398 Merge branch 'develop' into matthew/roomsettings2 Matthew Hodgson 2016-01-14 16:49:48 +00:00
  • a65a15e9bb Shift read marker down by 5px David Baker 2016-01-14 16:45:13 +00:00
  • d33d606912 Only show uploads that are going to the current room David Baker 2016-01-14 16:31:42 +00:00
  • 4430e16707 apply CSS to slashcommand autocompletes Matthew Hodgson 2016-01-14 16:29:41 +00:00
  • 42dc1be341 fix descriptions a bit and sort the slash commands when tab-completing Matthew Hodgson 2016-01-14 16:29:30 +00:00
  • 9ada5f7ddd CSS for tab complete slashcommands Matthew Hodgson 2016-01-14 16:29:03 +00:00
  • 84a7fc1640 Tweak how command aliases are set Kegan Dougal 2016-01-14 16:29:01 +00:00
  • 81329a42fd Merge pull request #90 from matrix-org/user_activity_end David Baker 2016-01-14 16:27:54 +00:00
  • 740c22238e Better date syntax David Baker 2016-01-14 16:15:07 +00:00
  • 4f21e2beb3 Suffix with units David Baker 2016-01-14 16:13:50 +00:00
  • ffaea371ac Merge branch 'kegan/slash-command-tab-complete' into matthew/roomsettings2 Matthew Hodgson 2016-01-14 16:02:29 +00:00
  • 7e5d4b8ce8 Send an event at the end of user activity too and use this to send RRs. David Baker 2016-01-14 16:01:31 +00:00
  • b67131f0c8 Add a Command class; add Entry.getFillText() Kegan Dougal 2016-01-14 14:39:58 +00:00
  • 17e540d372 fix line wrapping of code blocks in multiline msgs Matthew Hodgson 2016-01-14 11:57:07 +00:00
  • 864d10f412 Make individual Entrys responsible for determining suffixes Kegan Dougal 2016-01-14 11:39:24 +00:00
  • f4be4880b8 Merge branch 'develop' into kegan/slash-command-tab-complete Kegan Dougal 2016-01-14 11:12:06 +00:00
  • db2d7fdbff Merge pull request #622 from vector-im/kegan/3pid-invite-memberlist Kegsay 2016-01-14 10:45:50 +00:00
  • 927ac5fe64 2016 only Kegan Dougal 2016-01-14 10:45:38 +00:00
  • 1e4739e2ff Merge pull request #88 from matrix-org/kegan/3pid-invite-memberlist Kegsay 2016-01-14 10:44:23 +00:00
  • 378f4bb85c PushRules settings: Display keywords in alphabetical order manuroe 2016-01-14 11:15:59 +01:00
  • 0577edb055 PushRules settings: Added master push rule manuroe 2016-01-14 11:03:51 +01:00
  • 123b134d87 use getDomain() Matthew Hodgson 2016-01-13 18:15:59 +00:00
  • dc62f639f2 Merge branch 'kegan/slash-command-tab-complete' into matthew/roomsettings2 Matthew Hodgson 2016-01-13 18:11:11 +00:00
  • 7a1e6bbe7e fix merge conflicts Matthew Hodgson 2016-01-13 18:00:04 +00:00
  • 513c7e3b73 Uncommit unintentional config change David Baker 2016-01-13 17:59:13 +00:00
  • 05c7891874 fix NPE Matthew Hodgson 2016-01-13 17:54:33 +00:00
  • 53f31e49da Implement tab-complete for slash commands Kegan Dougal 2016-01-13 17:46:36 +00:00
  • 56718650b9 fix comedy double-margin caused by killing off MessageTiles Matthew Hodgson 2016-01-13 17:39:49 +00:00
  • e3eef45684 fix comedy double-margin caused by killing off MessageTiles Matthew Hodgson 2016-01-13 17:39:49 +00:00
  • 68f846e129 Merge branch 'develop' into matthew/roomsettings2 Matthew Hodgson 2016-01-13 17:33:32 +00:00
  • ad434cb82e GA bugfix Matthew Hodgson 2016-01-13 17:33:06 +00:00
  • f2171c11f0 uncommitted WIP roomsetting CSS Matthew Hodgson 2016-01-13 17:33:03 +00:00
  • 629883731e PushRules settings: BF when adding a new keyword with the keywords rule in Off manuroe 2016-01-13 17:56:59 +01:00