Adam Cozzette
f3192d6128
Update protobuf version
2020-11-13 11:27:32 -08:00
Adam Cozzette
1b851b3fe6
Update protobuf version
2020-11-12 12:44:26 -08:00
Adam Cozzette
a8ab1fade9
Update protobuf version
2020-11-10 17:15:32 -08:00
Adam Cozzette
27100b40fd
Update protobuf version
2020-11-05 14:30:53 -08:00
Joshua Haberman
aefc1e7670
Merge tag 'refs/tags/sync-piper' into sync-stage
...
# Conflicts:
# conformance/failure_list_js.txt
# src/google/protobuf/generated_message_reflection.h
2020-09-28 11:55:10 -07:00
Joshua Haberman
38d6de1eef
Sync from Piper @334206209
...
PROTOBUF_SYNC_PIPER
2020-09-28 11:54:54 -07:00
Masaki Hara
f5bdd7cd56
JS: parse (un)packed fields conditionally ( #7379 )
2020-08-31 13:30:23 -07:00
Joshua Haberman
32a94ce353
Merge tag 'refs/tags/sync-piper' into sync-stage
...
# Conflicts:
# csharp/src/Google.Protobuf.Test/testprotos.pb
2020-08-17 15:26:33 -07:00
Joshua Haberman
95e6c5b474
Sync from Piper @327110949
...
PROTOBUF_SYNC_PIPER
2020-08-17 15:26:13 -07:00
Adam Cozzette
58f4260e8e
Merged 3.13.x into master
2020-08-17 11:06:11 -07:00
Adam Cozzette
fde7cf7358
Update protobuf version
2020-08-14 15:20:53 -07:00
Adam Cozzette
98c2e69f8c
Update protobuf version
2020-08-12 14:49:20 -07:00
Peter Newman
e2cc2de304
Fix lots of spelling errors ( #7751 )
...
* Fix a typo
* Fix lots of spelling errors
* Fix a few more spelling mistakes
* s/parsable/parseable/
* Don't touch the third party files
* Cloneable is the preferred C# term
* Copyable is the preferred C++ term
* Revert "s/parsable/parseable/"
This reverts commit 534ecf7675
.
* Revert unparseable->unparsable corrections
2020-08-10 11:08:25 -07:00
Adam Cozzette
1c587a8059
Updated version to 3.13.0-rc2
2020-08-07 14:44:49 -07:00
Adam Cozzette
8940150706
Updated version to 3.13.0-rc1.
2020-08-07 14:44:49 -07:00
Joshua Haberman
6ba52411d0
Sync from Piper @320514613
...
PROTOBUF_SYNC_PIPER
2020-07-09 18:17:47 -07:00
Anton Kast
4d6712e739
Enable experimental presence detection in JS. ( #7592 )
...
Co-authored-by: David L. Jones <dlj@google.com>
2020-06-05 16:39:02 -07:00
Joshua Haberman
b971243fe0
Merge branch '3.12.x' into merge-release-branch
2020-06-02 13:24:30 -07:00
Joshua Haberman
183cdec7cd
Sync from Piper @314226556
...
PROTOBUF_SYNC_PIPER
2020-06-01 16:32:31 -07:00
Joshua Haberman
9ce8c330e7
Updated version to 3.12.3 and updated CHANGES.txt. ( #7580 )
...
* Updated version to 3.12.3 and updated CHANGES.txt.
* Re-ran generate_descriptor_protos.sh and made it more parallel.
2020-06-01 13:36:50 -07:00
Joshua Haberman
c077d949d8
Merge branch '3.12.x' into merge-312
2020-05-26 16:45:43 -07:00
Joshua Haberman
beeb621f50
Update protobuf version ( #7557 )
2020-05-26 15:46:39 -07:00
Joshua Haberman
0a737d8eb0
Sync from Piper @313142438
...
PROTOBUF_SYNC_PIPER
2020-05-26 00:26:15 -07:00
Joshua Haberman
6ad138d85a
Update protobuf version ( #7535 )
2020-05-20 10:54:29 -07:00
Joshua Haberman
9952e36f92
Merge release branch into master. ( #7517 )
...
* Added background information about proto3 presence. (#7501 )
* Fixed bug in map key sorting for Java TextFormat. (#7508 )
Fixes: https://github.com/protocolbuffers/protobuf/issues/7505
* Update protobuf version
* Added a changelog entry about the Java fix. (#7516 )
2020-05-16 16:42:02 -07:00
Joshua Haberman
e90b71cdee
Update protobuf version
2020-05-15 13:28:07 -07:00
Protobuf Team
63da77bc97
Project import generated by Copybara
...
PiperOrigin-RevId: 311748964
2020-05-15 09:55:02 -07:00
Joshua Haberman
62ab8333c9
Merge branch '3.12.x' into merge-312-branch
2020-05-12 16:59:55 -07:00
Joshua Haberman
f597a24627
Update protobuf version
2020-05-12 12:49:46 -07:00
Joshua Haberman
6b5fb807c0
Sync from Piper @310858019
...
PROTOBUF_SYNC_PIPER
2020-05-11 00:12:20 -07:00
Daniel Kurka
bb3460d71b
Project import generated by Copybara
...
PiperOrigin-RevId: 310614231
2020-05-08 13:06:41 -07:00
Daniel Kurka
ed596ef68d
Project import generated by Copybara
...
PiperOrigin-RevId: 310497816
2020-05-07 21:53:47 -07:00
Joshua Haberman
a9f11d7d64
Updated version to 3.12.0-rc1. ( #7449 )
2020-04-30 15:34:10 -07:00
Joshua Haberman
c649397029
Set execute bit on files if and only if they begin with (#!). ( #7347 )
...
* Set execute bit on files if and only if they begin with (#!).
Git only tracks the 'x' (executable) bit on each file. Prior to this
CL, our files were a random mix of executable and non-executable.
This change imposes some order by making files executable if and only
if they have shebang (#!) lines at the beginning.
We don't have any executable binaries checked into the repo, so
we shouldn't need to worry about that case.
* Added fix_permissions.sh script to set +x iff a file begins with (#!).
2020-04-01 15:28:25 -07:00
Joshua Haberman
b99994d994
Sync from Piper @304070343
...
PROTOBUF_SYNC_PIPER
2020-03-31 16:25:37 -07:00
Rafi Kamal
da1c46401b
Project import generated by Copybara
...
PiperOrigin-RevId: 301311140
2020-03-16 23:09:45 -07:00
Rafi Kamal
422053f3bc
Project import generated by Copybara
...
PiperOrigin-RevId: 300708221
2020-03-13 00:58:26 -07:00
Protobuf Team
94b39efdf7
Project import generated by Copybara
...
PiperOrigin-RevId: 300369497
2020-03-11 11:31:16 -07:00
Rafi Kamal
637d7eda30
Project import generated by Copybara
...
PiperOrigin-RevId: 300117791
2020-03-10 10:08:50 -07:00
Rafi Kamal
4fa3c8e883
Project import generated by Copybara
...
PiperOrigin-RevId: 299970447
2020-03-09 17:00:42 -07:00
Rafi Kamal
64f151fa2b
Project import generated by Copybara
...
PiperOrigin-RevId: 298409332
2020-03-02 11:59:44 -08:00
Daniel Kurka
ed19442270
Project import generated by Copybara
...
PiperOrigin-RevId: 297743020
2020-02-27 18:55:33 -08:00
Rafi Kamal
9bbc664671
Project import generated by Copybara
...
PiperOrigin-RevId: 297709554
2020-02-27 15:55:57 -08:00
Protobuf Team
d2727a2ce3
Project import generated by Copybara
...
PiperOrigin-RevId: 297637283
2020-02-27 10:55:04 -08:00
Artem Kustikov
743a4322ba
Fix js message pivot selection ( #6813 )
...
* fix javascript setFieldIgnoringDefault_ logic
* remove package-lock.json
* fix build script to include new UT asset file
Co-authored-by: Daniel Kurka <kurka.daniel@gmail.com>
2020-02-27 09:10:16 -08:00
Rafi Kamal
0eb476b696
Merge branch 3.11.x to master
2020-02-18 16:42:47 -08:00
rafikamal
83b47e4c65
Project import generated by Copybara
...
PiperOrigin-RevId: 294283216
2020-02-13 15:48:49 -08:00
rafikamal
becf5afd34
Project import generated by Copybara
...
PiperOrigin-RevId: 293911829
2020-02-13 15:48:41 -08:00
rafikamal
46b0fd9cec
Project import generated by Copybara
...
PiperOrigin-RevId: 293893031
2020-02-13 15:48:34 -08:00
Rafi Kamal
c74057267d
Update protobuf version ( #7206 )
2020-02-12 14:41:16 -08:00