felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-30 21:26:57 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,939 Commits 1 Branch 67 Tags
aa1f5d8aabfc215d502baeb8a4daf2f311711cb9
Commit Graph

11939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gil Eluard aa1f5d8aab Merge pull request #4742 from vector-im/gil/4682_browsing_users_in_a_space 
[Spaces] M10.8 Browsing users in a space #4682
 2021-09-14 17:43:01 +02:00
Gil Eluard d5e0629dcf [Spaces] M10.8 Browsing users in a space #4682 
- Fixed build issue on Jenkins
 2021-09-14 17:22:48 +02:00
Gil Eluard 21f5d73b6f [Spaces] M10.8 Browsing users in a space #4682 
- Update after code review
 2021-09-14 16:59:32 +02:00
Gil Eluard 6caad7f61c [Spaces] M10.8 Browsing users in a space #4682 
- Update after code review
 2021-09-14 15:29:16 +02:00
Gil Eluard aa931a3c1a [Spaces] M10.8 Browsing users in a space #4682 
- Update after code review
 2021-09-14 11:45:33 +02:00
Gil Eluard 9527c2c639 Merge branch 'spaces' into gil/4682_browsing_users_in_a_space 2021-09-13 16:09:53 +02:00
Gil Eluard 1f9d19e86f Merge pull request #4719 from vector-im/gil/4571_explore_rooms 
[Spaces] M10.7 Explore rooms #4571
 2021-09-13 16:05:54 +02:00
Gil Eluard 144a608726 [Spaces] M10.8 Browsing users in a space #4682 
- Update after design review
 2021-09-13 16:03:56 +02:00
Gil Eluard 661242336c Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space 
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
 2021-09-13 10:23:21 +02:00
Gil Eluard 8b53599ac9 [Spaces] M10.7 Explore rooms #4571 
- Update after code review
 2021-09-13 10:06:36 +02:00
Gil Eluard 665e5726ca [Spaces] M10.8 Browsing users in a space #4682 
- Update after design review
 2021-09-02 11:24:07 +03:00
Gil Eluard 15da1e4ff8 [Spaces] M10.8 Browsing users in a space #4682 
- Update after design review
 2021-09-02 10:17:09 +03:00
Gil Eluard 6aa9f0f5c7 [Spaces] M10.8 Browsing users in a space #4682 
- Renamed coordinators
 2021-09-02 09:34:25 +03:00
Gil Eluard 8bf8b5d99e Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space 
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
 2021-09-02 07:51:55 +03:00
Gil Eluard 26b4344fe1 [Spaces] M10.7 Explore rooms #4571 
- Update after review
 2021-09-01 18:12:08 +03:00
Gil Eluard b85ad68591 [Spaces] M10.8 Browsing users in a space #4682 
- Present space members screen from people tab if space has been selected
 2021-08-22 09:23:58 +03:00
Gil Eluard 3c39228618 [Spaces] M10.8 Browsing users in a space #4682 
- Added navigation to member detail page
 2021-08-22 08:48:54 +03:00
Gil Eluard 33f7b26b4d Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space 2021-08-16 21:09:47 +02:00
Gil Eluard 9dd957a514 [Spaces] M10.7 Explore rooms #4571 
- Update after design review
 2021-08-16 20:18:59 +02:00
Gil Eluard e70d3bb67c [Spaces] M10.7 Explore rooms #4571 
- Update after design review
 2021-08-16 15:44:44 +02:00
Gil Eluard 9c02c55f84 Merge branch 'spaces' into gil/4571_explore_rooms 2021-08-16 14:00:16 +02:00
Gil Eluard c15028b6a7 Merge pull request #4658 from vector-im/gil/4501_show_suggested_in_room_lists 
[Spaces] M10.5 Show suggested in room lists #4501
 2021-08-16 12:10:57 +02:00
Gil Eluard 8287903a9c [Spaces] Show suggested in room lists #4501 
- Update after code review
 2021-08-16 10:33:10 +02:00
Gil Eluard a6c838df81 [Spaces] Show suggested in room lists #4501 
- Update after code review
 2021-08-16 07:57:30 +02:00
