Commit graph

1566 commits

Author SHA1 Message Date
yannick
09567f1c29 add_invite_rooms_section
Plug the join/reject button
The join does not refresh properly the recents.
2015-12-10 09:00:57 +01:00
manuroe
e99b575968 Merge remote-tracking branch 'origin/develop' into search_api_support
Conflicts:
	Vector.xcodeproj/project.pbxproj
2015-12-09 18:28:53 +01:00
manuroe
c1e96f7cfa HomeVC: Added missing comments 2015-12-09 18:20:00 +01:00
manuroe
12dda5379b HomeVC: Use it from the AppDelegate
Fixed [AppDelegate restoreInitialDisplay] to be async: this avoids "while a presentation is in progress" warning
HomeVC now support adding and removing of MXSessions
2015-12-09 18:12:42 +01:00
yannick
6169b39ae5 Improve the invite room display. 2015-12-09 17:38:39 +01:00
manuroe
adf8fed893 HomeVC: storyboard: connected HomeVC to AuthVC and killed RecentsVC as HomeVC can do everything now 2015-12-09 17:28:39 +01:00
yannick
c96d6fb9cd add_invite_rooms_section
-> add the customized invite cell.
not yet plugged.
2015-12-09 17:01:29 +01:00
manuroe
4a491a0478 HomeVC: Moved code (opening room and maintaining the current one) from RecentsVC to HomeVC - Part 2/2 2015-12-09 16:48:43 +01:00
yannick
2ff73cded1 add_invite_rooms_section
-> reduce the recent cell height
2015-12-09 16:09:46 +01:00
manuroe
ef63d90f93 HomeVC: Moved code (opening room and maintaining the current one) from RecentsVC to HomeVC - Part 1 2015-12-09 14:39:37 +01:00
Yannick LE COLLEN
984e341e75 Merge pull request #17 from vector-im/read_receipts_for_incoming_messages
The read receipts are displayed for incoming messages.
2015-12-09 14:12:17 +01:00
manuroe
b009ca8110 HomeVC: Moved code (createNewRoom button and transparency mask) from RecentsVC to HomeVC 2015-12-09 12:44:19 +01:00
manuroe
a0ca77c770 HomeVC: Killed SearchVC as HomeVC fully replaces it now 2015-12-09 12:35:53 +01:00
manuroe
be9fad2bfa HomeVC: Moved code (createNewRoom button and transparency mask) from RecentsVC to HomeVC 2015-12-09 12:28:25 +01:00
manuroe
5e7e551224 HomeVC: Show an image if there is nothing to search 2015-12-09 12:02:43 +01:00
manuroe
5eb404424a HomeVC: Show one loading wheel at a time: the one of the recents VC 2015-12-09 10:48:40 +01:00
manuroe
e6e086d9fc HomeVC: Started HomeViewController that will replace RecentsVC as the main app page 2015-12-09 10:20:05 +01:00
yannick
e39746369d The read receipts are displayed for incoming messages.
In vector applciation, the outgoing and the imcoming messages are displayed in the same screen side.
2015-12-09 09:50:03 +01:00
yannick
a111f44d7d Fix a crash in refreshTypingView 2015-12-08 17:45:03 +01:00
Yannick LE COLLEN
087305448a Merge pull request #16 from vector-im/user_settings_page
Add the vector settings page
2015-12-08 17:40:23 +01:00
yannick
9da0bdc9d0 user_settings_page
update after reviewing.
2015-12-08 17:37:59 +01:00
yannick
948a58405a user_settings_page
Hide some unsupported account settings
2015-12-08 16:51:49 +01:00
yannick
49b9266582 Add a comment. 2015-12-08 16:37:52 +01:00
yannick
efafa49293 Merge remote-tracking branch 'origin/vector_user_settings' into user_settings_page 2015-12-08 16:09:26 +01:00
yannick
7fba0003c7 Fix some texts 2015-12-08 15:53:12 +01:00
yannick
da7b8bd88a user_settings_page
push rules
Make the difference between my user name and my display name rules.
2015-12-08 15:52:54 +01:00
yannick
5340584a8f user_settings_page
-> add password update dialog. (it works only on IOS 8 and above).
2015-12-08 15:39:53 +01:00
manuroe
aad25ca2a7 HomeVC: made selectionContainerHeightConstraint accessible 2015-12-08 14:28:53 +01:00
giomfo
ebf58876f3 Chat screen: rename cell view classes 2015-12-08 10:54:48 +01:00
giomfo
7c6057bfed Chat screen: Update bubble layout
-Define all required cell view classes
-Disable timestamp display (TODO display timestamp for last message, and selected message if any).
2015-12-08 10:10:59 +01:00
yannick
8f56adb196 The profile can be updated with the save button. 2015-12-07 17:45:19 +01:00
yannick
d4854cafe2 Fix a compilation warning. 2015-12-07 17:40:16 +01:00
yannick
922382f512 user_settings_page
-> first implementation
--> the tableview is the same as the screenshot we have
--> the push rules can be toggled

Need to manage the account updates.
2015-12-07 16:05:50 +01:00
manuroe
e73e4bb554 Merge remote-tracking branch 'origin/develop' into search_api_support 2015-12-07 15:51:18 +01:00
manuroe
08a43cd465 Search: Show only an image if the search text field is empty 2015-12-07 15:26:06 +01:00
manuroe
d410f18aa5 Search: SegmentedViewController: Added a customisable background image 2015-12-07 15:08:17 +01:00
manuroe
d39a7f7ebe Search: Reuse RecentsViewController with its search capabilities to make search under the "rooms" tab 2015-12-07 14:03:34 +01:00
giomfo
1ed9058be6 Chat screen: Bug Fix - App crashes when user selects a room in recents.
This crash was systematic when the user opened for the second time the same room.
2015-12-07 13:57:21 +01:00
manuroe
899c654832 Search: SegmentedViewController: Made displayedViewController public 2015-12-07 13:52:38 +01:00
manuroe
db6eb145bd Merge remote-tracking branch 'origin/develop' into search_api_support 2015-12-07 13:02:14 +01:00
giomfo
521a5786f3 Merge pull request #15 from vector-im/MXKDataSource_refactoring
MXKDataSource refactoring
2015-12-07 11:56:43 +01:00
giomfo
ef69af9adb MXKDataSource refactoring
Table view cell are now defined at view controller level.
2015-12-07 11:50:13 +01:00
manuroe
452152ca20 Merge remote-tracking branch 'origin/develop' into search_api_support
Conflicts:
	Vector/Base.lproj/Main.storyboard
	Vector/ViewController/RecentsViewController.m
2015-12-07 11:47:49 +01:00
manuroe
c969859593 Search: Show a search bar 2015-12-07 11:43:11 +01:00
yannick
5d484d9a63 Update the recents section header
-> reduce the font size
-> reduce the header height
2015-12-04 17:45:56 +01:00
yannick
fc5279dd5f useless file. 2015-12-04 17:18:18 +01:00
yannick
8dbd2f1b40 Fix a wrong commit 2015-12-04 17:15:19 +01:00
yannick
2074d4db64 fix a Wrong commit 2015-12-04 17:13:19 +01:00
Yannick LE COLLEN
6fbe365e7b Merge pull request #14 from vector-im/display_room_avatars
Display room avatars
Add vector avatar when there is no avatar or an identicon one
-> for the room avatars (recents)
-> for the  member avatars (room history and members list)
2015-12-04 17:08:45 +01:00
yannick
84b56df894 display_room_avatars.
fix a wrong fix in refreshTypingView.
2015-12-04 17:05:40 +01:00