Cyclus path#2

Open

yarden-livnat wants to merge 337 commits intoSCI-Utah:masterfrom cyclus:cyclus-path

+7,244-4,596

This pull request is big! We're only showing the most recent 250 commits

Commits on May 20, 2015

really fixed the regex issue this time
FlanFlanagan
committed
update sqlite driver to the latest version 3.8.10.1
yarden-livnat
committed
something
flanflanagan
committed
merging
flanflanagan
committed

Commits on May 22, 2015

Commits on May 26, 2015

Commits on May 27, 2015

updates to input panel
flanflanagan
committed
Merge branch 'develop' of https://github.com/flanflanagan/cyclist2 into develop
flanflanagan
committed
Merge pull request #38 from FlanFlanagan/develop
FlanFlanagan
committed

Commits on May 28, 2015

Facility archetypes now have a string-based color
Paul P.H. Wilson
committed
Fix annoying whitespace
Paul P.H. Wilson
committed
Merge pull request #40 from gonuke/arch_color
gidden
committed

Commits on May 29, 2015

Commits on Jun 2, 2015

Introduce context menu on Cycic pane:
Paul P.H. Wilson
committed
Kludge to choose DSARR as default, if present
Paul P.H. Wilson
committed
Merge pull request #60 from gonuke/pane_ctxt_menu
FlanFlanagan
committed
Added module to arche label in parens
Paul P.H. Wilson
committed
Changes text placement on circles.
Paul P.H. Wilson
committed
Whitespace fixes
Paul P.H. Wilson
committed
Whitespace fixes - again - argh!
Paul P.H. Wilson
committed
remove arch_color from other branch and PR
Paul P.H. Wilson
committed
Fix whitespace
Paul P.H. Wilson
committed
Tweak font size and layout
Paul P.H. Wilson
committed
Move text color to common text placement function and force black
Paul P.H. Wilson
committed
refixing git ordering chaos
Paul P.H. Wilson
committed
First round of changing label placement on Institutions
Paul P.H. Wilson
committed
Fix Institution placement
Paul P.H. Wilson
committed
Allow name movement for Inst & Reg, and add color selection
Paul P.H. Wilson
committed
fix a few style issues with space after comma
Paul P.H. Wilson
committed
fix a few style issues with space after comma
Paul P.H. Wilson
committed
Add capability for skins to change text placement
Paul P.H. Wilson
committed
Fix some style - spaces after comma
Paul P.H. Wilson
committed
Make dragged Inst & Region be same color as DnD archetypes
Paul P.H. Wilson
committed
make sure labels stay below circles/images
Paul P.H. Wilson
committed
Merge pull request #42 from gonuke/name_below
gidden
committed
Use full range of 3-digit integer field
Paul P.H. Wilson
committed
Add function to pastelize colors
Paul P.H. Wilson
committed
Implement pastel for achetype ribbon
Paul P.H. Wilson
committed
lighten up the pastels
Paul P.H. Wilson
committed
fix whitespace
Paul P.H. Wilson
committed
Oops... stray character typo
Paul P.H. Wilson
committed
Fully pastel now - lower the saturation
Paul P.H. Wilson
committed
Pastelize everything
Paul P.H. Wilson
committed
Add pastels to Inst & Region now that they are colored properly
Paul P.H. Wilson
committed
Merge pull request #46 from gonuke/pastels
gidden
committed
Add skin for separations
Paul P.H. Wilson
committed
Started adding context menu to listview
Paul P.H. Wilson
committed
Be sure to populate instution list for regions
Paul P.H. Wilson
committed
move drag function for Reg & Inst to be property of Node to allow text positioning.
Paul P.H. Wilson
committed
Fix Institution double click behavior
Paul P.H. Wilson
committed
initial work on perspectives
yarden-livnat
committed
Avoid adding null institutino
Paul P.H. Wilson
committed
changes to formbuilderfunctions
FlanFlanagan
committed
Merge remote-tracking branch 'cyclus/v1.3.0-release' into develop
FlanFlanagan
committed
Merge pull request #64 from gonuke/instList_fixes
FlanFlanagan
committed
fixes DnD circles with name update
FlanFlanagan
committed
fixes to DnD circles
FlanFlanagan
committed
fixed redundancy in region corral
FlanFlanagan
committed
Merge pull request #63 from gonuke/nm_blw_fix
FlanFlanagan
committed
Merge branch 'v1.3.0-release' into develop
FlanFlanagan
committed
removed commented in formbuilder
FlanFlanagan
committed
Save recipe basis to avoid resetting it
Paul P.H. Wilson
committed
Merge pull request #67 from gonuke/rb_fix
FlanFlanagan
committed
Merge pull request #66 from FlanFlanagan/fix_DnDcircles
FlanFlanagan
committed
Merge pull request #59 from gonuke/fix_def_skin
gidden
committed
fix add button functionality on mainview
FlanFlanagan
committed
Merge pull request #70 from FlanFlanagan/develop
gidden
committed
updated niche issues and changed prototype menu
FlanFlanagan
committed
add support for perspectives
yarden-livnat
committed
Merge pull request #72 from FlanFlanagan/develop
gidden
committed
Modularize code to add arche to bar/ribbon and reuse.
Paul P.H. Wilson
committed
darned whitespace
Paul P.H. Wilson
committed
darned whitespace
Paul P.H. Wilson
committed
Merge branch 'master' into tabs
yarden-livnat
committed
Merge pull request #73 from gonuke/add_arche
gidden
committed

