Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Merge 4.47.0 into single-server #5613

Closed
wants to merge 204 commits into from
Closed

chore: Merge 4.47.0 into single-server #5613

wants to merge 204 commits into from

Conversation

diegolmello
Copy link
Member

Proposed changes

Issue(s)

How to test or reproduce

Screenshots

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves a current function)
  • New feature (non-breaking change which adds functionality)
  • Documentation update (if none of the other choices apply)

Checklist

  • I have read the CONTRIBUTING doc
  • I have signed the CLA
  • Lint and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works (if applicable)
  • I have added necessary documentation (if applicable)
  • Any dependent changes have been merged and published in downstream modules

Further comments

diegolmello and others added 30 commits March 11, 2020 14:32
@diegolmello
Create single-server
6e66897
@diegolmello
[FIX] Remove Code Signing Identity
2e740ee
@diegolmello
Merge branch 'develop' into single-server-2
26209a1
@diegolmello
Import app group from app.json
1a4161e
@diegolmello
Remove universal URL
91ef492
@diegolmello
Move appStoreID to app.json
f1fb77b
@diegolmello
Set default config on gradle.properties
5acc509
@diegolmello
Signing config on gradle.properties
19d726d
@diegolmello
Remove google-services
ff99da7
@diegolmello
Remove debug from android
2b046a2
@diegolmello
Remove select server from share extension
2651c97
@diegolmello
Merge branch 'develop' into single-server
c1d42d3 
# Conflicts:
#	android/app/build.gradle
#	android/app/src/debug/res/values/strings.xml
#	app/index.js
#	app/sagas/login.js
#	ios/RocketChatRN.xcodeproj/project.pbxproj
@diegolmello
Merge branch 'develop' into single-server
f872d8a 
# Conflicts:
#	android/app/build.gradle
@diegolmello
Merge branch 'develop' into single-server
3eb4545 
# Conflicts:
#	android/app/build.gradle
#	android/gradle.properties
#	app/sagas/init.js
#	app/sagas/login.js
#	ios/RocketChatRN.xcodeproj/project.pbxproj
@diegolmello
Merge branch 'develop' into single-server
b456e77 
# Conflicts:
#	android/app/build.gradle
#	app/index.js
#	app/sagas/init.js
#	app/sagas/login.js
#	app/views/RoomsListView/Header/Header.ios.js
#	ios/RocketChatRN.xcodeproj/project.pbxproj
@diegolmello
Merge branch 'develop' into single-server
c62346f 
# Conflicts:
#	android/app/build.gradle
#	app/views/RoomsListView/Header/Header.ios.js
@diegolmello
Add whitelabel docs
839ce6c
@diegolmello
Merge branch 'develop' into single-server
4e437e3 
# Conflicts:
#	README.md
#	android/app/src/debug/AndroidManifest.xml
#	android/gradle.properties
#	app/views/RoomsListView/Header/Header.js
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/RocketChatRN.entitlements
@diegolmello
Remove pods
8cfd9d3
@ceefour
fix: error 'root' is defined but never used no-unused-vars (#2460)
d90148f 
/workspace/Rocket.Chat.ReactNative/app/stacks/OutsideStack.js
  24:26  error  'root' is defined but never used  no-unused-vars
@diegolmello
Merge branch 'develop' into single-server
5e633e5 
# Conflicts:
#	android/app/build.gradle
#	android/app/src/play/google-services.json
#	app/lib/database/index.js
#	app/sagas/init.js
#	app/sagas/login.js
#	ios/Pods/Manifest.lock
#	ios/Pods/Pods.xcodeproj/project.pbxproj
#	ios/Pods/Target Support Files/MMKV/MMKV-prefix.pch
#	ios/Pods/Target Support Files/MMKV/MMKV.debug.xcconfig
#	ios/Pods/Target Support Files/MMKV/MMKV.release.xcconfig
#	ios/Pods/Target Support Files/MMKVCore/MMKVCore.debug.xcconfig
#	ios/Pods/Target Support Files/MMKVCore/MMKVCore.release.xcconfig
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-acknowledgements.markdown
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-acknowledgements.plist
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.debug.xcconfig
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.release.xcconfig
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.markdown
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.plist
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.debug.xcconfig
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.release.xcconfig
#	ios/Pods/Target Support Files/RNConfigReader/RNConfigReader.debug.xcconfig
#	ios/Pods/Target Support Files/RNConfigReader/RNConfigReader.release.xcconfig
#	ios/Pods/Target Support Files/react-native-cookies/react-native-cookies.debug.xcconfig
#	ios/Pods/Target Support Files/react-native-simple-crypto/react-native-simple-crypto.debug.xcconfig
#	ios/RocketChatRN.xcodeproj/project.pbxproj
@diegolmello
Merge branch 'develop' into single-server
59bc3e8 
# Conflicts:
#	android/app/build.gradle
#	app/sagas/login.js
@diegolmello
Merge branch 'develop' into update-single-server
e1b774a 
# Conflicts:
#	android/app/build.gradle
@diegolmello
Merge branch 'develop' into single-server
3ddbe6c 
# Conflicts:
#	android/app/build.gradle
#	android/gradle.properties
#	ios/Pods/Pods.xcodeproj/project.pbxproj
#	ios/RocketChatRN.xcodeproj/project.pbxproj
@diegolmello
Merge branch 'develop' into single-server
edd4c5b
@diegolmello
Merge branch 'develop' into single-server
f0ee2d6
@sadeghpro
[FIX] APPLICATION_ID typo (#2729)
f7c463b
@sadeghpro
[FIX] Cast VERSIONCODE to integer (#2732)
ba4d385
@diegolmello
Merge branch 'develop' into single-server
e929638
@diegolmello
Merge branch 'develop' into single-server
2bdfdba 
# Conflicts:
#	ios/RocketChatRN.xcodeproj/project.pbxproj
diegolmello and others added 26 commits June 19, 2023 10:15
@diegolmello
yarn
873de7f
@dnlsilva @diegolmello
fix: Calls with jwt not working on ios and fix media permission on iOS (
525c7f8 
#5075)

* fix roomId

* fix ios permission

* update lib and patch

* try

* update webview

* update method

* fix ios

* move to a function
@diegolmello
Merge branch 'single-server' into 4.40.0-single-server
eb2dff9 
# Conflicts:
#	android/app/build.gradle
#	app/containers/UIKit/VideoConferenceBlock/components/StartACallActionSheet.tsx
#	app/lib/hooks/useVideoConf.tsx
#	app/lib/methods/search.ts
#	app/stacks/OutsideStack.tsx
#	app/views/JitsiMeetView.tsx
#	e2e/helpers/app.ts
#	e2e/tests/room/01-createroom.spec.ts
#	e2e/tests/room/02-room.spec.ts
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json
#	yarn.lock
@diegolmello
chore: Merge 4.40.0 into single-server (#5192)
2379e88
@diegolmello
Merge branch 'develop' into single-server-4.41.0
68f5eab 
# Conflicts:
#	app/views/RoomsListView/Header/Header.tsx
@diegolmello
Merge 4.41.0 into single-server (#5256)
36e9665
@diegolmello
Merge branch 'single-server' into single-server-4.42.0
b6c8327 
# Conflicts:
#	app/views/RoomsListView/Header/Header.tsx
@diegolmello
fix: some details on supported versions (#5284)
cd01ce7 
* Ignore patches

* Fix null versions find

* Fix cloud request

* Fix inverted date comparison to trigger action sheet
@diegolmello
feat: Cache supported versions timestamp to fetch from cloud once eve…
1369581 
…ry 12h (#5292)
@dnlsilva @diegolmello
fix: fixes the import of the serverInfo function (#5295)
9273241
@diegolmello
fix: minor supported versions details (#5296)
5011eb3
@diegolmello
Merge 4.42.0 into single-server (#5283)
76f8142
@diegolmello
fix: Catch cloud request errors (#5312)
45003de
@diegolmello
Merge branch 'develop' into 4.43.0-single-server
d1fc586
@diegolmello
chore: Merge 4.43.0 into single server (#5354)
d529208
@diegolmello
chore: Merge 4.44.0 into single-server (#5409)
0f96db8
@diegolmello
Merge branch 'single-server' into 4.44.1-single-server
cd038ac 
# Conflicts:
#	android/app/build.gradle
#	app/i18n/index.ts
#	app/sagas/init.js
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json
#	yarn.lock
@diegolmello
chore: Merge 4.44.1 into single-server (#5434)
a76aa77
@diegolmello
chore: Merge 4.44.2 into single-server (#5439)
2f4139d
@diegolmello
chore: Merge 4.45.0 into single-server (#5483)
5766336
@diegolmello
chore: Merge 4.46.0 into single-server (#5512)
21b3b7a
@diegolmello
feat: button to refresh cloud data on support window expired screen (#…
9b9edd9 
…5528)
@diegolmello
fix: Disconnect from server when on expired support window screen (#5529
3797205 
)
@diegolmello
Bump version to 4.46.1
8a65388
@diegolmello
chore: Merge 4.46.1 into single-server (#5542)
5e9aa95
@diegolmello
Merge branch 'single-server' into 4.47.0-single-server
5df4afb 
# Conflicts:
#	android/app/build.gradle
#	app/i18n/locales/en.json
#	app/i18n/locales/pt-BR.json
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json
@diegolmello diegolmello deleted the 4.47.0-single-server branch March 11, 2024 20:16
@diegolmello diegolmello restored the 4.47.0-single-server branch March 11, 2024 20:16
@diegolmello diegolmello deleted the 4.47.0-single-server branch March 12, 2024 13:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.