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.

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

Updated Spreadsheets #1

Open
wants to merge 139 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
4f01880
Removed unused assets.
Jul 8, 2012
9128f35
Added assets from public.
Jul 8, 2012
9a3914a
Massive update, fuck you all.
Jul 13, 2012
db44685
Merged changes from master.
Aug 26, 2012
5b1997f
Updated to devise 2.1.
Aug 26, 2012
9ddc00f
Fixed retarded study workflow bug probably written at 4 in the mornin…
Aug 26, 2012
2303857
Fixed that bug even more.
Aug 26, 2012
862a15a
added rabl gem
Aug 26, 2012
b11bcb4
Added API namespace.
Aug 26, 2012
68334ef
Removed unused sanitize (h) methods (legacy).
Aug 26, 2012
cabe85d
Added custom icon support for tree.
Aug 26, 2012
bf3f30f
Tree icons work.
Aug 26, 2012
01a2a93
Location in tree works better.
Aug 26, 2012
0c16991
Organizing image assets.
Aug 26, 2012
8f8e853
More cleaning of assets.
Aug 26, 2012
9a6c0bf
Cleaned up routes.
Aug 26, 2012
2ff78c8
Changed to html5
Aug 26, 2012
016cea2
Fixed client login screen.
Aug 26, 2012
b4e480a
Removed test subject tree from client view.
Aug 26, 2012
f46536f
Organized stylesheets into lims/clients.
Aug 26, 2012
4f42e2c
fixed stylesheet typo
Aug 26, 2012
564b926
Fixed sidebar position.
Aug 26, 2012
0122eca
Fixed sidebar on client.
Aug 26, 2012
468ed05
Initial backbone setup for sample manifests
Aug 26, 2012
aceedbd
Moved sample tracking file out of icons.
Aug 26, 2012
3255f0b
Merge branch 'rails3' of jrc.insiliflo.com:metaboflo into rails3
Aug 26, 2012
075a20d
Removed dynamic form gem.
Aug 26, 2012
62a7739
Don't include required attribute (this is anew HTML5 attribute that …
Aug 26, 2012
109fc19
Added client section
Aug 26, 2012
631e51b
More cleanup.
Aug 26, 2012
93adc8d
Merge branch 'rails3' of jrc.insiliflo.com:metaboflo into rails3
Aug 26, 2012
490f76f
Fragments of backbone implementation
Aug 27, 2012
a831275
Merge branch 'master' into no-backbone
Aug 27, 2012
2dc8717
clean up javascripts
Aug 27, 2012
97646b7
Merge branch 'master' of jrc.insiliflo.com:metaboflo
Aug 27, 2012
b1a1636
clean up and fix sample manifests
Aug 27, 2012
4075999
Partial functionality to upload and parse file to generate sample man…
Aug 27, 2012
f6284bb
Added public interface.
Aug 27, 2012
8bae089
Improved login structure.
Aug 27, 2012
5000546
Added additional CSS manifests to config.
Aug 27, 2012
b02cea1
Updated deploy files to use asset pipeline
Aug 27, 2012
03d4bb1
Added client css file.
Aug 27, 2012
22ae458
Added mailer settings.
Aug 27, 2012
67a5f3a
Removed unused sample manifest inclusion.
Aug 27, 2012
e6c64eb
Removed js include tag causing errors.
Aug 27, 2012
ccb90ad
Initial commit
cknoxrun Oct 15, 2012
d4b67f2
Ignore public/assets.
cknoxrun Oct 15, 2012
2f167ee
Merge branch 'master' of https://github.com/cknoxrun/metaboflo into g…
cknoxrun Oct 15, 2012
f54e37a
Removed temp files.
cknoxrun Oct 15, 2012
05f0739
Added MIT license.
cknoxrun Oct 15, 2012
0ac8ec6
Added license to read me.
cknoxrun Oct 15, 2012
5c42770
Fixed author in MIT license.
cknoxrun Oct 15, 2012
c94e53b
Removed deploy info.
cknoxrun Oct 15, 2012
592acb6
Ignore deploy info.
cknoxrun Oct 15, 2012
e88e698
Added Excel form used for creating sample manifests
vekelly09 May 31, 2013
1aff5a9
Improved Excel forms for the sample manifest.
Jun 11, 2013
771fce3
Revert "Improved Excel forms for the sample manifest."
Jun 12, 2013
6869d0f
Added Jacob's initial spreadsheet changes
vekelly09 Jun 12, 2013
adec3c5
Added Jacob's initial spreadsheet changes
vekelly09 Jun 12, 2013
906789a
Merge tweaks
vekelly09 Jun 12, 2013
629d80f
demo version of spreadsheet
vekelly09 Jun 12, 2013
2928a66
demo version of spreadsheet
vekelly09 Jun 12, 2013
efa8726
finish excel tweaks
vekelly09 Jun 12, 2013
fdc27f1
re-finish tweaks
vekelly09 Jun 12, 2013
f412e2a
Merge pull request #1 from vekelly09/demo_june_14
Jun 20, 2013
cfae979
Update Gem File
rabberbock Jun 21, 2013
0a62d85
Delete database.yml.sample
rabberbock Jun 21, 2013
0b866f1
Parse Manifest
rabberbock Jun 21, 2013
5923225
Display Form
rabberbock Jun 21, 2013
deb2942
new biofluid caption
rabberbock Jun 21, 2013
ac0019b
updated modules
rabberbock Jun 21, 2013
5c4b188
Add Checkboxes
rabberbock Jun 23, 2013
d8cc894
Blank entry omitted
rabberbock Jun 24, 2013
9519179
Fix up form code
rabberbock Jun 24, 2013
f05bd64
Fix species in cell manifest
rabberbock Jun 24, 2013
0b9b488
add species to cell form
rabberbock Jun 24, 2013
125d6dc
strip decimal from all fields
rabberbock Jun 25, 2013
547447b
update edit manifest page
rabberbock Jun 26, 2013
8027fec
improve edit look
rabberbock Jun 26, 2013
2784beb
Add table css from bootstrap
rabberbock Jun 27, 2013
1ec87f3
add tabs to edit page
rabberbock Jun 27, 2013
6ef99ae
save the downloaded file
rabberbock Jun 27, 2013
61d2192
Update file upload
rabberbock Jun 27, 2013
7b16f96
Add download link
rabberbock Jun 27, 2013
f23e47f
add links
rabberbock Jun 27, 2013
14ec949
Confirm Quote
rabberbock Jun 28, 2013
3d98a01
added security features
rabberbock Jun 30, 2013
23c68e6
add table styling
rabberbock Jun 30, 2013
bb54c41
Merge branch 'master' of https://github.com/vekelly09/metaboflo
Jun 30, 2013
3e0fe8a
fixed database
rabberbock Jul 1, 2013
4b68035
remove name validation
rabberbock Jul 1, 2013
fe88fa4
remove fileutils
rabberbock Jul 1, 2013
47c07db
Merge pull request #5 from rabberbock/update_modules
Jul 1, 2013
da926f8
Updated Spreadsheet
Jul 10, 2013
3bb0d8b
Merge branch 'master' of https://github.com/vekelly09/metaboflo
Jul 10, 2013
464cd0a
Merge pull request #6 from rabberbock/update_sample_manifest
Jul 11, 2013
d8c11be
Updated spreadsheets
Jul 12, 2013
9243814
Merge branch 'master' of https://github.com/vekelly09/metaboflo
Jul 12, 2013
4a1d996
add initial barcode generator
rabberbock Jul 15, 2013
6455c13
render barcodes inline
rabberbock Jul 15, 2013
3eb7bcd
ignore barcode files git
rabberbock Jul 15, 2013
2dc882c
update barcodes
rabberbock Jul 16, 2013
23b8493
Merge branch 'barcode_generator'
rabberbock Jul 17, 2013
2f4aa26
improve barcodes and manifest view
rabberbock Jul 18, 2013
a6ccd7a
change barcodes and manifest directory
rabberbock Jul 18, 2013
8bf8411
fix up manifest model and view
rabberbock Jul 21, 2013
81d24c7
fix cell sample table view
rabberbock Jul 21, 2013
1e2a8ee
reconfigure landing page
rabberbock Jul 22, 2013
fb6813a
remove links
rabberbock Jul 22, 2013
1e7fea0
center table data
rabberbock Jul 22, 2013
c9b36c2
make landing page styles static
rabberbock Jul 22, 2013
a715d48
add missing files
rabberbock Jul 22, 2013
82a7765
fix client link display
rabberbock Jul 22, 2013
d9d66da
fix up parse code
rabberbock Jul 24, 2013
885cf02
more parse fix up
rabberbock Jul 24, 2013
7ee7152
Excel Changes 7/25
Jul 26, 2013
591d73d
More spreadsheet changes
Jul 26, 2013
4476290
Merge branch 'master' of https://github.com/vekelly09/metaboflo into …
rabberbock Jul 26, 2013
64c8fb7
add grant id and fix parse code
rabberbock Jul 26, 2013
a027978
add grant id to confirmation
rabberbock Jul 26, 2013
5173863
fix show sample manifest
rabberbock Jul 26, 2013
4fca28d
Spreadsheet 7/29 repush
Jul 29, 2013
e447421
Merge branch 'master' of https://github.com/vekelly09/metaboflo into …
rabberbock Jul 31, 2013
ff1df13
code cleanup
rabberbock Jul 31, 2013
e1692ba
remove quote from manifest estimate
rabberbock Jul 31, 2013
5a4165b
barcode download
rabberbock Jul 31, 2013
f197601
missing fields completion
rabberbock Aug 1, 2013
919d8e8
remove red background
rabberbock Aug 1, 2013
3c6c653
spelling fix
rabberbock Aug 1, 2013
cd4e0d3
fix up missing fields
rabberbock Aug 1, 2013
1b53275
change border color
rabberbock Aug 2, 2013
9e5f7a9
fix entry retrieval order
rabberbock Aug 2, 2013
ab7aabc
change tube_d to int
rabberbock Aug 2, 2013
fb040da
change tube_d to int #2
rabberbock Aug 2, 2013
04f369f
Merge pull request #7 from rabberbock/change_tube_id_to_int
jacobrogelberg Aug 29, 2013
7ebb271
Update to run locally
jesiegel1 May 26, 2015
3efda17
Add different login destinations
jesiegel1 Jun 3, 2015
55f683a
Merge pull request #8 from SteenJobs/master
Jun 4, 2015
dbab0b1
comment out experimental code in application-controller
Jun 4, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,9 @@ vendor/cache/
.Rhistory
.rbenv-version
vendor/ruby
vendor/ruby
vendor/ruby
public/assets
config/deploy
.project
barcodes/*
sample_manifests/*
clients/*
18 changes: 18 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>metaboflo</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.aptana.ide.core.unifiedBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.radrails.rails.core.railsnature</nature>
<nature>com.aptana.ruby.core.rubynature</nature>
</natures>
</projectDescription>
1 change: 1 addition & 0 deletions .ruby-gemset
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
metaboflo
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby-2.1.3
2 changes: 1 addition & 1 deletion Capfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load 'deploy' if respond_to?(:namespace) # cap2 differentiator
Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }

load 'config/deploy' # remove this line to skip loading any of the default tasks
85 changes: 50 additions & 35 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,39 +1,54 @@
source 'http://rubygems.org'

gem 'rails', '3.0.7'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'

gem 'mysql2', '0.2.7'
# gem 'rake', '0.8.7'

# Use unicorn as the web server
# gem 'unicorn'
# Core gems:
gem 'rails', '3.2.8'
gem 'thin', '1.3.1'
gem 'sqlite3'
gem 'roo'
gem "prawn", "~> 0.12.0"
gem "barby", "~> 0.5.1"

# Gems used only for assets and not required in production environments by default.
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'uglifier', '>= 1.0.3'
gem 'execjs'
gem 'therubyracer', '~> 0.12.2'
gem 'jquery-rails'
gem 'jquery-ui-rails'
gem 'jquery-ui-themes'
gem 'highcharts-rails'
gem 'jquery-tablesorter'
gem 'yui-rails'
gem 'jstree-rails', :git => 'git://github.com/tristanm/jstree-rails.git'
gem 'jquery-cookie-rails'
end

group :production do
gem 'execjs'
gem 'therubyracer', '~> 0.12.2'
end

# Testing gems
group :test do
gem 'shoulda'
gem 'minitest'
gem 'turn'
end

group :development do
gem 'quiet_assets' # Don't show full asset pipeline logging in dev
end

# Deploy with Capistrano
gem 'capistrano', '2.5.21'
gem 'capistrano-ext', '1.2.1'

# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
# gem 'ruby-debug'
# gem 'ruby-debug19', :require => 'ruby-debug'

# Bundle the extra gems:
# gem 'bj'
# gem 'nokogiri'
# gem 'sqlite3-ruby', :require => 'sqlite3'
# gem 'aws-s3', :require => 'aws/s3'
gem 'devise', '1.2.1'
# gem 'fastercsv', '1.5.4'
gem 'jquery-rails', '0.2.7'
gem 'meta_search', '1.0.3'
gem 'paperclip', '2.3.8'
gem 'will_paginate', '3.0.pre2'

# Bundle gems for the local environment. Make sure to
# put test-only gems in this group so their generators
# and rake tasks are available in development mode:
# group :development, :test do
# gem 'webrat'
# end
#gem 'capistrano'
#gem 'capistrano-ext'

# Extra gems:
gem 'country-select'
gem 'devise'
gem 'paperclip'
gem 'meta_search'
gem 'will_paginate'
gem 'rabl'
Loading