Commits

Branch selector

 master

User selector

All users

All time

Commit History

Commits on Jan 24, 2019

• Merge pull request #2557 from dls-controls/2556-rap-gef

  Show description for 7fba28a
  berryma4

  authored
  7fba28a

  Copy full SHA for 7fba28a

Commits on Jan 23, 2019

• Change rap gef p2 site to a more standard url.

  willrogers

  committed
  6f22361

  Copy full SHA for 6f22361

Commits on Dec 19, 2018

• Merge pull request #2554 from css-iter/Issue_2553

  Show description for 42bc307
  berryma4

  authored
  42bc307

  Copy full SHA for 42bc307

• Timestamp truncated for MySQL and PostgreSQL to avoid rounding it "up"

  Show description for eb1e390
  

  utzeln

  authored and

  herreri

  committed
  eb1e390

  Copy full SHA for eb1e390

Commits on Dec 3, 2018

• Merge pull request #2547 from ControlSystemStudio/rdbarch_zeroarray_2546

  Show description for 1b86455
  berryma4

  authored
  1b86455

  Copy full SHA for 1b86455

• Merge pull request #2548 from ControlSystemStudio/combo_2545

  Show description for 95fb9ca
  berryma4

  authored
  95fb9ca

  Copy full SHA for 95fb9ca

• BOY Combo: Ignore mouse wheel on Linux without breaking use on Mac

  Show description for 0eaab09
  kasemir

  committed
  0eaab09

  Copy full SHA for 0eaab09

• RDB Archive: Write NaN for scalar component of zero-sized array

  Show description for 833852e
  kasemir

  committed
  833852e

  Copy full SHA for 833852e

Commits on Nov 12, 2018

• Merge pull request #2542 from ControlSystemStudio/jython_path_2541

  Show description for fefe411
  berryma4

  authored
  fefe411

  Copy full SHA for fefe411

• BOY: Add path to Jython scripts to search path

  Show description for ab3e170
  kasemir

  committed
  ab3e170

  Copy full SHA for ab3e170

Commits on Nov 6, 2018

• Merge pull request #2540 from ControlSystemStudio/scan_abort

  Show description for 6cf63f7
  berryma4

  authored
  6cf63f7

  Copy full SHA for 6cf63f7

Commits on Nov 5, 2018

• Scan: On 'abort', only interrupt once.

  kasemir

  committed
  1d2c1c2

  Copy full SHA for 1d2c1c2

Commits on Nov 2, 2018

• Merge pull request #2538 from ESSICS/phoebus-integration

  Show description for 542ae17
  berryma4

  authored
  542ae17

  Copy full SHA for 542ae17

Commits on Nov 1, 2018

• Fixed missing plugin and module.

  

  Claudio Rosati

  authored and

  Claudio Rosati

  committed
  e67e5cb

  Copy full SHA for e67e5cb

Commits on Oct 31, 2018

• Merge pull request #2537 from ControlSystemStudio/Issue_2437

  Show description for a6e68e3
  berryma4

  authored
  a6e68e3

  Copy full SHA for a6e68e3

Commits on Oct 30, 2018

• #2437 fix checkstyle errors

  shroffk

  committed
  cf90d2a

  Copy full SHA for cf90d2a

• Adding plugin to integrate with phoebus alarm applications

  shroffk

  committed
  f5c1a1c

  Copy full SHA for f5c1a1c

• #2437 removing channel finder integration from the common plugin

  shroffk

  committed
  c7cae7e

  Copy full SHA for c7cae7e

• #2437 creating channel finder application integration with phoebus

  shroffk

  committed
  0a50e84

  Copy full SHA for 0a50e84

Commits on Oct 2, 2018

• Merge pull request #2528 from ESSICS/jython-2.7.1

  Show description for a8353d0
  berryma4

  authored
  a8353d0

  Copy full SHA for a8353d0

• Merge branch 'master' into jython-2.7.1

  

  Claudio Rosati

  authored and

  Claudio Rosati

  committed
  3038b05

  Copy full SHA for 3038b05

Commits on Oct 1, 2018

• Update travis.sh to Maven batch mode and Slf4jMavenTransferListener=warn

  berryma4

  authored
  06b0eaf

  Copy full SHA for 06b0eaf

Commits on Sep 28, 2018

• Merge pull request #2526 from dls-controls/2466-waveform-view

  Show description for 9237b16
  kasemir

  authored
  9237b16

  Copy full SHA for 9237b16

Commits on Sep 27, 2018

• Tidy resetting the waveform view slider.

  willrogers

  committed
  89dcfbe

  Copy full SHA for 89dcfbe

• Simplify sample selection.

  willrogers

  committed
  b991b96

  Copy full SHA for b991b96

• Make variables final where possible.

  willrogers

  committed
  c7fe494

  Copy full SHA for c7fe494

• Updated references to Jython ver. 2.7.1.

  

  Claudio Rosati

  authored and

  Claudio Rosati

  committed
  88af13f

  Copy full SHA for 88af13f

Commits on Sep 26, 2018

• Use merged PlotSampleArray for defining the slider in WaveformView.

  Show description for 7e4540f
  willrogers

  committed
  7e4540f

  Copy full SHA for 7e4540f

• Avoid null values for empty lists.

  Show description for 485e051
  willrogers

  committed
  485e051

  Copy full SHA for 485e051

Commits on Sep 25, 2018

• Use new generic getAdapter() method to avoid warnings.

  willrogers

  committed
  de29129

  Copy full SHA for de29129

• Avoid invalid thread access exceptions.

  willrogers

  committed
  1b9a5a2

  Copy full SHA for 1b9a5a2

Commits on Sep 24, 2018

• Merge pull request #2525 from dls-controls/2524-suppress-warnings

  Show description for de5a150
  berryma4

  authored
  de5a150

  Copy full SHA for de5a150

Commits on Sep 20, 2018

• Merge pull request #2523 from ControlSystemStudio/scan_2522

  Show description for 4f3ec5e
  berryma4

  authored
  4f3ec5e

  Copy full SHA for 4f3ec5e

• Remove debug prints.

  willrogers

  committed
  04fa640

  Copy full SHA for 04fa640

• Allow the option to suppress data browser warning messages.

  Show description for 3deed5d
  willrogers

  committed
  3deed5d

  Copy full SHA for 3deed5d