1. 10 Feb, 2016 2 commits
  2. 09 Feb, 2016 2 commits
  3. 08 Feb, 2016 1 commit
  4. 06 Feb, 2016 1 commit
  5. 05 Feb, 2016 3 commits
  6. 04 Feb, 2016 8 commits
  7. 03 Feb, 2016 2 commits
  8. 02 Feb, 2016 2 commits
  9. 01 Feb, 2016 2 commits
  10. 30 Jan, 2016 1 commit
  11. 29 Jan, 2016 3 commits
  12. 28 Jan, 2016 1 commit
    • Jisi Liu's avatar
      Undo the Java module change for integration. · cb3f4288
      Jisi Liu authored
      Moving the files to their original location, so that opensource changes
      can be picked during the internal merge. Those files will be moved into
      the correct location after merging with internal code.
      
      Note: do NOT merge this into master without the other internal
      down-integration commit.
      cb3f4288
  13. 26 Jan, 2016 1 commit
  14. 22 Jan, 2016 4 commits
  15. 21 Jan, 2016 5 commits
  16. 20 Jan, 2016 2 commits
    • Jon Skeet's avatar
      Ensure that FieldMask, Timestamp and Duration ToString() calls don't throw · dd43dcca
      Jon Skeet authored
      The usage of ICustomDiagnosticMessage here is non-essential - ToDiagnosticString
      doesn't actually get called by ToString() in this case, due to JsonFormatter code. It was
      intended to make it clearer that it *did* have a custom format... but then arguably I should
      do the same for Value, Struct, Any etc.
      
      Moving some of the code out of JsonFormatter and into Duration/Timestamp/FieldMask likewise
      feels somewhat nice, somewhat nasty... basically there are JSON-specific bits of formatting, but
      also domain-specific bits of computation. <sigh>
      
      Thoughts welcome.
      dd43dcca
    • Jan Tattermusch's avatar
      Merge pull request #1096 from jskeet/custom-to-string · 8c5260b2
      Jan Tattermusch authored
      Introduce ICustomDiagnosticMessage to allow for custom string formatting
      8c5260b2