Compare commits
281 Commits
master
...
1018_new_u
Author | SHA1 | Date |
---|---|---|
Spen | df6e48cf74 | |
saurabhbhatia | 14fea3638f | |
chris | 7b1b1fa2d3 | |
Manson Wang | a67be030c5 | |
chris | a76164465e | |
saurabhbhatia | d2459f42c0 | |
saurabhbhatia | 155039ac16 | |
Manson Wang | 2bcecc322e | |
Spen | fbe6017382 | |
Harry Bomrah | df5cda7a98 | |
Harry Bomrah | fbea249782 | |
chris | 279ac774d4 | |
Manson Wang | 11b880752d | |
Manson Wang | 76ba7087b2 | |
Spen | b9fbba2962 | |
saurabhbhatia | 96c3be68f7 | |
saurabhbhatia | 5fb3731430 | |
saurabhbhatia | fb34dc673f | |
Harry Bomrah | 14ea611f8c | |
Harry Bomrah | 4f04eca74f | |
saurabhbhatia | 4120be6f8e | |
saurabhbhatia | ae66e7257f | |
saurabhbhatia | 55fa1cef4f | |
saurabhbhatia | 5c8a57e700 | |
saurabhbhatia | 7ef2dacf00 | |
chris | 08a8d668ec | |
chris | b4f5fddc5c | |
chris | 315a24556c | |
chris | cce68beff1 | |
chris | cf7f7aa29c | |
chris | 5328a26440 | |
chris | fe1869199e | |
chris | 061225f56c | |
saurabhbhatia | b3e16ce23b | |
saurabhbhatia | fad191aefe | |
chris | 2f866891b1 | |
chris | 48aa7ed638 | |
chris | 21db2a2cba | |
saurabhbhatia | 1194bdd9b4 | |
Manson Wang | 831bd722b8 | |
saurabhbhatia | 940a915125 | |
Manson Wang | 792785f7ba | |
chris | 43cf6b70b7 | |
saurabhbhatia | ba8da9b6bb | |
saurabhbhatia | ff93670949 | |
Spen | f85354c2b6 | |
chris | 06c48524fd | |
chris | 31ef12b3da | |
saurabhbhatia | 08907aa8c1 | |
saurabhbhatia | 31b55a0635 | |
chris | 433c8d5da6 | |
saurabhbhatia | b18e61a6c0 | |
saurabhbhatia | 4fe2e31f0e | |
saurabhbhatia | 31e4fb9f39 | |
saurabhbhatia | 9bdb633157 | |
Harry Bomrah | caca264b50 | |
saurabhbhatia | 9a0e9ddc82 | |
saurabhbhatia | 9f490c87d2 | |
saurabhbhatia | a9431ad17e | |
saurabhbhatia | d9ac24470f | |
Harry Bomrah | 2f673b20ad | |
Harry Bomrah | 0a9fd6a4b5 | |
Harry Bomrah | 74ca99a581 | |
chris | dfec6f7642 | |
Spen | 9186978551 | |
chris | 622534e5db | |
Harry Bomrah | 52c896d8c5 | |
Spen | 028c689739 | |
chris | f81894af90 | |
Manson Wang | dc3593c162 | |
Manson Wang | 16c26e3273 | |
Harry Bomrah | 5332162646 | |
Harry Bomrah | 1d0ea6718f | |
Harry Bomrah | 04ff345b94 | |
Harry Bomrah | 58fb2d1c73 | |
Spen | a067bcd304 | |
saurabhbhatia | b487740035 | |
Harry Bomrah | 1e3cffee0a | |
Harry Bomrah | e4a16eab3a | |
Harry Bomrah | e45b7e09a0 | |
Harry Bomrah | bd3462df7f | |
Harry Bomrah | f5f1822f0a | |
Harry Bomrah | d532ded8e4 | |
chris | 8456a91968 | |
chris | ba7ac5d954 | |
Spen | 9cc1e95cb1 | |
chris | c1cbfddf4b | |
Harry Bomrah | 3595c59810 | |
Harry Bomrah | 789e02e313 | |
Manson Wang | bb8bc9a529 | |
Manson | 6430e60577 | |
chris | 17d7912e07 | |
chris | 911cfdc980 | |
Harry Bomrah | 579bc3c245 | |
Harry Bomrah | 8c98645a69 | |
Harry Bomrah | 9e10a3c944 | |
Harry Bomrah | f920a4f6ba | |
chris | 3328a41b55 | |
chris | 06203d27b9 | |
saurabhbhatia | 865be29b37 | |
saurabhbhatia | 0eeb7db1a8 | |
saurabhbhatia | 7216676c40 | |
saurabhbhatia | fa857cfeea | |
saurabhbhatia | a3f1b8d54a | |
saurabhbhatia | e9d6fa8787 | |
saurabhbhatia | 6e032a8757 | |
saurabhbhatia | 1558cfdb4e | |
saurabhbhatia | 9e4686a565 | |
saurabhbhatia | fef7cc4ed2 | |
saurabhbhatia | 7f0821ea84 | |
saurabhbhatia | 2c0761aafb | |
saurabhbhatia | 1e5ad750cd | |
Harry Bomrah | 335991e152 | |
Harry Bomrah | 131dd3fea8 | |
chris | 6d8698af63 | |
Matt K. Fu | 00ddd94314 | |
chris | 8045a18230 | |
Spen | 81a89d2d7c | |
Harry Bomrah | 4209356e9d | |
Spen | 3123c5de0a | |
Harry Bomrah | 82b6be483a | |
Harry Bomrah | ff64fb5230 | |
saurabhbhatia | 2bc9d3424a | |
saurabhbhatia | 5591b06ee6 | |
saurabhbhatia | b970ea1e0e | |
saurabhbhatia | 155722519b | |
chris | 45e987d6f5 | |
Harry Bomrah | 399dfad392 | |
saurabhbhatia | 53e5c57970 | |
saurabhbhatia | e75873273c | |
saurabhbhatia | 4c217ec12f | |
saurabhbhatia | 452da1b8ec | |
chris | ec40591489 | |
Spen | 4078d426a6 | |
chris | c474fa063f | |
chris | d24bd176cc | |
Harry Bomrah | 897ed49d2e | |
saurabhbhatia | 21a7b5da5c | |
Harry Bomrah | b004121187 | |
saurabhbhatia | bc596614fb | |
Harry Bomrah | 88ad59f55a | |
saurabhbhatia | 7dfd5d7e00 | |
Harry Bomrah | bbb765c88d | |
Harry Bomrah | 6577885761 | |
Spen | a12e538932 | |
Harry Bomrah | a04155963d | |
Harry Bomrah | 6d54dbd5f8 | |
saurabhbhatia | cb070cc537 | |
Spen | 6c514770bc | |
Harry Bomrah | 9c7558847a | |
Harry Bomrah | 771ec0b8f6 | |
Harry Bomrah | d0ef862f85 | |
Harry Bomrah | b2c3beefe9 | |
Harry Bomrah | 55670e6318 | |
saurabhbhatia | 76d25882e8 | |
saurabhbhatia | 6269c6d1e6 | |
saurabhbhatia | 7c64e8c637 | |
saurabhbhatia | e14cb3c74c | |
saurabhbhatia | a2e9aa2e0b | |
saurabhbhatia | a5c800d3fe | |
Harry Bomrah | 0b6ace4e26 | |
Harry Bomrah | e3d9966f76 | |
Harry Bomrah | 7d288b4160 | |
Harry Bomrah | c2f223b82c | |
Harry Bomrah | 42615f02ea | |
chris | 0f3a8414be | |
chris | d632439f80 | |
saurabhbhatia | b1755bdc80 | |
saurabhbhatia | 2fea428b67 | |
saurabhbhatia | 7e67d389b9 | |
saurabhbhatia | 094c0f4314 | |
saurabhbhatia | d9079d9d7c | |
saurabhbhatia | aeaec79a2c | |
saurabhbhatia | e12b14311e | |
saurabhbhatia | 55d9aea664 | |
Harry Bomrah | 79c7f8e90f | |
Harry Bomrah | f7dbbf1bca | |
Harry Bomrah | 6d89eab98a | |
Harry Bomrah | c18a8a8c6f | |
Harry Bomrah | 38194311ab | |
Harry Bomrah | bd5f3d1a44 | |
Harry Bomrah | 5f9190db39 | |
devin chen | ac58b993c2 | |
devin chen | 2b12a4775c | |
devin chen | b085e826a5 | |
devin chen | ff375f0c5c | |
devin chen | 3cde26ca4a | |
Harry Bomrah | ed22a4d303 | |
devin chen | f2ada14b7a | |
devin chen | 9963395b05 | |
Harry Bomrah | 66582fb671 | |
devin chen | 4ae1fe68cd | |
Harry Bomrah | 2d616ab7a8 | |
devin chen | 874819266d | |
devin chen | 3ded19016a | |
Harry Bomrah | 9478bb13e2 | |
Harry Bomrah | cff77fbee5 | |
devin chen | ad68f63a7a | |
Harry Bomrah | 20521dc8b0 | |
devin chen | a458a50e97 | |
Harry Bomrah | ae8033ea1b | |
Harry Bomrah | dc94283af9 | |
Harry Bomrah | 78d6e33865 | |
Harry Bomrah | b70310c6fe | |
devin chen | 4215ed5538 | |
chris | 74b2bbf4b7 | |
chris | c85629d3b3 | |
chris | af98f8efce | |
chris | ff59feb2e7 | |
chris | f332a3191a | |
chris | d190a50046 | |
chris | fe10cc62d9 | |
chris | d434b878a7 | |
chris | b3cdffb59e | |
chris | fd432f30ba | |
chris | 0be8a74fa8 | |
chris | f60c190a11 | |
chris | da1d70efcb | |
chris | 0c208d0020 | |
chris | 1dc7884ec0 | |
saurabhbhatia | af0ab9f0d3 | |
saurabhbhatia | 9144622c41 | |
saurabhbhatia | 06ab24374b | |
saurabhbhatia | c7cf7e1ce4 | |
saurabhbhatia | 048f553be8 | |
saurabhbhatia | 7e3993b67f | |
saurabhbhatia | 8924d4f047 | |
Harry Bomrah | 57a64dc378 | |
saurabhbhatia | 3d3d5ed144 | |
Harry Bomrah | 4ff5724379 | |
chris | 0d0f85e7ad | |
chris | de6ce0073f | |
Spen | 5d3bc07488 | |
chris | 1ba1703e90 | |
chris | 2265b0b404 | |
chris | 6cf249ccfb | |
chris | 92faeccdb6 | |
chris | 5284571300 | |
chris | fe82427baa | |
rulingcom | 408bebaa4b | |
saurabhbhatia | c8292a7619 | |
saurabhbhatia | 7ea9945af0 | |
saurabhbhatia | 109b891b27 | |
saurabhbhatia | b642072cbe | |
chris | 1db324d1a2 | |
Harry Bomrah | 0921d7731b | |
Harry Bomrah | 3c0d2da9a7 | |
saurabhbhatia | e6c411b8e1 | |
saurabhbhatia | 1c558a1783 | |
Harry Bomrah | 3287a2ef17 | |
chris | fc09ac3b68 | |
chris | 5190c1160a | |
chris | 62288a71ca | |
saurabhbhatia | 91b1cf6edc | |
chris | 1c4b66f1cb | |
saurabhbhatia | 72861f05a6 | |
chris | 2c331bf1a5 | |
chris | bec0bd76e4 | |
chris | 6ce254a24c | |
chris | 5530419395 | |
chris | 5457afdada | |
chris | 65527017ca | |
chris | 856898016b | |
Matt K. Fu | be6d185be7 | |
Matt K. Fu | 113ed17fb5 | |
Matt K. Fu | c5ced8cf16 | |
Matt K. Fu | e037507b0e | |
Matt K. Fu | 2f01b72ed0 | |
Matt K. Fu | cd6dd40f45 | |
Matt K. Fu | 345c471fc9 | |
Matt K. Fu | ed06be93d6 | |
Matt K. Fu | 1268ce0ae9 | |
Harry Bomrah | d089822ff3 | |
Harry Bomrah | 777af19abb | |
Matt K. Fu | cd55f2aac2 | |
Harry Bomrah | 07e895fc42 | |
Harry Bomrah | 80bf3499be | |
Matt K. Fu | c4ec6c1ac9 | |
Matt K. Fu | 6f46a3f949 | |
Matt K. Fu | d78e816b4e | |
Matt K. Fu | e10eb833ed |
|
@ -14,9 +14,7 @@ public/uploads/**/*
|
|||
solr/data
|
||||
tmp/**/*
|
||||
uploads/**/*
|
||||
config/*.god
|
||||
log/*.gz
|
||||
tmp/restart.txt
|
||||
|
||||
*.swp
|
||||
*.pid
|
||||
*.lck
|
||||
|
@ -24,3 +22,4 @@ tmp/restart.txt
|
|||
.sass-cache/*
|
||||
*.supported
|
||||
mongoid.yml
|
||||
*.
|
||||
|
|
13
Gemfile
|
@ -11,15 +11,15 @@ gem "net-ldap", "~> 0.3.1"
|
|||
gem 'devise', '1.5.3'
|
||||
gem 'exception_notification' # Send error trace
|
||||
gem 'execjs'
|
||||
gem 'jquery-rails', '2.1.4'
|
||||
gem 'jquery-ui-rails'
|
||||
gem 'jquery-rails', '3.0.4'
|
||||
gem 'jquery-ui-rails', "4.0.5"
|
||||
gem "select2-rails", '3.3.1'
|
||||
gem 'kaminari'
|
||||
gem 'time_difference'
|
||||
gem "acts_as_unvlogable"
|
||||
gem 'youtube_it'
|
||||
gem 'gotcha'
|
||||
|
||||
|
||||
# gem "memcached", "~> 1.4.3"
|
||||
# gem "memcache-client"
|
||||
|
||||
|
@ -39,7 +39,7 @@ gem 'resque-scheduler' # job scheduling
|
|||
gem 'resque-restriction'
|
||||
#gem 'rb-readline'
|
||||
# gem 'ruby-debug19'
|
||||
gem 'rubyzip','0.9.9'
|
||||
gem 'rubyzip', '< 1.0.0'
|
||||
|
||||
gem 'sunspot_mongo'
|
||||
gem 'sunspot_solr'
|
||||
|
@ -50,7 +50,8 @@ gem 'sinatra'
|
|||
gem 'sprockets'
|
||||
gem 'social-share-button'
|
||||
|
||||
gem 'tinymce-rails', '3.5.8.3'
|
||||
gem 'ckeditor'
|
||||
# gem 'tinymce-rails', "~> 3.5.8"
|
||||
gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
|
||||
gem 'libv8', '~> 3.11.8' if RUBY_PLATFORM.downcase.include?("linux")
|
||||
gem 'mongoid-encryptor', :require => 'mongoid/encryptor'
|
||||
|
@ -97,6 +98,8 @@ group :test, :development do
|
|||
gem "watchr"
|
||||
gem "spork"
|
||||
gem "capybara"
|
||||
#gem 'rack-mini-profiler'
|
||||
gem "better_errors"
|
||||
# gem 'yard'
|
||||
# gem "bluecloth"
|
||||
end
|
||||
|
|
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: 824 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 |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 17 KiB |
After Width: | Height: | Size: 918 B |
After Width: | Height: | Size: 1.8 KiB |
After Width: | Height: | Size: 44 KiB |
After Width: | Height: | Size: 2.4 KiB |
After Width: | Height: | Size: 4.8 KiB |
After Width: | Height: | Size: 6.2 KiB |
After Width: | Height: | Size: 8.6 KiB |
After Width: | Height: | Size: 10 KiB |
After Width: | Height: | Size: 14 KiB |
After Width: | Height: | Size: 735 B |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 228 KiB |
After Width: | Height: | Size: 14 KiB |
After Width: | Height: | Size: 927 B |
After Width: | Height: | Size: 1.8 KiB |
After Width: | Height: | Size: 27 KiB |
After Width: | Height: | Size: 2.4 KiB |