Commits on Jun 3, 2015

Commits on Jun 4, 2015

Move default archetype discovery to a central location. DataArrays was chosen
Paul P.H. Wilson
committed
Remove superfluous imports.
Paul P.H. Wilson
committed
fixed some color miss matches in circles
flanflanagan
committed
Merge pull request #77 from gonuke/fix_ird
FlanFlanagan
committed
removed pane color in region/instit corrals
flanflanagan
committed
Merge branch 'v1.3.0-release' into memscroll
flanflanagan
committed
some bug fixes with the CycICInit function and removed some system outs
flanflanagan
committed
merge inputFactories into the single factories list.
yarden-livnat
committed
fix issues with the tools panels dividers
yarden-livnat
committed

Commits on Jun 5, 2015

Commits on Jun 7, 2015

removing a one or more now updates commodites lists
flanflanagan
committed
define a LOCAL_SERVER constant
yarden-livnat
committed
typo
yarden-livnat
committed
move form name in menu to configure
gidden
committed
you can now add an institution via the add button on the top banner, this was broken before
gidden
committed
Merge pull request #105 from gidden/config
FlanFlanagan
committed
fix for inst bar usage
gidden
committed
text and location
gidden
committed
fix for regions too
gidden
committed
Merge pull request #106 from gidden/instadd
FlanFlanagan
committed
serialization to string working
flanflanagan
committed
fixed writeout error
flanflanagan
committed
fixed linking bug
flanflanagan
committed
detail should populate on load now
flanflanagan
committed
Extract arche level docs from annotations
Paul P.H. Wilson
committed
modularize the help/doc dialog window
Paul P.H. Wilson
committed
Changes related to putting documentation in the context menus
Paul P.H. Wilson
committed
Fix whitespace
Paul P.H. Wilson
committed
Merge pull request #111 from gonuke/add_archedocs
FlanFlanagan
committed
Add entry for lifetime on every facility at userlevel > 0
Paul P.H. Wilson
committed
add integer only to field
Paul P.H. Wilson
committed
fix whitespace
Paul P.H. Wilson
committed
Move regions to context menus
Paul P.H. Wilson
committed
Remove 'exit' from context menu
Paul P.H. Wilson
committed
Add context menus to institutions.
Paul P.H. Wilson
committed
whitespace... sigh
Paul P.H. Wilson
committed
Merge pull request #110 from gonuke/add_lifetime
FlanFlanagan
committed
temp fix
flanflanagan
committed
month fix
flanflanagan
committed
Merge branch 'v1.3.0-release' into sim_data_update
flanflanagan
committed
Merge branch 'v1.3.0-release' into sim_data_update
flanflanagan
committed

Commits on Jun 8, 2015