Gil Eluard cd6693f041 [Spaces] M10.7 Explore rooms #4571 
- UI updates after design changes
 2021-08-15 22:18:16 +02:00
Gil Eluard 89d606cc71 Merge branch 'spaces' into gil/4571_explore_rooms 
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
 2021-08-12 17:17:24 +02:00
Gil Eluard 728c777790 Merge branch 'spaces' into gil/4501_show_suggested_in_room_lists 2021-08-12 14:35:25 +02:00
Gil Eluard b3050b2399 Merge pull request #4652 from vector-im/gil/4494_space_menu 
[Spaces] M10.9 Space menu #4494
 2021-08-12 12:21:03 +02:00
Gil Eluard 7f3aa4ebc0 [Spaces] M10.9 Space menu #4494 
- Update after code review
- Fixed some points of design review
 2021-08-12 11:23:47 +02:00
Gil Eluard 7d7ed333fe [Spaces] M10.8 Browsing users in a space #4682 
- Added MVVM classes
- roughly integrated `RoomParticipantsViewController` to the MVVM
 2021-08-10 20:26:27 +02:00
Gil Eluard ab3f17df73 [Spaces] M10.7 Explore rooms #4571 
- Added suggested tag to the explore rooms cell
- Implemented join feature
 2021-08-09 17:05:36 +02:00
Gil Eluard 92a7e680b9 [Spaces] M10.7 Explore rooms #4571 
- Added an room detail screen
 2021-08-06 15:51:51 +02:00
Gil Eluard d49ebdd1e2 [Spaces] M10.7 Explore rooms #4571 
- Added the ability to navigate through subspaces within the Explore Rooms screen
 2021-08-05 17:04:10 +02:00
Gil Eluard 0ec3c8005d [Spaces] M10.7 Explore rooms #4571 
- Implemented navigation between space context menu and Explore Room screen
- Populate Explore rooms screen with the first level of space children
 2021-08-05 14:36:38 +02:00
Gil Eluard 358cd642bb Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists 
# Conflicts:
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
 2021-08-03 22:07:45 +02:00
Gil Eluard 6fa245abce Merge branch 'spaces' into gil/4494_space_menu 2021-08-03 21:23:02 +02:00
Gil Eluard c49fa993f3 Merge branch 'develop' into spaces 
# Conflicts:
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
 2021-08-03 21:22:43 +02:00
Gil Eluard 5e1d2f206a [Spaces] M10.9 Space menu #4494 
- Hide unimplemented actions
 2021-08-03 20:13:47 +02:00
Doug 167177eb00 Merge pull request #4575 from vector-im/doug/2368_allow_silent_notifications 
Replace notifications toggle with a link to the settings app.
 2021-08-03 16:03:30 +01:00
Doug 311d1af210 Merge branch 'develop' into doug/2368_allow_silent_notifications 2021-08-03 16:02:53 +01:00
Gil Eluard 55252c5386 Merge branch 'spaces' into gil/4494_space_menu 2021-08-03 16:49:59 +02:00
manuroe 8aecf7f519 Prepare for new sprint 2021-08-03 15:16:36 +02:00
manuroe 02a583379d Merge branch 'master' into develop 2021-08-03 15:16:32 +02:00
manuroe f615bb4540 Merge branch 'release/1.4.9/master' 2021-08-03 15:16:25 +02:00
manuroe 900b0c75c9 finish version++ 2021-08-03 15:16:25 +02:00
manuroe 04087aa0b2 Merge pull request #4650 from vector-im/release/1.4.9/release 
Release 1.4.9
 2021-08-03 15:15:41 +02:00
manuroe 75b207f41c version++ 2021-08-03 14:44:53 +02:00
manuroe e0187d37fc Merge pull request #4648 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs 
Translations update from Weblate
 2021-08-03 14:23:01 +02:00
manuroe fd64409183 Merge pull request #4647 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Translations update from Weblate
 2021-08-03 14:22:39 +02:00
Weblate 855f4e1710 Merge branch 'origin/develop' into Weblate. 2021-08-03 12:13:48 +00:00