Description:
merge algo with java, finally....
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r709:731a09331136 - - The requested commit is too big and content was truncated. 539 files changed. Show full diff
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| @@ -20,7 +20,16 | |||||
|
|
20 |
|
20 | ||
|
|
21 | #ignore public assets??? |
|
21 | #ignore public assets??? |
|
|
22 | /public/assets |
|
22 | /public/assets |
|
|
|
23 | + /public | ||
|
|
|
24 | + | ||
|
|
|
25 | + /data | ||
|
|
23 |
|
26 | ||
|
|
24 | #ignore .orig and .swp |
|
27 | #ignore .orig and .swp |
|
|
25 | *.orig |
|
28 | *.orig |
|
|
26 | *.swp |
|
29 | *.swp |
|
|
|
30 | + | ||
|
|
|
31 | + #ignore rvm setting file | ||
|
|
|
32 | + .ruby-gemset | ||
|
|
|
33 | + .ruby-version | ||
|
|
|
34 | + | ||
|
|
|
35 | + /config/secrets.yml | ||
| @@ -1,27 +1,34 | |||||
|
|
1 | source 'https://rubygems.org' |
|
1 | source 'https://rubygems.org' |
|
|
2 |
|
2 | ||
|
|
3 | - gem 'rails', '~> 3.2' |
|
3 | + #rails |
|
|
|
4 | + gem 'rails', '~>4.2.0' | ||
|
|
|
5 | + gem 'activerecord-session_store' | ||
|
|
4 |
|
6 | ||
|
|
5 | - gem 'select2-rails' |
|
||
|
|
6 |
|
7 | ||
|
|
7 | # Bundle edge Rails instead: |
|
8 | # Bundle edge Rails instead: |
|
|
8 | # gem 'rails', :git => 'git://github.com/rails/rails.git' |
|
9 | # gem 'rails', :git => 'git://github.com/rails/rails.git' |
|
|
9 |
|
10 | ||
|
|
|
11 | + #---------------- database --------------------- | ||
|
|
|
12 | + #the database | ||
|
|
10 | gem 'mysql2' |
|
13 | gem 'mysql2' |
|
|
|
14 | + #for testing | ||
|
|
|
15 | + gem 'sqlite3' | ||
|
|
|
16 | + #for dumping database into yaml | ||
|
|
|
17 | + gem 'yaml_db' | ||
|
|
11 |
|
18 | ||
|
|
12 | # Gems used only for assets and not required |
|
19 | # Gems used only for assets and not required |
|
|
13 | # in production environments by default. |
|
20 | # in production environments by default. |
|
|
14 | - group :assets do |
|
21 | + gem 'sass-rails' |
|
|
15 | - gem 'sass-rails', '~> 3.2.6' |
|
22 | + gem 'coffee-rails' |
|
|
16 | - gem 'coffee-rails', '~> 3.2.2' |
|
||
|
|
17 |
|
23 | ||
|
|
18 | # See https://github.com/sstephenson/execjs#readme for more supported runtimes |
|
24 | # See https://github.com/sstephenson/execjs#readme for more supported runtimes |
|
|
19 | # gem 'therubyracer', :platforms => :ruby |
|
25 | # gem 'therubyracer', :platforms => :ruby |
|
|
20 |
|
26 | ||
|
|
21 |
- |
|
27 | + gem 'uglifier' |
|
|
22 | - end |
|
||
|
|
23 |
|
28 | ||
|
|
24 | - gem 'prototype-rails' |
|
29 | + gem 'haml' |
|
|
|
30 | + gem 'haml-rails' | ||
|
|
|
31 | + # gem 'prototype-rails' | ||
|
|
25 |
|
32 | ||
|
|
26 | # To use ActiveModel has_secure_password |
|
33 | # To use ActiveModel has_secure_password |
|
|
27 | # gem 'bcrypt-ruby', '~> 3.0.0' |
|
34 | # gem 'bcrypt-ruby', '~> 3.0.0' |
| @@ -44,7 +51,7 | |||||
|
|
44 |
|
51 | ||
|
|
45 | # jquery addition |
|
52 | # jquery addition |
|
|
46 | gem 'jquery-rails' |
|
53 | gem 'jquery-rails' |
|
|
47 |
- gem 'jquery-ui- |
|
54 | + gem 'jquery-ui-rails' |
|
|
48 | gem 'jquery-timepicker-addon-rails' |
|
55 | gem 'jquery-timepicker-addon-rails' |
|
|
49 | gem 'jquery-tablesorter' |
|
56 | gem 'jquery-tablesorter' |
|
|
50 | gem 'jquery-countdown-rails' |
|
57 | gem 'jquery-countdown-rails' |
| @@ -52,29 +59,34 | |||||
|
|
52 | #syntax highlighter |
|
59 | #syntax highlighter |
|
|
53 | gem 'rouge' |
|
60 | gem 'rouge' |
|
|
54 |
|
61 | ||
|
|
55 |
- # |
|
62 | + #bootstrap add-ons |
|
|
56 | gem 'bootstrap-sass', '~> 3.2.0' |
|
63 | gem 'bootstrap-sass', '~> 3.2.0' |
|
|
57 | gem 'bootstrap-switch-rails' |
|
64 | gem 'bootstrap-switch-rails' |
|
|
58 | gem 'bootstrap-toggle-rails' |
|
65 | gem 'bootstrap-toggle-rails' |
|
|
59 | gem 'autoprefixer-rails' |
|
66 | gem 'autoprefixer-rails' |
|
|
60 | - |
|
||
|
|
61 | - #bootstrap sortable |
|
||
|
|
62 | gem 'momentjs-rails' |
|
67 | gem 'momentjs-rails' |
|
|
63 | gem 'rails_bootstrap_sortable' |
|
68 | gem 'rails_bootstrap_sortable' |
|
|
|
69 | + gem 'bootstrap-datepicker-rails' | ||
|
|
|
70 | + gem 'bootstrap3-datetimepicker-rails' | ||
|
|
|
71 | + gem 'jquery-datatables-rails' | ||
|
|
64 |
|
72 | ||
|
|
|
73 | + #----------- user interface ----------------- | ||
|
|
|
74 | + #select 2 | ||
|
|
|
75 | + gem 'select2-rails' | ||
|
|
65 | #ace editor |
|
76 | #ace editor |
|
|
66 | gem 'ace-rails-ap' |
|
77 | gem 'ace-rails-ap' |
|
|
|
78 | + #paginator | ||
|
|
|
79 | + gem 'will_paginate', '~> 3.0.7' | ||
|
|
67 |
|
80 | ||
|
|
68 | - gem 'haml' |
|
||
|
|
69 | - gem 'haml-rails' |
|
||
|
|
70 | gem 'mail' |
|
81 | gem 'mail' |
|
|
71 | gem 'rdiscount' |
|
82 | gem 'rdiscount' |
|
|
72 | - gem 'test-unit' |
|
||
|
|
73 | - gem 'will_paginate', '~> 3.0.7' |
|
||
|
|
74 | gem 'dynamic_form' |
|
83 | gem 'dynamic_form' |
|
|
75 | gem 'in_place_editing' |
|
84 | gem 'in_place_editing' |
|
|
76 | gem 'verification', :git => 'https://github.com/sikachu/verification.git' |
|
85 | gem 'verification', :git => 'https://github.com/sikachu/verification.git' |
|
|
77 |
|
86 | ||
|
|
78 | - group :test, :development do |
|
87 | + |
|
|
79 | - gem 'rspec-rails', '~> 2.99.0' |
|
88 | + #---------------- testiing ----------------------- |
|
|
80 | - end |
|
89 | + gem 'minitest-reporters' |
|
|
|
90 | + | ||
|
|
|
91 | + #---------------- for console -------------------- | ||
|
|
|
92 | + gem 'fuzzy-string-match' | ||
| @@ -1,204 +1,247 | |||||
|
|
1 | GIT |
|
1 | GIT |
|
|
2 | remote: https://github.com/sikachu/verification.git |
|
2 | remote: https://github.com/sikachu/verification.git |
|
|
3 | - revision: 76eaf51b13276ecae54bd9cd115832595d2ff56d |
|
3 | + revision: ff31697b940d7b0e2ec65f08764215c96104e76d |
|
|
4 | specs: |
|
4 | specs: |
|
|
5 | verification (1.0.3) |
|
5 | verification (1.0.3) |
|
|
6 |
- actionpack (>= 3.0.0, < 5. |
|
6 | + actionpack (>= 3.0.0, < 5.1) |
|
|
7 |
- activesupport (>= 3.0.0, < 5. |
|
7 | + activesupport (>= 3.0.0, < 5.1) |
|
|
8 |
|
8 | ||
|
|
9 | GEM |
|
9 | GEM |
|
|
10 | remote: https://rubygems.org/ |
|
10 | remote: https://rubygems.org/ |
|
|
11 | specs: |
|
11 | specs: |
|
|
12 | - ace-rails-ap (4.0.2) |
|
12 | + RubyInline (3.12.4) |
|
|
13 | - actionmailer (3.2.22.5) |
|
13 | + ZenTest (~> 4.3) |
|
|
14 | - actionpack (= 3.2.22.5) |
|
14 | + ZenTest (4.11.1) |
|
|
15 | - mail (~> 2.5.4) |
|
15 | + ace-rails-ap (4.1.1) |
|
|
16 |
- action |
|
16 | + actionmailer (4.2.7.1) |
|
|
17 |
- acti |
|
17 | + actionpack (= 4.2.7.1) |
|
|
18 |
- acti |
|
18 | + actionview (= 4.2.7.1) |
|
|
19 | - builder (~> 3.0.0) |
|
19 | + activejob (= 4.2.7.1) |
|
|
|
20 | + mail (~> 2.5, >= 2.5.4) | ||
|
|
|
21 | + rails-dom-testing (~> 1.0, >= 1.0.5) | ||
|
|
|
22 | + actionpack (4.2.7.1) | ||
|
|
|
23 | + actionview (= 4.2.7.1) | ||
|
|
|
24 | + activesupport (= 4.2.7.1) | ||
|
|
|
25 | + rack (~> 1.6) | ||
|
|
|
26 | + rack-test (~> 0.6.2) | ||
|
|
|
27 | + rails-dom-testing (~> 1.0, >= 1.0.5) | ||
|
|
|
28 | + rails-html-sanitizer (~> 1.0, >= 1.0.2) | ||
|
|
|
29 | + actionview (4.2.7.1) | ||
|
|
|
30 | + activesupport (= 4.2.7.1) | ||
|
|
|
31 | + builder (~> 3.1) | ||
|
|
20 | erubis (~> 2.7.0) |
|
32 | erubis (~> 2.7.0) |
|
|
21 | - journey (~> 1.0.4) |
|
33 | + rails-dom-testing (~> 1.0, >= 1.0.5) |
|
|
22 | - rack (~> 1.4.5) |
|
34 | + rails-html-sanitizer (~> 1.0, >= 1.0.2) |
|
|
23 | - rack-cache (~> 1.2) |
|
35 | + activejob (4.2.7.1) |
|
|
24 |
- |
|
36 | + activesupport (= 4.2.7.1) |
|
|
25 | - sprockets (~> 2.2.1) |
|
37 | + globalid (>= 0.3.0) |
|
|
26 |
- activemodel ( |
|
38 | + activemodel (4.2.7.1) |
|
|
27 |
- activesupport (= |
|
39 | + activesupport (= 4.2.7.1) |
|
|
28 |
- builder (~> 3. |
|
40 | + builder (~> 3.1) |
|
|
29 |
- activerecord ( |
|
41 | + activerecord (4.2.7.1) |
|
|
30 |
- activemodel (= |
|
42 | + activemodel (= 4.2.7.1) |
|
|
31 |
- activesupport (= |
|
43 | + activesupport (= 4.2.7.1) |
|
|
32 |
- arel (~> |
|
44 | + arel (~> 6.0) |
|
|
33 | - tzinfo (~> 0.3.29) |
|
45 | + activerecord-session_store (1.0.0) |
|
|
34 | - activeresource (3.2.22.5) |
|
46 | + actionpack (>= 4.0, < 5.1) |
|
|
35 |
- active |
|
47 | + activerecord (>= 4.0, < 5.1) |
|
|
36 | - activesupport (= 3.2.22.5) |
|
48 | + multi_json (~> 1.11, >= 1.11.2) |
|
|
37 | - activesupport (3.2.22.5) |
|
49 | + rack (>= 1.5.2, < 3) |
|
|
38 | - i18n (~> 0.6, >= 0.6.4) |
|
50 | + railties (>= 4.0, < 5.1) |
|
|
39 | - multi_json (~> 1.0) |
|
51 | + activesupport (4.2.7.1) |
|
|
40 | - arel (3.0.3) |
|
52 | + i18n (~> 0.7) |
|
|
41 | - autoprefixer-rails (6.0.3) |
|
53 | + json (~> 1.7, >= 1.7.7) |
|
|
|
54 | + minitest (~> 5.1) | ||
|
|
|
55 | + thread_safe (~> 0.3, >= 0.3.4) | ||
|
|
|
56 | + tzinfo (~> 1.1) | ||
|
|
|
57 | + ansi (1.5.0) | ||
|
|
|
58 | + arel (6.0.4) | ||
|
|
|
59 | + autoprefixer-rails (6.6.0) | ||
|
|
42 | execjs |
|
60 | execjs |
|
|
43 | - json |
|
||
|
|
44 | best_in_place (3.0.3) |
|
61 | best_in_place (3.0.3) |
|
|
45 | actionpack (>= 3.2) |
|
62 | actionpack (>= 3.2) |
|
|
46 | railties (>= 3.2) |
|
63 | railties (>= 3.2) |
|
|
|
64 | + bootstrap-datepicker-rails (1.7.1.1) | ||
|
|
|
65 | + railties (>= 3.0) | ||
|
|
47 | bootstrap-sass (3.2.0.2) |
|
66 | bootstrap-sass (3.2.0.2) |
|
|
48 | sass (~> 3.2) |
|
67 | sass (~> 3.2) |
|
|
49 | bootstrap-switch-rails (3.3.3) |
|
68 | bootstrap-switch-rails (3.3.3) |
|
|
50 | bootstrap-toggle-rails (2.2.1.0) |
|
69 | bootstrap-toggle-rails (2.2.1.0) |
|
|
51 | - builder (3.0.4) |
|
70 | + bootstrap3-datetimepicker-rails (4.17.47) |
|
|
52 |
- |
|
71 | + momentjs-rails (>= 2.8.1) |
|
|
|
72 | + builder (3.2.2) | ||
|
|
|
73 | + coffee-rails (4.2.1) | ||
|
|
53 | coffee-script (>= 2.2.0) |
|
74 | coffee-script (>= 2.2.0) |
|
|
54 |
- railties ( |
|
75 | + railties (>= 4.0.0, < 5.2.x) |
|
|
55 |
- coffee-script (2. |
|
76 | + coffee-script (2.4.1) |
|
|
56 | coffee-script-source |
|
77 | coffee-script-source |
|
|
57 | execjs |
|
78 | execjs |
|
|
58 |
- coffee-script-source (1. |
|
79 | + coffee-script-source (1.12.2) |
|
|
59 | - diff-lcs (1.2.5) |
|
80 | + concurrent-ruby (1.0.4) |
|
|
60 | dynamic_form (1.1.4) |
|
81 | dynamic_form (1.1.4) |
|
|
61 | erubis (2.7.0) |
|
82 | erubis (2.7.0) |
|
|
62 |
- execjs (2. |
|
83 | + execjs (2.7.0) |
|
|
63 | - haml (4.0.6) |
|
84 | + fuzzy-string-match (1.0.0) |
|
|
|
85 | + RubyInline (>= 3.8.6) | ||
|
|
|
86 | + globalid (0.3.7) | ||
|
|
|
87 | + activesupport (>= 4.1.0) | ||
|
|
|
88 | + haml (4.0.7) | ||
|
|
64 | tilt |
|
89 | tilt |
|
|
65 |
- haml-rails (0. |
|
90 | + haml-rails (0.9.0) |
|
|
66 |
- actionpack (>= |
|
91 | + actionpack (>= 4.0.1) |
|
|
67 |
- activesupport (>= |
|
92 | + activesupport (>= 4.0.1) |
|
|
68 |
- haml (>= |
|
93 | + haml (>= 4.0.6, < 5.0) |
|
|
69 |
- |
|
94 | + html2haml (>= 1.0.1) |
|
|
70 | - hike (1.2.3) |
|
95 | + railties (>= 4.0.1) |
|
|
|
96 | + html2haml (2.0.0) | ||
|
|
|
97 | + erubis (~> 2.7.0) | ||
|
|
|
98 | + haml (~> 4.0.0) | ||
|
|
|
99 | + nokogiri (~> 1.6.0) | ||
|
|
|
100 | + ruby_parser (~> 3.5) | ||
|
|
71 | i18n (0.7.0) |
|
101 | i18n (0.7.0) |
|
|
72 | in_place_editing (1.2.0) |
|
102 | in_place_editing (1.2.0) |
|
|
73 | - journey (1.0.4) |
|
||
|
|
74 | jquery-countdown-rails (2.0.2) |
|
103 | jquery-countdown-rails (2.0.2) |
|
|
75 |
- jquery-rails (3. |
|
104 | + jquery-datatables-rails (3.4.0) |
|
|
76 |
- |
|
105 | + actionpack (>= 3.1) |
|
|
|
106 | + jquery-rails | ||
|
|
|
107 | + railties (>= 3.1) | ||
|
|
|
108 | + sass-rails | ||
|
|
|
109 | + jquery-rails (4.2.1) | ||
|
|
|
110 | + rails-dom-testing (>= 1, < 3) | ||
|
|
|
111 | + railties (>= 4.2.0) | ||
|
|
77 | thor (>= 0.14, < 2.0) |
|
112 | thor (>= 0.14, < 2.0) |
|
|
78 |
- jquery-tablesorter (1. |
|
113 | + jquery-tablesorter (1.23.3) |
|
|
79 |
- railties (>= 3. |
|
114 | + railties (>= 3.2, < 6) |
|
|
80 | jquery-timepicker-addon-rails (1.4.1) |
|
115 | jquery-timepicker-addon-rails (1.4.1) |
|
|
81 | railties (>= 3.1) |
|
116 | railties (>= 3.1) |
|
|
82 |
- jquery-ui-rails ( |
|
117 | + jquery-ui-rails (6.0.1) |
|
|
83 | - jquery-rails |
|
118 | + railties (>= 3.2.16) |
|
|
84 | - railties (>= 3.1.0) |
|
119 | + json (1.8.3) |
|
|
85 | - jquery-ui-sass-rails (4.0.3.0) |
|
120 | + loofah (2.0.3) |
|
|
86 | - jquery-rails |
|
121 | + nokogiri (>= 1.5.9) |
|
|
87 | - jquery-ui-rails (= 4.0.3) |
|
122 | + mail (2.6.4) |
|
|
88 |
- |
|
123 | + mime-types (>= 1.16, < 4) |
|
|
89 | - json (2.0.2) |
|
124 | + mime-types (3.1) |
|
|
90 | - mail (2.5.4) |
|
125 | + mime-types-data (~> 3.2015) |
|
|
91 |
- |
|
126 | + mime-types-data (3.2016.0521) |
|
|
92 | - treetop (~> 1.4.8) |
|
127 | + mini_portile2 (2.1.0) |
|
|
93 |
- mi |
|
128 | + minitest (5.10.1) |
|
|
94 | - momentjs-rails (2.11.1) |
|
129 | + minitest-reporters (1.1.13) |
|
|
|
130 | + ansi | ||
|
|
|
131 | + builder | ||
|
|
|
132 | + minitest (>= 5.0) | ||
|
|
|
133 | + ruby-progressbar | ||
|
|
|
134 | + momentjs-rails (2.15.1) | ||
|
|
95 | railties (>= 3.1) |
|
135 | railties (>= 3.1) |
|
|
96 | multi_json (1.12.1) |
|
136 | multi_json (1.12.1) |
|
|
97 |
- mysql2 (0. |
|
137 | + mysql2 (0.4.5) |
|
|
98 | - polyglot (0.3.5) |
|
138 | + nokogiri (1.6.8.1) |
|
|
99 | - power_assert (0.2.2) |
|
139 | + mini_portile2 (~> 2.1.0) |
|
|
100 | - prototype-rails (3.2.1) |
|
140 | + rack (1.6.5) |
|
|
101 | - rails (~> 3.2) |
|
||
|
|
102 | - rack (1.4.7) |
|
||
|
|
103 | - rack-cache (1.6.1) |
|
||
|
|
104 | - rack (>= 0.4) |
|
||
|
|
105 | - rack-ssl (1.3.4) |
|
||
|
|
106 | - rack |
|
||
|
|
107 | rack-test (0.6.3) |
|
141 | rack-test (0.6.3) |
|
|
108 | rack (>= 1.0) |
|
142 | rack (>= 1.0) |
|
|
109 |
- rails ( |
|
143 | + rails (4.2.7.1) |
|
|
110 |
- actionmailer (= |
|
144 | + actionmailer (= 4.2.7.1) |
|
|
111 |
- actionpack (= |
|
145 | + actionpack (= 4.2.7.1) |
|
|
112 |
- acti |
|
146 | + actionview (= 4.2.7.1) |
|
|
113 |
- active |
|
147 | + activejob (= 4.2.7.1) |
|
|
114 |
- active |
|
148 | + activemodel (= 4.2.7.1) |
|
|
115 | - bundler (~> 1.0) |
|
149 | + activerecord (= 4.2.7.1) |
|
|
116 |
- |
|
150 | + activesupport (= 4.2.7.1) |
|
|
117 | - rails_bootstrap_sortable (2.0.0) |
|
151 | + bundler (>= 1.3.0, < 2.0) |
|
|
118 |
- |
|
152 | + railties (= 4.2.7.1) |
|
|
119 | - railties (3.2.22.5) |
|
153 | + sprockets-rails |
|
|
120 | - actionpack (= 3.2.22.5) |
|
154 | + rails-deprecated_sanitizer (1.0.3) |
|
|
121 |
- activesupport ( |
|
155 | + activesupport (>= 4.2.0.alpha) |
|
|
122 | - rack-ssl (~> 1.3.2) |
|
156 | + rails-dom-testing (1.0.8) |
|
|
|
157 | + activesupport (>= 4.2.0.beta, < 5.0) | ||
|
|
|
158 | + nokogiri (~> 1.6) | ||
|
|
|
159 | + rails-deprecated_sanitizer (>= 1.0.1) | ||
|
|
|
160 | + rails-html-sanitizer (1.0.3) | ||
|
|
|
161 | + loofah (~> 2.0) | ||
|
|
|
162 | + rails_bootstrap_sortable (2.0.1) | ||
|
|
|
163 | + momentjs-rails (>= 2.8.3) | ||
|
|
|
164 | + railties (4.2.7.1) | ||
|
|
|
165 | + actionpack (= 4.2.7.1) | ||
|
|
|
166 | + activesupport (= 4.2.7.1) | ||
|
|
123 | rake (>= 0.8.7) |
|
167 | rake (>= 0.8.7) |
|
|
124 | - rdoc (~> 3.4) |
|
168 | + thor (>= 0.18.1, < 2.0) |
|
|
125 | - thor (>= 0.14.6, < 2.0) |
|
169 | + rake (12.0.0) |
|
|
126 | - rake (11.2.2) |
|
170 | + rdiscount (2.2.0.1) |
|
|
127 |
- r |
|
171 | + rouge (2.0.7) |
|
|
128 | - rdoc (3.9.5) |
|
172 | + ruby-progressbar (1.8.1) |
|
|
129 |
- r |
|
173 | + ruby_parser (3.8.3) |
|
|
130 | - rspec-collection_matchers (1.1.2) |
|
174 | + sexp_processor (~> 4.1) |
|
|
131 | - rspec-expectations (>= 2.99.0.beta1) |
|
175 | + sass (3.4.23) |
|
|
132 | - rspec-core (2.99.2) |
|
176 | + sass-rails (5.0.6) |
|
|
133 | - rspec-expectations (2.99.2) |
|
177 | + railties (>= 4.0.0, < 6) |
|
|
134 | - diff-lcs (>= 1.1.3, < 2.0) |
|
178 | + sass (~> 3.1) |
|
|
135 | - rspec-mocks (2.99.3) |
|
179 | + sprockets (>= 2.8, < 4.0) |
|
|
136 |
- |
|
180 | + sprockets-rails (>= 2.0, < 4.0) |
|
|
137 |
- |
|
181 | + tilt (>= 1.1, < 3) |
|
|
138 | - activemodel (>= 3.0) |
|
182 | + select2-rails (4.0.3) |
|
|
139 | - activesupport (>= 3.0) |
|
||
|
|
140 | - railties (>= 3.0) |
|
||
|
|
141 | - rspec-collection_matchers |
|
||
|
|
142 | - rspec-core (~> 2.99.0) |
|
||
|
|
143 | - rspec-expectations (~> 2.99.0) |
|
||
|
|
144 | - rspec-mocks (~> 2.99.0) |
|
||
|
|
145 | - sass (3.4.11) |
|
||
|
|
146 | - sass-rails (3.2.6) |
|
||
|
|
147 | - railties (~> 3.2.0) |
|
||
|
|
148 | - sass (>= 3.1.10) |
|
||
|
|
149 | - tilt (~> 1.3) |
|
||
|
|
150 | - select2-rails (4.0.1) |
|
||
|
|
151 | thor (~> 0.14) |
|
183 | thor (~> 0.14) |
|
|
152 |
- s |
|
184 | + sexp_processor (4.7.0) |
|
|
153 | - hike (~> 1.2) |
|
185 | + sprockets (3.7.1) |
|
|
154 |
- |
|
186 | + concurrent-ruby (~> 1.0) |
|
|
155 |
- rack ( |
|
187 | + rack (> 1, < 3) |
|
|
156 | - tilt (~> 1.1, != 1.3.0) |
|
188 | + sprockets-rails (3.2.0) |
|
|
157 | - test-unit (3.0.9) |
|
189 | + actionpack (>= 4.0) |
|
|
158 | - power_assert |
|
190 | + activesupport (>= 4.0) |
|
|
159 | - thor (0.19.1) |
|
191 | + sprockets (>= 3.0.0) |
|
|
160 |
- |
|
192 | + sqlite3 (1.3.12) |
|
|
161 |
- tr |
|
193 | + thor (0.19.4) |
|
|
162 | - polyglot |
|
194 | + thread_safe (0.3.5) |
|
|
163 | - polyglot (>= 0.3.1) |
|
195 | + tilt (2.0.5) |
|
|
164 |
- tzinfo ( |
|
196 | + tzinfo (1.2.2) |
|
|
165 | - uglifier (2.7.0) |
|
197 | + thread_safe (~> 0.1) |
|
|
166 | - execjs (>= 0.3.0) |
|
198 | + uglifier (3.0.4) |
|
|
167 |
- |
|
199 | + execjs (>= 0.3.0, < 3) |
|
|
168 |
- will_paginate (3.0. |
|
200 | + will_paginate (3.0.12) |
|
|
|
201 | + yaml_db (0.4.2) | ||
|
|
|
202 | + rails (>= 3.0, < 5.1) | ||
|
|
|
203 | + rake (>= 0.8.7) | ||
|
|
169 |
|
204 | ||
|
|
170 | PLATFORMS |
|
205 | PLATFORMS |
|
|
171 | ruby |
|
206 | ruby |
|
|
172 |
|
207 | ||
|
|
173 | DEPENDENCIES |
|
208 | DEPENDENCIES |
|
|
174 | ace-rails-ap |
|
209 | ace-rails-ap |
|
|
|
210 | + activerecord-session_store | ||
|
|
175 | autoprefixer-rails |
|
211 | autoprefixer-rails |
|
|
176 | best_in_place (~> 3.0.1) |
|
212 | best_in_place (~> 3.0.1) |
|
|
|
213 | + bootstrap-datepicker-rails | ||
|
|
177 | bootstrap-sass (~> 3.2.0) |
|
214 | bootstrap-sass (~> 3.2.0) |
|
|
178 | bootstrap-switch-rails |
|
215 | bootstrap-switch-rails |
|
|
179 | bootstrap-toggle-rails |
|
216 | bootstrap-toggle-rails |
|
|
180 | - coffee-rails (~> 3.2.2) |
|
217 | + bootstrap3-datetimepicker-rails |
|
|
|
218 | + coffee-rails | ||
|
|
181 | dynamic_form |
|
219 | dynamic_form |
|
|
|
220 | + fuzzy-string-match | ||
|
|
182 | haml |
|
221 | haml |
|
|
183 | haml-rails |
|
222 | haml-rails |
|
|
184 | in_place_editing |
|
223 | in_place_editing |
|
|
185 | jquery-countdown-rails |
|
224 | jquery-countdown-rails |
|
|
|
225 | + jquery-datatables-rails | ||
|
|
186 | jquery-rails |
|
226 | jquery-rails |
|
|
187 | jquery-tablesorter |
|
227 | jquery-tablesorter |
|
|
188 | jquery-timepicker-addon-rails |
|
228 | jquery-timepicker-addon-rails |
|
|
189 |
- jquery-ui- |
|
229 | + jquery-ui-rails |
|
|
190 |
|
230 | ||
|
|
|
231 | + minitest-reporters | ||
|
|
191 | momentjs-rails |
|
232 | momentjs-rails |
|
|
192 | mysql2 |
|
233 | mysql2 |
|
|
193 | - prototype-rails |
|
234 | + rails (~> 4.2.0) |
|
|
194 | - rails (~> 3.2) |
|
||
|
|
195 | rails_bootstrap_sortable |
|
235 | rails_bootstrap_sortable |
|
|
196 | rdiscount |
|
236 | rdiscount |
|
|
197 | rouge |
|
237 | rouge |
|
|
198 | - rspec-rails (~> 2.99.0) |
|
238 | + sass-rails |
|
|
199 | - sass-rails (~> 3.2.6) |
|
||
|
|
200 | select2-rails |
|
239 | select2-rails |
|
|
201 | - test-unit |
|
240 | + sqlite3 |
|
|
202 | uglifier |
|
241 | uglifier |
|
|
203 | verification! |
|
242 | verification! |
|
|
204 | will_paginate (~> 3.0.7) |
|
243 | will_paginate (~> 3.0.7) |
|
|
|
244 | + yaml_db | ||
|
|
|
245 | + | ||
|
|
|
246 | + BUNDLED WITH | ||
|
|
|
247 | + 1.15.4 | ||
| @@ -12,10 +12,14 | |||||
|
|
12 | // |
|
12 | // |
|
|
13 | //= require jquery |
|
13 | //= require jquery |
|
|
14 | //= require jquery_ujs |
|
14 | //= require jquery_ujs |
|
|
15 |
- //= require jquery. |
|
15 | + //= require dataTables/jquery.dataTables |
|
|
|
16 | + //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap | ||
|
|
|
17 | + //= require jquery-ui | ||
|
|
16 | //= require bootstrap-sprockets |
|
18 | //= require bootstrap-sprockets |
|
|
17 | //= require moment |
|
19 | //= require moment |
|
|
|
20 | + //= require moment/th | ||
|
|
18 | //= require bootstrap-sortable |
|
21 | //= require bootstrap-sortable |
|
|
|
22 | + //= require bootstrap-datetimepicker | ||
|
|
19 | //= require select2 |
|
23 | //= require select2 |
|
|
20 | //= require ace-rails-ap |
|
24 | //= require ace-rails-ap |
|
|
21 | //= require ace/mode-c_cpp |
|
25 | //= require ace/mode-c_cpp |
| @@ -28,13 +32,12 | |||||
|
|
28 | //= require custom |
|
32 | //= require custom |
|
|
29 | //= require jquery.countdown |
|
33 | //= require jquery.countdown |
|
|
30 | //-------------- addition from local_jquery ----------- |
|
34 | //-------------- addition from local_jquery ----------- |
|
|
31 | - //= require jquery.ui.datepicker |
|
||
|
|
32 | - //= require jquery.ui.slider |
|
||
|
|
33 | - //= require jquery-ui-timepicker-addon |
|
||
|
|
34 | //= require jquery-tablesorter |
|
35 | //= require jquery-tablesorter |
|
|
35 | //= require best_in_place |
|
36 | //= require best_in_place |
|
|
36 | //= require best_in_place.jquery-ui |
|
37 | //= require best_in_place.jquery-ui |
|
|
37 | //= require brython |
|
38 | //= require brython |
|
|
|
39 | + //= require bootstrap-datepicker | ||
|
|
|
40 | + //= require bootstrap-datetimepicker | ||
|
|
38 |
|
41 | ||
|
|
39 | // since this is after blank line, it is not downloaded |
|
42 | // since this is after blank line, it is not downloaded |
|
|
40 | //x= require prototype |
|
43 | //x= require prototype |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| file renamed from app/views/users/profile.html.haml to app/views/users/stat.html.haml |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| modified file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
You need to be logged in to leave comments.
Login now