f5ab271ec9
Merge branch 'develop' into apns
...
Conflicts:
samples/matrixConsole/matrixConsole.xcodeproj/project.pbxproj
2015-01-26 17:35:42 +00:00
a8a40c1188
More messages for invites & things
2015-01-26 17:29:45 +00:00
4d2aba33ed
More messages for invites & things
2015-01-26 17:29:45 +00:00
a9be59fa44
-> the contacts list are sectioned in 2 lists
...
1 - matrix users
2 - local contacts
The user must validate the local contacts sync to trigger them.
2015-01-26 18:06:13 +01:00
c16028d633
-> the contacts list are sectioned in 2 lists
...
1 - matrix users
2 - local contacts
The user must validate the local contacts sync to trigger them.
2015-01-26 18:06:13 +01:00
c96175d234
Merge remote-tracking branch 'origin/develop' into with-contacts
2015-01-26 16:53:49 +01:00
48444a121f
Merge remote-tracking branch 'origin/develop' into with-contacts
2015-01-26 16:53:49 +01:00
5aa6d7298b
Console: Refactor saving process in Settings
2015-01-26 16:51:34 +01:00
716fc40670
Console: Refactor saving process in Settings
2015-01-26 16:51:34 +01:00
cb76153d51
ContactsViewController is not anymore an UITableViewContrller : It is by now an UIViewController.
...
A segmented control has been added but it is not yet plugged.
2015-01-26 15:18:58 +01:00
975bae5120
ContactsViewController is not anymore an UITableViewContrller : It is by now an UIViewController.
...
A segmented control has been added but it is not yet plugged.
2015-01-26 15:18:58 +01:00
a38ffc3e63
Add instanceHandle param to pushers API and generate one in matrix console.
2015-01-26 14:15:11 +00:00
77b635376d
Add instanceHandle param to pushers API and generate one in matrix console.
2015-01-26 14:15:11 +00:00
c6fd2231fa
The dictionary 3PID -> matrixID is now cached.
...
We can assume that only few users would become matrix users between two syncs.
2015-01-26 11:55:04 +01:00
b16e6e35c4
The dictionary 3PID -> matrixID is now cached.
...
We can assume that only few users would become matrix users between two syncs.
2015-01-26 11:55:04 +01:00
b5394b25cb
The contactManager has now two matrix user check mode
...
1 - when CONTACTS_3PIDS_SYNC is set
the client looks up for ALL the known 3PIDs even if the linked contacts are not displayed
2 - when CONTACTS_3PIDS_SYNC is NOT set
the client looks up to the PIDS on demand i.e. the displayed contacts request their PIDs refresh.
2015-01-26 11:05:53 +01:00
bbd890780e
The contactManager has now two matrix user check mode
...
1 - when CONTACTS_3PIDS_SYNC is set
the client looks up for ALL the known 3PIDs even if the linked contacts are not displayed
2 - when CONTACTS_3PIDS_SYNC is NOT set
the client looks up to the PIDS on demand i.e. the displayed contacts request their PIDs refresh.
2015-01-26 11:05:53 +01:00
4f36c782dc
Update to MXCContact to manage Matrix only Contact
2015-01-26 09:08:18 +01:00
072e00d309
Update to MXCContact to manage Matrix only Contact
2015-01-26 09:08:18 +01:00
04e5830ba7
Console: Prepare email linkage.
...
- Update settings UI (link email is not supported yet).
2015-01-23 18:45:13 +01:00
565665ccb8
Console: Prepare email linkage.
...
- Update settings UI (link email is not supported yet).
2015-01-23 18:45:13 +01:00
7a8c37738e
The matrix Users are displayed if the user did not give access to his local contacts book.
2015-01-23 16:08:54 +01:00
51c3c4ff66
The matrix Users are displayed if the user did not give access to his local contacts book.
2015-01-23 16:08:54 +01:00
1fbd5103a5
-> the MXUsers were not always displayed at cold start : the mxSession was not yet initilized
...
-> application background/debackground management : do not remove the MXUsers before triggering the 3PIDs lookup. It avoid useless flickerings.
2015-01-23 16:04:11 +01:00
f0e9580df9
-> the MXUsers were not always displayed at cold start : the mxSession was not yet initilized
...
-> application background/debackground management : do not remove the MXUsers before triggering the 3PIDs lookup. It avoid useless flickerings.
2015-01-23 16:04:11 +01:00
2cc41818d4
Merge remote-tracking branch 'origin/develop' into with-contacts
...
Conflicts:
samples/matrixConsole/matrixConsole.xcodeproj/project.pbxproj
samples/matrixConsole/matrixConsole/AppDelegate.m
2015-01-23 15:53:39 +01:00
4051cf4fdb
Merge remote-tracking branch 'origin/develop' into with-contacts
...
Conflicts:
samples/matrixConsole/matrixConsole.xcodeproj/project.pbxproj
samples/matrixConsole/matrixConsole/AppDelegate.m
2015-01-23 15:53:39 +01:00
43bd9f606c
Rename MatrixHandler to MatrixSDKHandler
2015-01-23 15:36:05 +01:00
a5fc4380d9
Rename MatrixHandler to MatrixSDKHandler
2015-01-23 15:36:05 +01:00
d05faa25a0
Merge remote-tracking branch 'origin/develop' into with-contacts
...
Conflicts:
samples/matrixConsole/matrixConsole.xcodeproj/project.pbxproj
2015-01-23 14:57:50 +01:00
89abac538e
Merge remote-tracking branch 'origin/develop' into with-contacts
...
Conflicts:
samples/matrixConsole/matrixConsole.xcodeproj/project.pbxproj
2015-01-23 14:57:50 +01:00
8cb294702c
Move source files
2015-01-23 14:42:04 +01:00
c7afc09b21
Move source files
2015-01-23 14:42:04 +01:00
743ffa8909
Replace Console prefix with MXC
2015-01-23 14:22:02 +01:00
4ce33b1500
Replace Console prefix with MXC
2015-01-23 14:22:02 +01:00
9dd052748f
Merge remote-tracking branch 'origin/develop' into with-contacts
...
Conflicts:
samples/matrixConsole/matrixConsole.xcodeproj/project.pbxproj
2015-01-23 14:10:47 +01:00
5c3baf0180
Merge remote-tracking branch 'origin/develop' into with-contacts
...
Conflicts:
samples/matrixConsole/matrixConsole.xcodeproj/project.pbxproj
2015-01-23 14:10:47 +01:00
86d464a7f5
Renaming:
...
ConsoleTools -> MXCTools
ConsoleGrowingTextView -> MXCGrowingTextView
CustomImageView -> MXCImageView
CustomAlert -> MXCAlert
MemberActionsCell -> RoomMemberActionsCell
2015-01-23 13:46:27 +01:00
40f2fb1e62
Renaming:
...
ConsoleTools -> MXCTools
ConsoleGrowingTextView -> MXCGrowingTextView
CustomImageView -> MXCImageView
CustomAlert -> MXCAlert
MemberActionsCell -> RoomMemberActionsCell
2015-01-23 13:46:27 +01:00
27d1544c47
Merge remote-tracking branch 'origin/develop' into with-contacts
2015-01-23 11:14:31 +01:00
a88da4dd0c
Merge remote-tracking branch 'origin/develop' into with-contacts
2015-01-23 11:14:31 +01:00
fbc69f24b1
Should fix SYIOS-65 IOS8 : in case of search in recents, keyboard is not dismisssed when user selects a room.
...
-> Replace the header section by tableHeaderView
-> With IPhone 6+ and in landscape orientation, the search bar is not removed but the keyboard is dismissed.
2015-01-23 11:01:38 +01:00
8f821582f3
Should fix SYIOS-65 IOS8 : in case of search in recents, keyboard is not dismisssed when user selects a room.
...
-> Replace the header section by tableHeaderView
-> With IPhone 6+ and in landscape orientation, the search bar is not removed but the keyboard is dismissed.
2015-01-23 11:01:38 +01:00
33aa3cc4f7
Remove a weird messages animation when setting a text message.
2015-01-22 18:09:33 +01:00
bc5b0ce01f
Remove a weird messages animation when setting a text message.
2015-01-22 18:09:33 +01:00
8d6f44b011
Remove a growingTextView flickering when a message is sent with a dismissed keyboard.
2015-01-22 17:43:57 +01:00
21a687e7de
Remove a growingTextView flickering when a message is sent with a dismissed keyboard.
2015-01-22 17:43:57 +01:00
721a715045
Add sanityy check
2015-01-22 17:40:23 +01:00
679d206bc2
Add sanityy check
2015-01-22 17:40:23 +01:00
ea7991c6f4
1 - Should fix SYIOS-64 Chat room : unexpected blank lines are added into history when user types in growing textview
...
2 - do not scroll anymore to the bottom when the device orientation is updated
3 - do not resize the growing textview height when the keyboard is dismissed : it provides weird UX.
2015-01-22 17:31:44 +01:00
David Baker
ylecollen
giomfo