Commit graph

3941 commits

Author SHA1 Message Date
giomfo
9acba2369e Merge pull request #1583 from vector-im/riot_1576
Bug Fix - Local notifications body
2017-10-16 14:59:44 +02:00
Giom Foret
68bac16026 Bug Fix - Local notifications body 2017-10-16 14:58:38 +02:00
Giom Foret
2a9906c003 Bug Fix - Local notifications body
+ Fix #1576: Notifs for named 1:1s don't show the room name, only the sender
+ Remove the room alias from the room name
+ Hide the room name when it is equal to the sender name
+ Consider the actual event date
2017-10-16 14:43:07 +02:00
giomfo
1cb82c1476 Merge pull request #1577 from vector-im/notif_explosion
Bug Fix - Notification explosion on initial sync
2017-10-13 17:14:25 +02:00
Giom Foret
c117ee7531 Bug Fix - Notification explosion on initial sync
Add sanity check: Do not display local notifications during the initial sync.
2017-10-13 17:07:46 +02:00
manuroe
8ce87e78a8 Merge pull request #1573 from vector-im/Do_not_send_empty_report
BugReportVC: Do not send empty report (bis)
2017-10-12 16:39:51 +02:00
manuroe
1539a47fce BugReportVC: Do not send empty report (bis) 2017-10-12 15:42:36 +02:00
giomfo
b90fe84a5b Merge pull request #1572 from vector-im/fix_mentions_only
Do not display the local notification on push when the room is in `me…
2017-10-12 15:02:46 +02:00
Giom Foret
8b78457ff8 Do not display the local notification on push when the room is in mentions only mode.
Only the highlighted push are displayed for this room.
2017-10-12 14:46:20 +02:00
giomfo
6626aa65d1 Merge pull request #1571 from vector-im/fix_mentions_only
Do not display the local notification on push when the room is in `me…
2017-10-12 12:01:30 +02:00
Giom Foret
3b26da7414 Do not display the local notification on push when the room is in mentions only mode.
Only the highlighted push are displayed for this room.
2017-10-12 11:42:10 +02:00
Giom Foret
f94a665af0 Update Podfile to build develop version 2017-10-09 19:47:18 +02:00
giomfo
7098740f46 Merge pull request #1564 from vector-im/callkit
Support Callkit and Pushkit
2017-10-09 18:27:44 +02:00
Giom Foret
bd20877b65 Merge branch 'develop' into callkit
# Conflicts:
#	Riot/AppDelegate.m
2017-10-09 16:23:18 +02:00
Giom Foret
781fd99701 Enable the Share App Extension use 2017-10-09 16:06:22 +02:00
manuroe
7d40e38671 Merge pull request #1561 from vector-im/kill_in_bg
A possible patch to avoid the app being killed in background on iOS11
2017-10-09 12:46:17 +02:00
manuroe
a70aa5b4d6 A possible patch to avoid the app being killed in background on iOS11 (https://github.com/vector-im/riot-ios/issues/1522) 2017-10-09 11:29:53 +02:00
manuroe
3ef952307b Add log for https://github.com/vector-im/riot-ios/issues/1522 2017-10-06 18:05:54 +02:00
manuroe
b92cde9e3e Merge pull request #1550 from vector-im/cancel_event_sending
RoomVC: Add the ability to cancel the sending of a room message and i…
2017-10-06 14:28:22 +02:00
manuroe
a061c24d09 Merge remote-tracking branch 'origin/master' into develop 2017-10-05 15:42:47 +02:00
manuroe
6e4c3bf9ab version ++ 2017-10-05 15:40:28 +02:00
giomfo
334c1236a9 Merge pull request #1556 from vector-im/riot-1554
Fix - Pin rooms with missed notifs and unread msg by default on the h…
2017-10-05 13:46:59 +02:00
Giom Foret
9223766973 Fix - Pin rooms with missed notifs and unread msg by default on the home page
#1554
2017-10-05 13:42:49 +02:00
manuroe
4cf2d2ad1f Merge pull request #1553 from vector-im/fix_ram_usage_peak
EventFormatter: Improve updateRoomSummary:withStateEvents: to avoid t…
2017-10-05 09:45:41 +02:00
manuroe
86d4765fd8 Log applicationDidReceiveMemoryWarning at AppDelegate level 2017-10-05 09:36:40 +02:00
manuroe
34056cefd3 EventFormatter: Improve updateRoomSummary:withStateEvents: to avoid to compute room avatar & displayname on almost every state events.
When initialsyncing with big rooms, the previous implementation leaded the app to out of memory because ARC did not have time to auto release objects (mainly objects returned by MXRoomState.members).
2017-10-05 09:34:17 +02:00
Giom Foret
7801cabe32 Merge branch 'master' into callkit
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
#	Riot/AppDelegate.m
#	Riot/ViewController/SettingsViewController.m
2017-10-04 13:04:21 +02:00
Giom Foret
6bc09c58e1 Add missing marketing icon 2017-10-04 12:25:49 +02:00
Giom Foret
08b2d39aeb version ++ 2017-10-04 11:23:05 +02:00
manuroe
b227743240 Merge pull request #1552 from vector-im/rageshake_setting
Rageshake: Add a setting to enable (disable) it.
2017-10-04 11:17:42 +02:00
manuroe
d7ee7dbf79 Rageshake: Add a setting to enable (disable) it.
https://github.com/vector-im/riot-ios/issues/1387
https://github.com/vector-im/riot-ios/issues/535

There is also a new "Do not ask again" button in the rageshake popup as a shortcut for this setting.
2017-10-04 11:09:02 +02:00
giomfo
412cd43ea7 Merge pull request #1551 from vector-im/fix_wrong_empty_room_name
Bug Fix - Some rooms have gone nameless after upgrade
2017-10-04 09:20:21 +02:00
Giom Foret
c338553e2c Bug Fix - Some rooms have gone nameless after upgrade
https://github.com/matrix-org/riot-ios-rageshakes/issues/388
2017-10-03 18:53:05 +02:00
Giom Foret
6a99afeb02 version ++ 2017-10-03 16:11:21 +02:00
manuroe
2cd8bc8b89 RoomVC: Add the ability to cancel the sending of a room message and improve the cancellation of a media upload 2017-10-03 14:57:32 +02:00
manuroe
7e9c4c0356 Merge pull request #1549 from vector-im/enable_jitsi_by_default
Jitsi: Enable the "Create conference calls with jitsi" settings by default
2017-10-03 13:48:47 +02:00
manuroe
78d4d55f8b Jitsi: Enable the "Create conference calls with jitsi" settings by default 2017-10-03 13:17:07 +02:00
Giom Foret
0e30b13b78 Language: Enable Basque and Chinese (Simplified). 2017-10-03 13:04:54 +02:00
giomfo
6f468e6fb1 Merge pull request #1548 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Update from Weblate.
2017-10-03 12:43:36 +02:00
giomfo
4bfa7d1309 Merge pull request #1547 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Update from Weblate.
2017-10-03 12:43:11 +02:00
giomfo
d3507dccec Merge pull request #1546 from RiotTranslateBot/weblate-riot-ios-riot-ios
Update from Weblate.
2017-10-03 12:42:52 +02:00
Giom
941e4eefc8 Translated using Weblate (Basque)
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot iOS/Riot iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/eu/
2017-10-03 10:38:21 +00:00
Giom
fea6a7a12e Translated using Weblate (Basque)
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot iOS/Riot iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/eu/
2017-10-03 10:30:50 +00:00
Weblate
8b254d82cc Merge remote-tracking branch 'origin/develop' into develop 2017-10-03 10:21:16 +00:00
Kévin C
2322ec0eff Translated using Weblate (French)
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot iOS/Riot iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/fr/
2017-10-03 10:21:08 +00:00
Weblate
66685b2deb Merge remote-tracking branch 'origin/develop' into develop 2017-10-03 10:20:35 +00:00
Kévin C
29e83fda1d Translated using Weblate (French)
Currently translated at 100.0% (4 of 4 strings)

Translation: Riot iOS/Riot iOS (Dialogs)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-dialogs/fr/
2017-10-03 10:20:30 +00:00
Weblate
d382dba0d6 Merge remote-tracking branch 'origin/develop' into develop 2017-10-03 10:18:13 +00:00
manuroe
fd4101b677 Pod: Update realm & GDBDeviceInfo 2017-10-02 17:18:16 +02:00
David Baker
5c0b1ced99 allowProvisioningUpdates just makes it timeout 2017-09-29 22:15:41 +01:00