Skip to content
This repository was archived by the owner on Jan 12, 2018. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mikemaccana/python-docx
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Hybrid-Force/python-docx
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 17 commits
  • 9 files changed
  • 2 contributors

Commits on Jul 28, 2012

  1. modified paragraph, search and replace, relationship... 

    Add multi-line text support to paragraph. Different lines are splited
into different <w:r>s.
Modified paragraph to support more complicated style like color and font
size.
Improved advSearch and advReplace algorithem.
Support extracting relation and contenttype form .docx file
Add findElementByText function
    @Hybrid-Force
    Hybrid-Force committed Jul 28, 2012
    Configuration menu
    Copy the full SHA
    a9500ad View commit details
    Browse the repository at this point in the history

  2. Revert "modified paragraph, search and replace, relationship..." 

    This reverts commit a9500ad.
    @Hybrid-Force
    Hybrid-Force committed Jul 28, 2012
    Configuration menu
    Copy the full SHA
    d34d5e4 View commit details
    Browse the repository at this point in the history

  3. modified paragraph, search and replace, relationship, etc. 

    Add multi-line text support to paragraph. Different lines are splited
into different <w:r>s.
Modified paragraph to support more complicated style like color and font
size.
Improved advSearch and advReplace algorithem.
Support extracting relation and contenttype form .docx file.
Add findElementByText function.
Mistakely set the line ending to Windows in the last commit... :P
    @Hybrid-Force
    Hybrid-Force committed Jul 28, 2012
    Configuration menu
    Copy the full SHA
    2c58132 View commit details
    Browse the repository at this point in the history

  4. Add multi-line support to advReplace 

    Limit advReplace to accept string because previous code has bug when
replacing etree elements.
Different line are split into different <w:r>s.
    @Hybrid-Force
    Hybrid-Force committed Jul 28, 2012
    Configuration menu
    Copy the full SHA
    dc159fe View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2012

  1. some table customization for my own purposes (row height and vAlign)

    @alex-lokk
    alex-lokk committed Jul 30, 2012
    Configuration menu
    Copy the full SHA
    b7147b0 View commit details
    Browse the repository at this point in the history

  2. example file: some fixes and one more table sample

    @alex-lokk
    alex-lokk committed Jul 30, 2012
    Configuration menu
    Copy the full SHA
    6654bf0 View commit details
    Browse the repository at this point in the history

  3. possibility to add special properties to paragraph chunks; fixed cell… 

    … properties when adding element as cell
    @alex-lokk
    alex-lokk committed Jul 30, 2012
    Configuration menu
    Copy the full SHA
    1cee810 View commit details
    Browse the repository at this point in the history

  4. remove print

    @alex-lokk
    alex-lokk committed Jul 30, 2012
    Configuration menu
    Copy the full SHA
    6ff63aa View commit details
    Browse the repository at this point in the history

  5. table: cell-specific style

    @alex-lokk
    alex-lokk committed Jul 30, 2012
    Configuration menu
    Copy the full SHA
    c1d0122 View commit details
    Browse the repository at this point in the history

  6. arbitrary table properties

    @alex-lokk
    alex-lokk committed Jul 30, 2012
    Configuration menu
    Copy the full SHA
    ce2e58d View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2012

  1. gitignore cleanup & update

    @alex-lokk
    alex-lokk committed Jul 31, 2012
    Configuration menu
    Copy the full SHA
    b27e820 View commit details
    Browse the repository at this point in the history

  2. don't use common docx directory. Copy the whole template to temporary… 

    … directory specified by user and work on it - so we're saved from collisions
    @alex-lokk
    alex-lokk committed Jul 31, 2012
    Configuration menu
    Copy the full SHA
    236a864 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2012

  1. merge with highcat's fork 

    merge with highcat's fork and modified the make document example
    @Hybrid-Force
    Hybrid-Force committed Aug 8, 2012
    Configuration menu
    Copy the full SHA
    00244da View commit details
    Browse the repository at this point in the history

  2. Merge branch 'highcat' 

    Conflicts:
	docx.py
    @Hybrid-Force
    Hybrid-Force committed Aug 8, 2012
    Configuration menu
    Copy the full SHA
    301afa1 View commit details
    Browse the repository at this point in the history

  3. the line ending on win...

    @Hybrid-Force
    Hybrid-Force committed Aug 8, 2012
    Configuration menu
    Copy the full SHA
    8d4a4bd View commit details
    Browse the repository at this point in the history

  4. Normalize line endings

    @Hybrid-Force
    Hybrid-Force committed Aug 8, 2012
    Configuration menu
    Copy the full SHA
    c2c09b6 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2013

  1. some modification to work on python 2.4

    @Hybrid-Force
    Hybrid-Force committed Apr 3, 2013
    Configuration menu
    Copy the full SHA
    a30c449 View commit details
    Browse the repository at this point in the history
Loading