found good json/java interaction
flanflanagan
committed
adding jar file
flanflanagan
committed
removed xml
flanflanagan
committed
needs testing but save load works
flanflanagan
committed
dialogs to add nulls
flanflanagan
committed
fixed one off in months
flanflanagan
committed
tested with simple scenario auto generates region and institution if both are missing
flanflanagan
committed
Merge pull request #101 from FlanFlanagan/sim_data_update
gidden
committed
need to communicate changes to formViews
flanflanagan
committed
added check to execute button
flanflanagan
committed
merging and added in decay and simhandle updates
flanflanagan
committed
changed notes to description
flanflanagan
committed
userLevel remembered for facilities. Fixed a zero or more issue
flanflanagan
committed
added zero or more fix to regions and institutions
flanflanagan
committed
fixed institution form sizeing
flanflanagan
committed
fixed region view sizing
flanflanagan
committed
fixed build error
flanflanagan
committed
recommit just in case
flanflanagan
committed
x
flanflanagan
committed
Merge branch 'v1.3.0-release' into auto_nulls
flanflanagan
committed
removed superfluous region and inst after xml gen
flanflanagan
committed
Merge pull request #104 from FlanFlanagan/orMoreRemove
Paul Wilson
committed
Merge branch 'v1.3.0-release' into misc_updates
flanflanagan
committed
fixed null or empty commodity issue
flanflanagan
committed
empty commodities no longer show up on commod dropdowns
flanflanagan
committed
updating message box message
gidden
committed
break out injection check into a function and use output function in execute
gidden
committed
Merge pull request #114 from FlanFlanagan/auto_nulls
gidden
committed
updated with v1.3.0
flanflanagan
committed
merged with v1.3.0
flanflanagan
committed
merging @FlanFlanagan 's changes that had conflicts
gidden
committed
load
gidden
committed
Merge branch 'test2' into v1.3.0-release
gidden
committed
merged in misc updates
flanflanagan
committed
test merge of 1.3 and my saveload
flanflanagan
committed
test merge of 1.3 and my saveload
flanflanagan
committed
fixes a month bug on loading and should fix niche issues
flanflanagan
committed

Commits on Jun 9, 2015

fixed save load bug
flanflanagan
committed
enable escape/return keys on the save exit panel
yarden-livnat
committed
metadata update for 1.3.1
gidden
committed
Merge pull request #118 from FlanFlanagan/test_merge
Paul Wilson
committed
fix institution view widths
Paul P.H. Wilson
committed
Merge pull request #122 from cyclus/test_merge
gidden
committed
Merge pull request #123 from gidden/m131
Paul Wilson
committed
add cycic to the workspace on defaul

yarden-livnat
authored and
Paul P.H. Wilson
committed
add cyclist icon

yarden-livnat
authored and
Paul P.H. Wilson
committed
start work on adding icons

yarden-livnat
authored and
Paul P.H. Wilson
committed
check localclipboard is not null

yarden-livnat
authored and
Paul P.H. Wilson
committed
try to fix multiple filter behavior
Paul P.H. Wilson
committed

Commits on Jun 10, 2015

Merge pull request #124 from cyclus/fixed-cycic
Paul Wilson
committed
reverting build.xml that was unfinished due to git confusion
Paul P.H. Wilson
committed
ensure that recipe loading is roundtripping correctly
Paul P.H. Wilson
committed
clean up tracking of tilde files
Paul P.H. Wilson
committed
Move assets to location for inclusion in jar.
Paul P.H. Wilson
committed
delete unnecessary files
Paul P.H. Wilson
committed
remove deprecated skin images
Paul P.H. Wilson
committed
* drag & drop now grabs circles to move
Paul P.H. Wilson
committed
Merge pull request #132 from gonuke/clean_assets
FlanFlanagan
committed
Merge pull request #130 from cyclus/fix_rec_load
FlanFlanagan
committed
bug fix: two filters for fields in LOD interfered with each other

yarden-livnat
authored and
Paul P.H. Wilson
committed
Merge pull request #131 from cyclus/fix-filters
Paul Wilson
committed
Add package dir with icons
Paul P.H. Wilson
committed
add back missing icon
yarden-livnat
committed
rename icons
Paul P.H. Wilson
committed
I think it works now!
Paul P.H. Wilson
committed
change name for installer - maybe
Paul P.H. Wilson
committed
Merge pull request #133 from cyclus/add_icons
FlanFlanagan
committed

Commits on Jun 11, 2015

rework of recipeForm to improve stability
FlanFlanagan
committed

Commits on Jun 15, 2015

Merge branch 'minor_fixes' of https://github.com/cyclus/cyclist2 into minor_fixes
FlanFlanagan
committed

Commits on Jul 1, 2015

fix reference to VisWorkspace instead of Workspace
yarden-livnat
committed

Commits on Jul 5, 2015

added label tracking to institution and region forms
flanflanagan
committed

Commits on Jul 10, 2015

Commits on Jul 14, 2015

removed superfluous code
flanflanagan
committed
Merge pull request #144 from cyclus/minor_fixes
FlanFlanagan
committed

Commits on Jul 24, 2015

add path to cyclus in Preferences
yarden-livnat
committed