Compare commits
129 Commits
master
...
ray_new_ui
Author | SHA1 | Date |
---|---|---|
rulingcom | 5163ad000d | |
chris | 62d12533d0 | |
chris | ae04f67924 | |
chris | 41dadfb4e9 | |
chris | 49d0d83810 | |
chris | 82baa809ea | |
chris | 5de39dd0a6 | |
chris | 36da89f93e | |
chris | a4aef30a9c | |
chris | f9fda13879 | |
chris | 67bb08c338 | |
chris | e028791d68 | |
chris | 218592c1f9 | |
chris | 73a0234330 | |
chris | 3e0822336e | |
chris | 3714403f85 | |
chris | 19405cf006 | |
chris | bf3d20ea46 | |
chris | ff03d66439 | |
chris | 24523640a7 | |
chris | 12df0e7f85 | |
chris | a9d25dcdec | |
chris | e4c33b443f | |
chris | 76b4356bc0 | |
Matt K. Fu | b58e08b872 | |
Matt K. Fu | e3666acdeb | |
Matt K. Fu | fb800b488b | |
Matt K. Fu | 0a7c43bbb9 | |
Matt K. Fu | a85d1f938c | |
chris | 5b2f653b5a | |
Matt K. Fu | 74f9dea6b9 | |
Matt K. Fu | 20bdeb3c2d | |
Matt K. Fu | 695d712843 | |
Harry Bomrah | 8b44f930f3 | |
Matt K. Fu | 3476237fa7 | |
chris | bd3e9fe4f6 | |
devin | 4bb5e18f44 | |
Harry Bomrah | 78205d8b00 | |
devin | a62ff9308f | |
Matt K. Fu | 474e8b9b57 | |
Spen | a8f7422c25 | |
Fu Matthew | 9e02011956 | |
chris | 3f0addf04d | |
chris | 0a01faedc9 | |
chris | 8e0331449f | |
Fu Matthew | 635d3f1690 | |
Fu Matthew | 9e33bdadc3 | |
Fu Matthew | 54acaebc98 | |
Fu Matthew | 7f7e21b4f2 | |
Fu Matthew | 8609c8dec0 | |
chris | f3e40c1405 | |
Rueshyna | 42aca64dc3 | |
Harry Bomrah | 6ba840de4a | |
Harry Bomrah | 53953e57db | |
Rueshyna | ddf61e5606 | |
Harry Bomrah | 5685e11511 | |
Harry Bomrah | 0e39de56e2 | |
devin | 677faf1811 | |
Rueshyna | f0fbd50261 | |
Rueshyna | 573270c98c | |
Rueshyna | f61b786e90 | |
Rueshyna | d085197635 | |
Harry Bomrah | 6c58a0f773 | |
Harry Bomrah | 478b54da26 | |
Harry Bomrah | e799ac4395 | |
Harry Bomrah | c101413d32 | |
Rueshyna | 50a09763ec | |
Rueshyna | 811b30791b | |
Rueshyna | 4b8c68500a | |
Rueshyna | e5e45f3ada | |
Rueshyna | f619c5e389 | |
Rueshyna | 3c6ca3c254 | |
Rueshyna | 12fdb5a0ca | |
Harry Bomrah | 7df0be3826 | |
Harry Bomrah | 80be9e63ef | |
Harry Bomrah | 0444b1f5e5 | |
Rueshyna | 91d3e1d92c | |
Rueshyna | fb8407dbe3 | |
Harry Bomrah | 9963c9fb68 | |
devin | 80a2f67dda | |
Harry Bomrah | 7b2e7f5297 | |
Harry Bomrah | 38a695d8a9 | |
Harry Bomrah | df83c6fff7 | |
Rueshyna | adec8c8938 | |
Rueshyna | 2746616610 | |
Rueshyna | 61cc8f0f54 | |
Harry Bomrah | 31476bb813 | |
Harry Bomrah | d2c1abeb95 | |
devin | f0c19cfdf9 | |
Harry Bomrah | 8ab4e90a06 | |
Rueshyna | 7a78594594 | |
Rueshyna | b50548c538 | |
Harry Bomrah | 84f255173c | |
Harry Bomrah | b4ba4149d4 | |
Harry Bomrah | 3830fddfe0 | |
Fu Matthew | 66633443de | |
devin | 3d7fbd9711 | |
Fu Matthew | aa851cad76 | |
Rueshyna | 4a2c994401 | |
Rueshyna | af6813480a | |
Harry Bomrah | 4a83521b84 | |
Rueshyna | 470dbea22d | |
Harry Bomrah | 8e369fe819 | |
Harry Bomrah | 2b4e53ed1b | |
Harry Bomrah | 6d194759fa | |
Rueshyna | d20081157a | |
Harry Bomrah | e88487bc9f | |
Fu Matthew | 311d741f92 | |
Rueshyna | 8e0632236b | |
Rueshyna | 78abcac1cb | |
Rueshyna | 385e043809 | |
Rueshyna | 8d5a2d71b7 | |
Rueshyna | 1880ed11ca | |
Rueshyna | 96602842a3 | |
Harry Bomrah | ca64cba9ad | |
Harry Bomrah | 4f64ff3568 | |
devin | a22c0c46e0 | |
Harry Bomrah | 196030b4b4 | |
Rueshyna | 75a5e74bc0 | |
Harry Bomrah | 39a20f6cc9 | |
Harry Bomrah | 32d56232bc | |
devin | b7beadfc04 | |
Fu Matthew | e53ad9f5d1 | |
Rueshyna | b2cbcf6629 | |
Harry Bomrah | 906e522a6a | |
Fu Matthew | 4f7928ad1b | |
Fu Matthew | 77c7053bf1 | |
Harry Bomrah | 20ac4f1ac0 | |
Harry Bomrah | 9931eb7f61 |
|
@ -1,23 +1,20 @@
|
|||
!.gitignore
|
||||
Gemfile.lock
|
||||
.bundle
|
||||
.DS_Store
|
||||
.rvmrc
|
||||
|
||||
Gemfile.lock
|
||||
|
||||
db/*.sqlite3
|
||||
log/*.log
|
||||
tmp/**/*
|
||||
public/uploads/**/*
|
||||
uploads/**/*
|
||||
public/panel/**/*
|
||||
public/assets
|
||||
public/index.html
|
||||
.DS_Store
|
||||
solr/data/**/*
|
||||
public/panel/**/*
|
||||
public/uploads/**/*
|
||||
solr
|
||||
tmp/**/*
|
||||
uploads/**/*
|
||||
|
||||
*.swp
|
||||
*.pid
|
||||
*.lck
|
||||
public/assets
|
||||
config/application.rb
|
||||
|
||||
.rvmrc
|
||||
|
||||
app/assets/javascripts/.DS_Store
|
||||
|
||||
solr
|
||||
|
|
1
Gemfile
|
@ -13,6 +13,7 @@ gem 'exception_notification' # Send error trace
|
|||
gem 'execjs'
|
||||
gem 'jquery-rails', '2.1.4'
|
||||
gem 'jquery-ui-rails'
|
||||
gem "select2-rails", '3.3.1'
|
||||
gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
|
||||
|
||||
# gem "memcached", "~> 1.4.3"
|
||||
|
|
17
Gemfile.lock
|
@ -91,7 +91,6 @@ GEM
|
|||
execjs
|
||||
coffee-script-source (1.4.0)
|
||||
columnize (0.3.6)
|
||||
curb (0.8.3)
|
||||
database_cleaner (0.9.1)
|
||||
debug_inspector (0.0.2)
|
||||
debugger (1.2.4)
|
||||
|
@ -128,13 +127,6 @@ GEM
|
|||
multi_json (>= 1.3)
|
||||
rack-oauth2 (>= 0.14.4)
|
||||
tzinfo
|
||||
feedzirra (0.0.24)
|
||||
activesupport (>= 2.3.8)
|
||||
builder (>= 2.1.2)
|
||||
curb (>= 0.2.3)
|
||||
loofah (>= 0.3.1)
|
||||
nokogiri (> 0.0.0)
|
||||
sax-machine (>= 0.0.12)
|
||||
ffi (1.4.0)
|
||||
haml (3.1.8)
|
||||
highline (1.6.15)
|
||||
|
@ -149,8 +141,6 @@ GEM
|
|||
jquery-rails
|
||||
railties (>= 3.1.0)
|
||||
json (1.7.7)
|
||||
loofah (1.2.1)
|
||||
nokogiri (>= 1.4.4)
|
||||
mail (2.4.4)
|
||||
i18n (>= 0.4.0)
|
||||
mime-types (~> 1.16)
|
||||
|
@ -285,8 +275,9 @@ GEM
|
|||
railties (~> 3.2.0)
|
||||
sass (>= 3.1.10)
|
||||
tilt (~> 1.3)
|
||||
sax-machine (0.1.0)
|
||||
nokogiri (> 0.0.0)
|
||||
select2-rails (3.3.1)
|
||||
sass-rails (>= 3.2)
|
||||
thor (~> 0.14)
|
||||
selenium-webdriver (2.30.0)
|
||||
childprocess (>= 0.2.5)
|
||||
multi_json (~> 1.0)
|
||||
|
@ -365,7 +356,6 @@ DEPENDENCIES
|
|||
factory_girl_rails
|
||||
faker
|
||||
fb_graph
|
||||
feedzirra
|
||||
impressionist!
|
||||
jquery-rails (= 2.1.4)
|
||||
jquery-ui-rails
|
||||
|
@ -397,6 +387,7 @@ DEPENDENCIES
|
|||
rspec-rails (~> 2.0)
|
||||
rubyzip
|
||||
sass-rails
|
||||
select2-rails (= 3.3.1)
|
||||
shoulda-matchers
|
||||
simplecov
|
||||
sinatra
|
||||
|
|
Before Width: | Height: | Size: 923 B After Width: | Height: | Size: 923 B |
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 43 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 8.0 KiB |
Before Width: | Height: | Size: 209 B After Width: | Height: | Size: 209 B |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 157 B After Width: | Height: | Size: 157 B |
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 211 B |
Before Width: | Height: | Size: 393 B After Width: | Height: | Size: 393 B |
Before Width: | Height: | Size: 499 B After Width: | Height: | Size: 499 B |
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 6.3 KiB |
Before Width: | Height: | Size: 504 B After Width: | Height: | Size: 504 B |
Before Width: | Height: | Size: 724 KiB After Width: | Height: | Size: 724 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 798 B After Width: | Height: | Size: 798 B |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 820 B After Width: | Height: | Size: 820 B |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 778 B After Width: | Height: | Size: 778 B |
After Width: | Height: | Size: 2.7 KiB |
After Width: | Height: | Size: 104 KiB |
After Width: | Height: | Size: 3.6 KiB |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 1.0 KiB |
After Width: | Height: | Size: 2.2 KiB |
After Width: | Height: | Size: 613 B |
After Width: | Height: | Size: 845 B |
After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 548 B After Width: | Height: | Size: 548 B |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 54 KiB |
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 46 KiB |
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 7.0 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 918 B After Width: | Height: | Size: 918 B |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 8.6 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 735 B After Width: | Height: | Size: 735 B |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 228 KiB After Width: | Height: | Size: 228 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 927 B After Width: | Height: | Size: 927 B |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |