Commit Graph

12250 Commits

Author SHA1 Message Date
giomfo 3bee31b1ad Console Settings: User can now link emails to his account from settings screen. 2015-01-27 17:24:55 +01:00
giomfo 2bdf32e0bf Console Settings: User can now link emails to his account from settings screen. 2015-01-27 17:24:55 +01:00
ylecollen c7a58eb263 -> start chat with an user tries first to resume existing room before creating a new one. 2015-01-27 16:27:13 +01:00
ylecollen 81f7fae056 -> start chat with an user tries first to resume existing room before creating a new one. 2015-01-27 16:27:13 +01:00
ylecollen 94b9706aeb The contact thumbnail did not keep the aspect ratio. 2015-01-27 16:01:22 +01:00
ylecollen 69dbc492a5 The contact thumbnail did not keep the aspect ratio. 2015-01-27 16:01:22 +01:00
ylecollen 75da74cc99 1 - add the contacts search
It searches patterns in emails (contain patterns), phone numbers (starts with patterns), display name (contains)

2 - the contactViewController was not resetted when the application was logged out.
2015-01-27 15:43:57 +01:00
ylecollen 9134daa2c7 1 - add the contacts search
It searches patterns in emails (contain patterns), phone numbers (starts with patterns), display name (contains)

2 - the contactViewController was not resetted when the application was logged out.
2015-01-27 15:43:57 +01:00
ylecollen 922ffad02f UIKeyboardWillHideNotification event unregistration was missing 2015-01-27 15:42:04 +01:00
ylecollen b9b5c15683 UIKeyboardWillHideNotification event unregistration was missing 2015-01-27 15:42:04 +01:00
David Baker 3433350859 Merge branch 'develop' into apns
Conflicts:
	samples/matrixConsole/matrixConsole.xcodeproj/project.pbxproj
2015-01-27 10:35:56 +00:00
David Baker 0a5bd94799 Merge branch 'develop' into apns
Conflicts:
	samples/matrixConsole/matrixConsole.xcodeproj/project.pbxproj
2015-01-27 10:35:56 +00:00
ylecollen 0935f80fc1 Fix a typo 2015-01-27 11:12:52 +01:00
ylecollen 96dae68712 Fix a typo 2015-01-27 11:12:52 +01:00
ylecollen f6f521f464 The growingTextInput was resized at first character typing 2015-01-27 10:38:17 +01:00
ylecollen ff7dfacf7e The growingTextInput was resized at first character typing 2015-01-27 10:38:17 +01:00
ylecollen f6d3943534 Fix a compilation warning on Iphone 6+ 2015-01-27 10:37:15 +01:00
ylecollen b41fe608c1 Fix a compilation warning on Iphone 6+ 2015-01-27 10:37:15 +01:00
giomfo 3b6b4e633b Merge remote-tracking branch 'origin/develop' into with-contacts
Conflicts:
	samples/matrixConsole/matrixConsole/ViewController/SettingsViewController.m
2015-01-27 10:29:34 +01:00
giomfo 3c309c5c5c Merge remote-tracking branch 'origin/develop' into with-contacts
Conflicts:
	samples/matrixConsole/matrixConsole/ViewController/SettingsViewController.m
2015-01-27 10:29:34 +01:00
giomfo 19d7861700 Console Settings: BugFix Refresh correctly InApp notification rules. 2015-01-27 10:25:36 +01:00
giomfo 53c80e41fe Console Settings: BugFix Refresh correctly InApp notification rules. 2015-01-27 10:25:36 +01:00
ylecollen 2e4112d94b 1 - add MatrixSDKHandler::createPrivateOneToOneRoomWith
2 - can start chat with any matrix ID contained in a contact.
2015-01-27 10:15:26 +01:00
ylecollen 30c0e2b58a 1 - add MatrixSDKHandler::createPrivateOneToOneRoomWith
2 - can start chat with any matrix ID contained in a contact.
2015-01-27 10:15:26 +01:00
ylecollen 0f045f0bf9 The media cache size slider max value was not properly initialized 2015-01-27 09:28:49 +01:00
ylecollen 538914604b The media cache size slider max value was not properly initialized 2015-01-27 09:28:49 +01:00
ylecollen 8b9ea2efce The collation bar was not displayed in the contacts viewcontroller 2015-01-27 09:19:32 +01:00
ylecollen bb1a42c85a The collation bar was not displayed in the contacts viewcontroller 2015-01-27 09:19:32 +01:00
ylecollen ab08870677 The local contacts section does not contain anymore the "unknown" matrix users 2015-01-27 08:36:21 +01:00
ylecollen 2f10552406 The local contacts section does not contain anymore the "unknown" matrix users 2015-01-27 08:36:21 +01:00
ylecollen cf32cd9cad Matrix Users section : display only the 1:1 chat members 2015-01-27 08:26:46 +01:00
ylecollen 8f3074fcc9 Matrix Users section : display only the 1:1 chat members 2015-01-27 08:26:46 +01:00
David Baker 70dc7038ec Merge branch 'develop' into apns
Conflicts:
	samples/matrixConsole/matrixConsole.xcodeproj/project.pbxproj
2015-01-26 17:35:42 +00:00
David Baker f5ab271ec9 Merge branch 'develop' into apns
Conflicts:
	samples/matrixConsole/matrixConsole.xcodeproj/project.pbxproj
2015-01-26 17:35:42 +00:00
David Baker a8a40c1188 More messages for invites & things 2015-01-26 17:29:45 +00:00
David Baker 4d2aba33ed More messages for invites & things 2015-01-26 17:29:45 +00:00
ylecollen 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
ylecollen 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
giomfo c96175d234 Merge remote-tracking branch 'origin/develop' into with-contacts 2015-01-26 16:53:49 +01:00
giomfo 48444a121f Merge remote-tracking branch 'origin/develop' into with-contacts 2015-01-26 16:53:49 +01:00
giomfo 5aa6d7298b Console: Refactor saving process in Settings 2015-01-26 16:51:34 +01:00
giomfo 716fc40670 Console: Refactor saving process in Settings 2015-01-26 16:51:34 +01:00
ylecollen 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
ylecollen 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
David Baker a38ffc3e63 Add instanceHandle param to pushers API and generate one in matrix console. 2015-01-26 14:15:11 +00:00
David Baker 77b635376d Add instanceHandle param to pushers API and generate one in matrix console. 2015-01-26 14:15:11 +00:00
ylecollen 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
ylecollen 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
ylecollen 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
ylecollen 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