Commit graph

2058 commits

Author SHA1 Message Date
giomfo
95d36c8033 Merge remote-tracking branch 'origin/develop' into report_abuse 2016-05-04 09:58:14 +02:00
giomfo
dd9b91e54f Merge pull request #296 from vector-im/show_details_on_avatar_tap
Chat screen: Open member details when user taps on avatar
2016-05-04 09:09:27 +02:00
giomfo
70b4264138 Chat screen: Open member details when user taps on avatar 2016-05-03 23:30:46 +02:00
giomfo
658b3a0eb7 Report abusif content and Ignore user.
Rename "Ban" with "Ban from this room"
2016-05-03 21:53:04 +02:00
giomfo
8168641c42 Report abusif content and Ignore user.
- Room member: Add new option Ignore to ignore content from a room member
- Chat screen: Add report option in the contextual per-message menu + Option to ignore the event sender
2016-05-03 18:29:54 +02:00
manuroe
8c3b8ffec8 Fixed regression on opening of normal web links.
Removed the dev logs
2016-05-03 11:05:47 +02:00
manuroe
0341872f09 Temporary develop commit for testing web links on jenkins builds 2016-05-03 10:59:08 +02:00
manuroe
10a1136c42 Merge pull request #291 from vector-im/mediapicker_video_preview_buttons
Mediapicker: Improved video preview buttons
2016-05-03 10:04:03 +02:00
manuroe
6b2dd85cb0 Media Picker: Fixed center position of the video buttons (play or stop) 2016-05-03 10:03:15 +02:00
giomfo
51be82a17c BugFix Room Participants - Search session: the return key must be 'Done' instead of 'Search'
https://github.com/vector-im/vector-ios/issues/292
2016-05-03 09:58:49 +02:00
manuroe
15005367ce Media Picker: Fixed center position of the video buttons (play or stop) 2016-05-02 17:48:49 +02:00
manuroe
5cccbaa10b Media Picker: Use the same video buttons as MatrixKit 2016-05-02 17:41:51 +02:00
manuroe
ebdfd16a9c Temporary develop commit for testing web links on jenkins builds 2016-05-02 10:59:53 +02:00
manuroe
b78bb5fb3e Room member details: Fixed presence displayed when it is undefined 2016-05-02 08:38:03 +02:00
manuroe
0286ed4dd0 Merge pull request #288 from vector-im/www_vector_im
Manage www.vector.im urls as universal links
2016-04-29 16:37:54 +02:00
manuroe
673772d074 Universal link: Moved isUniversalLink and fixURLWithSeveralHashKeys methods from AppDelegate to Tools 2016-04-29 16:19:13 +02:00
manuroe
04e24a2979 Universal link: Add www.vector.im as associated domain 2016-04-29 16:18:01 +02:00
giomfo
9a983dbc80 Fix OM CAS authentication on iOS 9.
We need to completely disable the security checking and allow plain http for OM CAS to work.
2016-04-29 16:05:36 +02:00
manuroe
1ff7cf836f Merge pull request #285 from vector-im/update_room_members_list
Update room members list
2016-04-29 14:30:36 +02:00
manuroe
9372f2e6bf Room member details: Bug fix: when sorting invitees, use their display name 2016-04-29 14:30:12 +02:00
manuroe
09ff1fe615 Presence: Display (X ago) only if X > 0 2016-04-29 14:22:02 +02:00
giomfo
e74d564801 Merge pull request #284 from vector-im/vector_ios_282
BugFix: Room member details: only the "start chat" text is clickable,…
2016-04-29 14:06:17 +02:00
manuroe
36a810ada5 Presence: Renaming to look more like js sdk: MXUser.isCurrentlyActive -> MXUser.currentlyActive 2016-04-29 13:49:29 +02:00
giomfo
b3a05776e3 BugFix: Room member details: only the "start chat" text is clickable, not that whole button area.
https://github.com/vector-im/vector-ios/issues/282
2016-04-29 11:45:02 +02:00
giomfo
11a5fdde0c Bug Fix: Authentication screen: inputs fields are missing (blank screen) on first app launch. 2016-04-29 10:29:08 +02:00
manuroe
64d93e36b2 Room member details: Factorised the pretty string for presence in [Tools presenceText] 2016-04-29 09:54:43 +02:00
giomfo
46e94d4d96 Merge pull request #275 from vector-im/vector_ios_268
BugFix: 6+/iPad: Better manage user with no room in landscape
2016-04-29 09:03:01 +02:00
giomfo
cc58e873b0 BugFix: 6+/iPad: Better manage user with no room in landscape
https://github.com/vector-im/vector-ios/issues/268
2016-04-28 19:22:50 +02:00
giomfo
f66c626cdf Merge pull request #273 from vector-im/vector_ios_208
BugFix: Media Picker: user's albums are missing
2016-04-28 18:17:25 +02:00
giomfo
4790dac377 BugFix: Media Picker: user's albums are missing
https://github.com/vector-im/vector-ios/issues/208
2016-04-28 18:09:17 +02:00
giomfo
2a4cfebc9e Merge pull request #272 from vector-im/support_user_action_in_recent_cell
Support user action in recent cell
2016-04-28 17:14:22 +02:00
giomfo
bc9d72b4f3 RecentsDataSource: Remove InviteRecentTableViewCell dependency
Add sanity check
2016-04-28 16:48:09 +02:00
giomfo
32b61335fc RecentsDataSource: Remove InviteRecentTableViewCell dependency 2016-04-28 16:26:37 +02:00
manuroe
7120fe73af Room member details: Sort members with the same algo as Vector web: 412512570b/src/components/views/rooms/MemberList.js (L363) 2016-04-28 16:14:05 +02:00
manuroe
32ee933d95 Room member details: Removed the "(admin)" string as we now show a sheriff badge on them 2016-04-28 15:08:12 +02:00
manuroe
339a375100 Room member details: Order members by power levels (me, admins then moderators then others)
Reduced numbers of NSMutableArray
2016-04-28 14:39:02 +02:00
manuroe
f75eeb3413 Room member details: Order members by power levels (me, admins then moderators then others) 2016-04-28 11:58:05 +02:00
manuroe
1b2b5ab475 Merge remote-tracking branch 'origin/master' into develop 2016-04-27 14:36:54 +02:00
manuroe
b5ffba923d Merge pull request #270 from vector-im/release-v0.1.5
Prepare vector-ios release v0.1.5. Forgot to upgrade the version in the app
2016-04-27 14:14:51 +02:00
manuroe
878b6c63ce Prepare vector-ios release v0.1.5. Forgot to upgrade the version in the app 2016-04-27 14:13:24 +02:00
manuroe
d868468b28 Merge pull request #269 from vector-im/release-v0.1.5
Release v0.1.5
2016-04-27 14:05:13 +02:00
manuroe
3cfc2f1dc0 Prepare vector-ios release v0.1.5 2016-04-27 14:02:12 +02:00
manuroe
af130080ee Merge pull request #267 from vector-im/crash_portrait_to_landscape
RoomViewController: Fixed crash on 6+: "Starting the app in portrait,…
2016-04-27 11:34:12 +02:00
manuroe
9d1db3f2ec RoomViewController: Fixed crash on 6+: "Starting the app in portrait, then rotate the device in landscaped" made the app crash.
The reason is that in these conditions, there is no selected room. So, self.previewScrollView is nil
2016-04-27 10:41:46 +02:00
manuroe
42a86e4130 Merge pull request #264 from vector-im/vector_246
Fixed #246: universal link on an unjoined room + an event iD is not properly managed
2016-04-26 19:21:35 +02:00
manuroe
00268e0193 Merge pull request #265 from vector-im/vector_225
#225: Ability to copy message permalinks
2016-04-26 19:21:12 +02:00
giomfo
8386d8276b Merge remote-tracking branch 'origin/master' into develop 2016-04-26 18:28:07 +02:00
giomfo
cae3e6ecdb Update CHANGES 2016-04-26 18:11:33 +02:00
giomfo
1f09572321 Merge remote-tracking branch 'origin/release-v0.1.4' 2016-04-26 18:00:17 +02:00
giomfo
77b1bb5999 Prepare vector-ios release v0.1.4 2016-04-26 17:56:30 +02:00