Code

Feature/95 python3#403

Code

Merged

quicklizard99 merged 46 commits intomasterNaturalHistoryMuseum/inselect:masterfrom feature/95-python3NaturalHistoryMuseum/inselect:feature/95-python3Copy head branch name to clipboardDec 12, 2016

+2,528-2,752

Commits

Commits on Nov 30, 2016

• [#395] PyQt5

  quicklizard99

  committed
  625fbe0

  Copy full SHA for 625fbe0

• [#395] PyQt5 Windows

  quicklizard99

  committed
  6b62d14

  Copy full SHA for 6b62d14

• Merge master

  quicklizard99

  committed
  44c805b

  Copy full SHA for 44c805b

• Merge branch 'feature/395-qt5' of github.com:NaturalHistoryMuseum/inselect into feature/395-qt5

  quicklizard99

  committed
  e5e6b38

  Copy full SHA for e5e6b38

Commits on Dec 1, 2016

• [#395] Global exception handler to paly nicely with Qt5

  quicklizard99

  committed
  faa539c

  Copy full SHA for faa539c

• Merge branch 'master' into feature/395-qt5

  quicklizard99

  committed
  fc082a7

  Copy full SHA for fc082a7

• [#395] work on Mac OS X build

  quicklizard99

  committed
  fdd676f

  Copy full SHA for fdd676f

• [#395] attempt to fix travis

  quicklizard99

  committed
  b8e8870

  Copy full SHA for b8e8870

• [#395] another attempt to fix travis - anaconda is pain

  quicklizard99

  committed
  110b93d

  Copy full SHA for 110b93d

• PyQt version

  quicklizard99

  committed
  afeb8a1

  Copy full SHA for afeb8a1

Commits on Dec 2, 2016

• [#395] qt5 supports cosmetic pens with non-zero pixel width

  quicklizard99

  committed
  458cb97

  Copy full SHA for 458cb97

• [#95] Python 3

  quicklizard99

  committed
  b09f49f

  Copy full SHA for b09f49f

• [#95] Python 3 on Windows

  quicklizard99

  committed
  1803717

  Copy full SHA for 1803717

• [#95] More work towards Python 3 on Windows

  quicklizard99

  committed
  ba7782c

  Copy full SHA for ba7782c

Commits on Dec 5, 2016

• [#95] Miniconda for Python 3

  quicklizard99

  committed
  a63c3e4

  Copy full SHA for a63c3e4

• [#95] Tweak Linux instructions

  quicklizard99

  committed
  16b791e

  Copy full SHA for 16b791e

• [#95] Travis tweaks

  quicklizard99

  committed
  ad600bf

  Copy full SHA for ad600bf

• [#95] Travis tweaks

  quicklizard99

  committed
  d65af38

  Copy full SHA for d65af38

• [#95] Attempt to fix travis

  quicklizard99

  committed
  63a7e86

  Copy full SHA for 63a7e86

• [#95] Yet another attempt to fix travis

  quicklizard99

  committed
  0177e66

  Copy full SHA for 0177e66

Commits on Dec 6, 2016

• [#95] Fixes for Windows build

  quicklizard99

  committed
  b0b6855

  Copy full SHA for b0b6855

Commits on Dec 7, 2016

• [#95] Windows build

  quicklizard99

  committed
  9a14432

  Copy full SHA for 9a14432

• [#95] Correct keyword arg name

  quicklizard99

  committed
  0fc956d

  Copy full SHA for 0fc956d

Commits on Dec 8, 2016

• [#95] Mac build

  quicklizard99

  committed
  2cac149

  Copy full SHA for 2cac149

• [#95] Remove sdist

  quicklizard99

  committed
  e886746

  Copy full SHA for e886746

• [#95] Reinstate segment.spec

  quicklizard99

  committed
  1cd644a

  Copy full SHA for 1cd644a

• [#95] Reinstate segment.spec

  quicklizard99

  committed
  ed869be

  Copy full SHA for ed869be

• [#95] Code layout

  quicklizard99

  committed
  9144170

  Copy full SHA for 9144170

• [#95] Removed obsolete file

  quicklizard99

  committed
  23c9ba8

  Copy full SHA for 23c9ba8

• [#95] Fix Windows build and remove experimental cx_Freeze / OS X nonsense

  quicklizard99

  committed
  0bd64ab

  Copy full SHA for 0bd64ab

• [#95] Fix Windows freeze

  quicklizard99

  committed
  d7222cc

  Copy full SHA for d7222cc

• [#95] Fix OS X freeze of segment

  quicklizard99

  committed
  56550a7

  Copy full SHA for 56550a7

• Merge branch 'feature/95-python3' of github.com:NaturalHistoryMuseum/inselect into feature/95-python3

  quicklizard99

  committed
  77d2d3b

  Copy full SHA for 77d2d3b

• [#95] Fix DLL import for frozen scripts on Windows

  quicklizard99

  committed
  1024e11

  Copy full SHA for 1024e11

• Merge branch 'feature/95-python3' of https://github.com/NaturalHistoryMuseum/inselect into feature/95-python3

  quicklizard99

  committed
  815ae99

  Copy full SHA for 815ae99

• [#95] Consistent box outline width

  quicklizard99

  committed
  e3ef719

  Copy full SHA for e3ef719

• [#95] Show exception type and value in details box

  quicklizard99

  committed
  9863386

  Copy full SHA for 9863386

• [#95] Comment typo

  quicklizard99

  committed
  2206be4

  Copy full SHA for 2206be4

Commits on Dec 9, 2016

• [#95] Reinstate test of Inlite engine

  quicklizard99

  committed
  74dcb12

  Copy full SHA for 74dcb12

• [#95] Update inlite com client

  quicklizard99

  committed
  09c5877

  Copy full SHA for 09c5877

• [#95] Fix inlite barcode reader when frozen

  quicklizard99

  committed
  e6b0735

  Copy full SHA for e6b0735

• [#95] Comment

  quicklizard99

  committed
  4b41f8e

  Copy full SHA for 4b41f8e

• [#95] str / bytes values from barcodes

  quicklizard99

  committed
  e38c4e9

  Copy full SHA for e38c4e9

• [#95] box thickness

  quicklizard99

  committed
  37871d8

  Copy full SHA for 37871d8

• [#95] Fix inlite barcode reader when frozen

  quicklizard99

  committed
  b5788f4

  Copy full SHA for b5788f4

Commits on Dec 12, 2016

• [#95] Python 3 and Linux

  quicklizard99

  committed
  9f76163

  Copy full SHA for 9f76163