Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cyclus path #2

Open
wants to merge 337 commits into
base: master
Choose a base branch
from
Open

Cyclus path #2

wants to merge 337 commits into from

Conversation

yarden-livnat
Copy link
Contributor

Add a Preference entry to specify a full path to Cyclus executable

FlanFlanagan and others added 30 commits May 20, 2015 14:41
@FlanFlanagan
really fixed the regex issue this time
1c03525
@yarden-livnat
update sqlite driver to the latest version 3.8.10.1
f664ff1 
add a hack in CyclistNumberAxis if min==max values
something
9f28518
merging
c2a0da3
removed default and a partial appearance fix to allow for testing
b4b81e2
@FlanFlanagan
update to the default metadata
9e9e1d8
@gidden
pretty print output file
6201ba8
@FlanFlanagan
Merge pull request #11 from gidden/release
2f4268c 
pretty print output file
fixed region view
c7013a9
Merge branch 'develop'
0b85573
@yarden-livnat
update build to reflect new sqlite driver
7d10f0a
fixed region output
88259d4
lots of things
119672d
@FlanFlanagan
defaults should be working on reading and writing
13992b3
@FlanFlanagan
extended updates to region/institutions
d4c495f
@FlanFlanagan
fixed for all defaults
936779a
@gidden
Merge pull request #33 from FlanFlanagan/develop
3ddae62 
removing defaults from input file
updates to input panel
5d1fa12
Merge branch 'develop' of https://github.com/flanflanagan/cyclist2 in…
e875ef3 
…to develop
@FlanFlanagan
Merge pull request #38 from FlanFlanagan/develop
bfa6acf 
Develop
Facility archetypes now have a string-based color
cb5c2b4
Fix annoying whitespace
9638d9b
@gidden
Merge pull request #40 from gonuke/arch_color
3e9395f 
Facility archetypes now have a string-based color
@FlanFlanagan
updates to corral views and some form builder stuff
53f86aa
@FlanFlanagan
Merge branch 'develop' of https://github.com/FlanFlanagan/cyclist2 in…
1cb1c9d 
…to develop
Introduce context menu on Cycic pane:
209e434 
* change bg color
* change link color
* change skin
* export image
Kludge to choose DSARR as default, if present
26e7a6f
@FlanFlanagan
Merge pull request #60 from gonuke/pane_ctxt_menu
5ec28bf 
Introduce context menu on Cycic pane:
Added module to arche label in parens
bab0ca7
Changes text placement on circles.
e012bd6 
* add a single method that can ensure consistency
   * allows "top", "bottom", "middle"
   * gracefully applies "middle" for any other string given
* implements this method for all places that text on circles is placed
Paul P.H. Wilson and others added 30 commits June 9, 2015 21:53
ensure that recipe loading is roundtripping correctly
ace9ffb
clean up tracking of tilde files
b1af6a9
Move assets to location for inclusion in jar.
c13084f
delete unnecessary files
556f1fc
remove deprecated skin images
67b50fa
* drag & drop now grabs circles to move
8bbe1c4 
* read json as input stream from new location
* improve in/out commodity comparison
* read skins from assets
@FlanFlanagan
Merge pull request #132 from gonuke/clean_assets
6a49093 
Tested and working.
@FlanFlanagan
Merge pull request #130 from cyclus/fix_rec_load
5b72fc2 
Check check. This is working.
@yarden-livnat
bug fix: two filters for fields in LOD interfered with each other
0201daa
Merge pull request #131 from cyclus/fix-filters
ab52533 
bug fix: two filters for fields in LOD interfered with each other
Add package dir with icons
f4d4ac0
@yarden-livnat
add back missing icon
c6c3964
rename icons
0f97866
I think it works now!
35cf0d0
change name for installer - maybe
59ad0c5
@FlanFlanagan
Merge pull request #133 from cyclus/add_icons
8b4ee2e 
Tested and merging.
@FlanFlanagan
rework of recipeForm to improve stability
1b3171a
@FlanFlanagan
Merge branch 'minor_fixes' of https://github.com/cyclus/cyclist2 into…
19c038d 
… minor_fixes
@yarden-livnat
fix reference to VisWorkspace instead of Workspace
89b9131
added label tracking to institution and region forms
93b2d61
@gidden
remove quotes from string values
033fee9
@FlanFlanagan
Merge pull request #146 from gidden/rm-quotes
da10532 
remove quotes from string values
@gidden
do not change recipe values on write
60f97c9
@gidden
separate out add and new recipe buttons, only add a recipe if it does…
a3acdba 
…n't exist in the form. fixes #147
@FlanFlanagan
Merge branch 'minor_fixes' of https://github.com/cyclus/cyclist2 into…
1ca2be1 
… minor_fixes
@FlanFlanagan
update to view such that add button is now in more logical place
1b22be7
@gidden
Merge pull request #145 from cyclus/inst_region_labels
908f085 
added label tracking to institution and region forms
removed superfluous code
aa965a4
@FlanFlanagan
Merge pull request #144 from cyclus/minor_fixes
6c9fe0a 
rework of recipeForm to improve stability
@yarden-livnat
add path to cyclus in Preferences
a79db7e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@yarden-livnat @FlanFlanagan @gidden