Adam Gleitman
|
3e0ced8068
|
Merge commit '7b82df287d36e39073d29e3ae3adbe82cf424055' into amgleitman/0.64-merge-head
|
2021-09-21 18:28:23 -07:00 |
|
Adam Gleitman
|
1ada7828c5
|
Merge pull request #830 from amgleitman/amgleitman/0.64-merge-2020-09-15
Merge from upstream through 2020-09-15
|
2021-09-21 17:59:53 -07:00 |
|
Adam Gleitman
|
b8d5b85590
|
Update Android patch files
|
2021-09-21 14:12:47 -07:00 |
|
Adam Gleitman
|
7da0b24c58
|
import RNTesterExampleModuleItem in AlertMacOSExample.js
|
2021-09-21 13:55:51 -07:00 |
|
Adam Gleitman
|
0af7945d9a
|
Merge commit '2103839525444f40e0a802fac8bb74126d7a1379' into amgleitman/0.64-merge-head
|
2021-09-21 13:22:54 -07:00 |
|
Adam Gleitman
|
ccfa0f0246
|
Merge commit '4d920fe7c991eaec61d229a71df30b0f6c446d38' into amgleitman/0.64-merge-head
|
2021-09-21 12:22:27 -07:00 |
|
Adam Gleitman
|
cbf1614494
|
Merge branch 'master' into amgleitman/0.64-merge-head
|
2021-09-20 19:00:01 -07:00 |
|
Adam Gleitman
|
eeb18e98a1
|
Merge pull request #829 from amgleitman/amgleitman/0.64-merge-2020-08-31
Merge from upstream through 2020-08-31
|
2021-09-20 18:54:37 -07:00 |
|
Adam Gleitman
|
cc9e436ba9
|
Merge commit '6581c77d0a975413c802a2731bac1d38903bd0dd' into amgleitman/0.64-merge-head
|
2021-09-20 18:54:25 -07:00 |
|
Adam Gleitman
|
73a05a1658
|
Merge commit 'abb6433f506851430dffb66f0dd34c1e70a223fe' into amgleitman/0.64-merge-head
|
2021-09-20 17:44:47 -07:00 |
|
Adam Gleitman
|
34c1dfa88b
|
Merge pull request #828 from amgleitman/amgleitman/android-patch-script
Add a script that lists android-patch files that may need to be updated when merging with upstream
|
2021-09-20 15:26:27 -07:00 |
|
Adam Gleitman
|
c9c2f135a5
|
Fix RNTester file path in android-pr.yml
|
2021-09-20 15:09:13 -07:00 |
|
Adam Gleitman
|
2aec2f3fb5
|
FIx Android patch files
|
2021-09-20 15:02:27 -07:00 |
|
Adam Gleitman
|
723a647856
|
More RNTester -> packages/rn-tester stuff
|
2021-09-17 17:59:47 -07:00 |
|
Adam Gleitman
|
eda46e3bc9
|
Fix RNTester folder name in CI checks
|
2021-09-17 17:47:22 -07:00 |
|
Adam Gleitman
|
b30cc009be
|
Upgrade RNTester to use detox 16.7.2
|
2021-09-17 17:31:09 -07:00 |
|
Adam Gleitman
|
66e61edce1
|
Merge commit '93e7a7a70dc2f41fccd3c1e4cce80d92913c4243' into amgleitman/0.64-merge-head
|
2021-09-16 18:53:41 -07:00 |
|
Adam Gleitman
|
b10c9451c9
|
Merge commit '1270873ed65ae32596c3094a3a9e165bb61c5ce1' into amgleitman/0.64-merge-head
|
2021-09-16 15:39:25 -07:00 |
|
Adam Gleitman
|
28190f9b67
|
Merge commit '9b973f32e4d81713a10a186e42ee57d6e1d414d3' into amgleitman/0.64-merge-head
|
2021-09-15 18:35:12 -07:00 |
|
Adam Gleitman
|
9eafbd048a
|
Merge commit '1d05d46e6447372580bb6ea81fb340bb2fe46d13' into amgleitman/0.64-merge-head
|
2021-09-15 14:11:04 -07:00 |
|
Adam Gleitman
|
0fe98d0d60
|
Merge commit '12543d557f00545a719b4dfd76cc0d0adfa37a01' into amgleitman/0.64-merge-head
|
2021-09-14 17:14:50 -07:00 |
|
Adam Gleitman
|
81d051d209
|
FIx RNTester package names so snapshot unit tests pass
|
2021-09-14 16:26:01 -07:00 |
|
Adam Gleitman
|
ecda000ed7
|
Merge commit '63992c0b96ec45e4dfb37eaea8535c06833ab298' into amgleitman/0.64-merge-head
|
2021-09-13 17:26:51 -07:00 |
|
Adam Gleitman
|
182f6a732f
|
Merge commit 'f8e5423c898761445a190e8cef6c1a8bc0b5ebaa' into amgleitman/0.64-merge-head
|
2021-09-13 13:22:50 -07:00 |
|
Adam Gleitman
|
bfbcee665d
|
Merge commit 'bdbb040382d2149d28891af50e320990a57c622a' into amgleitman/0.64-merge-head
|
2021-09-13 12:17:21 -07:00 |
|
Adam Gleitman
|
17c7c14142
|
Merge commit '3f773678838fcc01fac09883aa951e81e1ae4387' into amgleitman/0.64-merge-head
|
2021-09-09 14:15:57 -07:00 |
|
Adam Gleitman
|
d50729086c
|
Merge commit 'f3930a93d5cf5f19058b0bfe453c7b9324eb8552' into amgleitman/0.64-merge-head
|
2021-09-09 14:15:42 -07:00 |
|
Adam Gleitman
|
6d0b5e8842
|
Merge commit 'eecb9302220e52b9850b3217366c16c386bb1789' into amgleitman/0.64-merge-head
|
2021-09-09 13:31:19 -07:00 |
|
Adam Gleitman
|
c89d5dc324
|
Merge branch 'master' into amgleitman/0.64-merge-head
|
2021-09-09 11:52:41 -07:00 |
|
Adam Gleitman
|
6062509762
|
Merge branch 'master' into amgleitman/0.64-merge-head
|
2021-09-09 11:49:17 -07:00 |
|
Adam Gleitman
|
9062de8262
|
Merge branch 'master' into amgleitman/android-patch-script
|
2021-09-08 15:58:45 -07:00 |
|
Adam Gleitman
|
fb5aba619a
|
Merge pull request #826 from amgleitman/amgleitman/0.64-merge-2020-08-16
Merge from upstream through 2020-08-16
|
2021-09-08 15:55:10 -07:00 |
|
Adam Gleitman
|
c15e2ac349
|
Fix Android patch files
|
2021-09-07 17:40:44 -07:00 |
|
Adam Gleitman
|
5ef19498f6
|
Sort patch names in android-patch.py output
|
2021-09-07 14:40:56 -07:00 |
|
Adam Gleitman
|
35ef40b005
|
Group output of android-patch.py by patch folder
|
2021-09-07 13:39:12 -07:00 |
|
Adam Gleitman
|
4087e3d45f
|
Merge branch 'amgleitman/0.64-merge-2020-08-16' into amgleitman/android-patch-script
|
2021-09-07 13:15:14 -07:00 |
|
Adam Gleitman
|
1cc8193307
|
Remove hard-coding of commits in android-patch.py
|
2021-09-07 13:15:01 -07:00 |
|
Adam Gleitman
|
683b89a2bd
|
Merge commit '4f94d7da8197c98db5927d9b5ee350db7a6a2eeb' into amgleitman/0.64-merge-head
|
2021-09-03 17:23:25 -07:00 |
|
Adam Gleitman
|
fe38dbc9c8
|
Merge commit '79f305e563fab2b4b484f36c0b34f8e54f458a95' into amgleitman/0.64-merge-head
|
2021-09-03 15:50:28 -07:00 |
|
Adam Gleitman
|
777bcaf450
|
Merge pull request #825 from amgleitman/amgleitman/0.64-merge-2020-07-31
Merge from upstream through 2020-07-31
|
2021-09-03 14:03:04 -07:00 |
|
Adam Gleitman
|
2dfcf658bf
|
Merge commit 'c8f571fdad9d632ab618d53520b4365d4e464423' into amgleitman/0.64-merge-head
|
2021-09-03 13:52:33 -07:00 |
|
Adam Gleitman
|
23693a47f2
|
Merge commit '94d00786534a5b2819430a9642bce04bd6f4d2fa' into amgleitman/0.64-merge-head
|
2021-09-03 13:17:15 -07:00 |
|
Adam Gleitman
|
0970acdb94
|
Merge commit 'e0e33fce531e8faef1922b47321706792fbd9ed9' into amgleitman/0.64-merge-head
|
2021-09-01 18:14:01 -07:00 |
|
Adam Gleitman
|
7acf9edcf5
|
Merge commit 'e1fa53af2eabc483be2f196ca96bbcd4a8226809' into amgleitman/0.64-merge-head
|
2021-09-01 18:12:47 -07:00 |
|
Adam Gleitman
|
b756416539
|
Merge commit '9b11cb6f1f68f919684de0e4ceb926961c26b998' into amgleitman/0.64-merge-head
|
2021-09-01 17:30:37 -07:00 |
|
Adam Gleitman
|
87e9d52b6e
|
Merge commit '476ab7481e23070fc4db3f584e45a95eb2f9f7e1' into amgleitman/0.64-merge-head
|
2021-09-01 15:10:00 -07:00 |
|
Adam Gleitman
|
708495dbfd
|
Merge commit '4409642811c787052e0baeb92e2679a96002c1e3' into amgleitman/0.64-merge-head
|
2021-09-01 14:10:33 -07:00 |
|
Adam Gleitman
|
c5c2dd4015
|
Merge commit '050a7dd019be435b848de0a86030599d83f8791d' into amgleitman/0.64-merge-head
|
2021-08-31 13:58:35 -07:00 |
|
Adam Gleitman
|
bd800a180d
|
Merge commit 'a77f2c40d1044da63426078f356cfc7c1284a79e' into amgleitman/0.64-merge-head
|
2021-08-31 13:44:36 -07:00 |
|
Adam Gleitman
|
554ba2e4ea
|
Merge in 0b68f3cf77 and a4757d2823 (finally!)
|
2021-08-31 13:00:36 -07:00 |