Description:
merge latest feature to master branch
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r652:d4335f7f37b2 - - The requested commit is too big and content was truncated. 461 files changed. Show full diff
| @@ -0,0 +1,6 | |||||
|
|
|
1 | + #js for announcement | ||
|
|
|
2 | + $ -> | ||
|
|
|
3 | + $(document).ajaxError (event, jqxhr, settings, exception) -> | ||
|
|
|
4 | + if jqxhr.status | ||
|
|
|
5 | + alert 'We\'re sorry, but something went wrong (' + jqxhr.status + ')' | ||
|
|
|
6 | + return | ||
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| new file 100644 |
| @@ -17,10 +17,17 | |||||
|
|
17 | *~ |
|
17 | *~ |
|
|
18 |
|
18 | ||
|
|
19 | /vendor/plugins/rails_upgrade |
|
19 | /vendor/plugins/rails_upgrade |
|
|
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 | ||
| @@ -1,9 +1,11 | |||||
|
|
1 | source 'https://rubygems.org' |
|
1 | source 'https://rubygems.org' |
|
|
2 |
|
2 | ||
|
|
3 |
- gem 'rails', '3.2 |
|
3 | + gem 'rails', '~>3.2' |
|
|
|
4 | + | ||
|
|
|
5 | + gem 'select2-rails' | ||
|
|
4 |
|
6 | ||
|
|
5 | # Bundle edge Rails instead: |
|
7 | # Bundle edge Rails instead: |
|
|
6 | # gem 'rails', :git => 'git://github.com/rails/rails.git' |
|
8 | # gem 'rails', :git => 'git://github.com/rails/rails.git' |
|
|
7 |
|
9 | ||
|
|
8 | gem 'mysql2' |
|
10 | gem 'mysql2' |
|
|
9 |
|
11 | ||
| @@ -42,17 +44,32 | |||||
|
|
42 |
|
44 | ||
|
|
43 | # jquery addition |
|
45 | # jquery addition |
|
|
44 | gem 'jquery-rails' |
|
46 | gem 'jquery-rails' |
|
|
45 | gem 'jquery-ui-sass-rails' |
|
47 | gem 'jquery-ui-sass-rails' |
|
|
46 | gem 'jquery-timepicker-addon-rails' |
|
48 | gem 'jquery-timepicker-addon-rails' |
|
|
47 | gem 'jquery-tablesorter' |
|
49 | gem 'jquery-tablesorter' |
|
|
|
50 | + gem 'jquery-countdown-rails' | ||
|
|
48 |
|
51 | ||
|
|
49 | #syntax highlighter |
|
52 | #syntax highlighter |
|
|
50 | gem 'rouge' |
|
53 | gem 'rouge' |
|
|
51 |
|
54 | ||
|
|
|
55 | + #add bootstrap | ||
|
|
|
56 | + gem 'bootstrap-sass', '~> 3.2.0' | ||
|
|
|
57 | + gem 'bootstrap-switch-rails' | ||
|
|
|
58 | + gem 'bootstrap-toggle-rails' | ||
|
|
|
59 | + gem 'autoprefixer-rails' | ||
|
|
|
60 | + | ||
|
|
|
61 | + #bootstrap sortable | ||
|
|
|
62 | + gem 'momentjs-rails' | ||
|
|
|
63 | + gem 'rails_bootstrap_sortable' | ||
|
|
|
64 | + | ||
|
|
|
65 | + #ace editor | ||
|
|
|
66 | + gem 'ace-rails-ap' | ||
|
|
|
67 | + | ||
|
|
52 | gem 'haml' |
|
68 | gem 'haml' |
|
|
|
69 | + gem 'haml-rails' | ||
|
|
53 | gem 'mail' |
|
70 | gem 'mail' |
|
|
54 | gem 'rdiscount' |
|
71 | gem 'rdiscount' |
|
|
55 | gem 'test-unit' |
|
72 | gem 'test-unit' |
|
|
56 | gem 'will_paginate', '~> 3.0.7' |
|
73 | gem 'will_paginate', '~> 3.0.7' |
|
|
57 | gem 'dynamic_form' |
|
74 | gem 'dynamic_form' |
|
|
58 | gem 'in_place_editing' |
|
75 | gem 'in_place_editing' |
| @@ -6,43 +6,51 | |||||
|
|
6 | actionpack (>= 3.0.0, < 5.0) |
|
6 | actionpack (>= 3.0.0, < 5.0) |
|
|
7 | activesupport (>= 3.0.0, < 5.0) |
|
7 | activesupport (>= 3.0.0, < 5.0) |
|
|
8 |
|
8 | ||
|
|
9 | GEM |
|
9 | GEM |
|
|
10 | remote: https://rubygems.org/ |
|
10 | remote: https://rubygems.org/ |
|
|
11 | specs: |
|
11 | specs: |
|
|
12 | - actionmailer (3.2.21) |
|
12 | + ace-rails-ap (4.0.2) |
|
|
13 |
- |
|
13 | + actionmailer (3.2.22.5) |
|
|
|
14 | + actionpack (= 3.2.22.5) | ||
|
|
14 | mail (~> 2.5.4) |
|
15 | mail (~> 2.5.4) |
|
|
15 |
- actionpack (3.2.2 |
|
16 | + actionpack (3.2.22.5) |
|
|
16 |
- activemodel (= 3.2.2 |
|
17 | + activemodel (= 3.2.22.5) |
|
|
17 |
- activesupport (= 3.2.2 |
|
18 | + activesupport (= 3.2.22.5) |
|
|
18 | builder (~> 3.0.0) |
|
19 | builder (~> 3.0.0) |
|
|
19 | erubis (~> 2.7.0) |
|
20 | erubis (~> 2.7.0) |
|
|
20 | journey (~> 1.0.4) |
|
21 | journey (~> 1.0.4) |
|
|
21 | rack (~> 1.4.5) |
|
22 | rack (~> 1.4.5) |
|
|
22 | rack-cache (~> 1.2) |
|
23 | rack-cache (~> 1.2) |
|
|
23 | rack-test (~> 0.6.1) |
|
24 | rack-test (~> 0.6.1) |
|
|
24 | sprockets (~> 2.2.1) |
|
25 | sprockets (~> 2.2.1) |
|
|
25 |
- activemodel (3.2.2 |
|
26 | + activemodel (3.2.22.5) |
|
|
26 |
- activesupport (= 3.2.2 |
|
27 | + activesupport (= 3.2.22.5) |
|
|
27 | builder (~> 3.0.0) |
|
28 | builder (~> 3.0.0) |
|
|
28 |
- activerecord (3.2.2 |
|
29 | + activerecord (3.2.22.5) |
|
|
29 |
- activemodel (= 3.2.2 |
|
30 | + activemodel (= 3.2.22.5) |
|
|
30 |
- activesupport (= 3.2.2 |
|
31 | + activesupport (= 3.2.22.5) |
|
|
31 | arel (~> 3.0.2) |
|
32 | arel (~> 3.0.2) |
|
|
32 | tzinfo (~> 0.3.29) |
|
33 | tzinfo (~> 0.3.29) |
|
|
33 |
- activeresource (3.2.2 |
|
34 | + activeresource (3.2.22.5) |
|
|
34 |
- activemodel (= 3.2.2 |
|
35 | + activemodel (= 3.2.22.5) |
|
|
35 |
- activesupport (= 3.2.2 |
|
36 | + activesupport (= 3.2.22.5) |
|
|
36 |
- activesupport (3.2.2 |
|
37 | + activesupport (3.2.22.5) |
|
|
37 | i18n (~> 0.6, >= 0.6.4) |
|
38 | i18n (~> 0.6, >= 0.6.4) |
|
|
38 | multi_json (~> 1.0) |
|
39 | multi_json (~> 1.0) |
|
|
39 | arel (3.0.3) |
|
40 | arel (3.0.3) |
|
|
|
41 | + autoprefixer-rails (6.0.3) | ||
|
|
|
42 | + execjs | ||
|
|
|
43 | + json | ||
|
|
40 | best_in_place (3.0.3) |
|
44 | best_in_place (3.0.3) |
|
|
41 | actionpack (>= 3.2) |
|
45 | actionpack (>= 3.2) |
|
|
42 | railties (>= 3.2) |
|
46 | railties (>= 3.2) |
|
|
|
47 | + bootstrap-sass (3.2.0.2) | ||
|
|
|
48 | + sass (~> 3.2) | ||
|
|
|
49 | + bootstrap-switch-rails (3.3.3) | ||
|
|
|
50 | + bootstrap-toggle-rails (2.2.1.0) | ||
|
|
43 | builder (3.0.4) |
|
51 | builder (3.0.4) |
|
|
44 | coffee-rails (3.2.2) |
|
52 | coffee-rails (3.2.2) |
|
|
45 | coffee-script (>= 2.2.0) |
|
53 | coffee-script (>= 2.2.0) |
|
|
46 | railties (~> 3.2.0) |
|
54 | railties (~> 3.2.0) |
|
|
47 | coffee-script (2.3.0) |
|
55 | coffee-script (2.3.0) |
|
|
48 | coffee-script-source |
|
56 | coffee-script-source |
| @@ -51,16 +59,22 | |||||
|
|
51 | diff-lcs (1.2.5) |
|
59 | diff-lcs (1.2.5) |
|
|
52 | dynamic_form (1.1.4) |
|
60 | dynamic_form (1.1.4) |
|
|
53 | erubis (2.7.0) |
|
61 | erubis (2.7.0) |
|
|
54 | execjs (2.3.0) |
|
62 | execjs (2.3.0) |
|
|
55 | haml (4.0.6) |
|
63 | haml (4.0.6) |
|
|
56 | tilt |
|
64 | tilt |
|
|
|
65 | + haml-rails (0.4) | ||
|
|
|
66 | + actionpack (>= 3.1, < 4.1) | ||
|
|
|
67 | + activesupport (>= 3.1, < 4.1) | ||
|
|
|
68 | + haml (>= 3.1, < 4.1) | ||
|
|
|
69 | + railties (>= 3.1, < 4.1) | ||
|
|
57 | hike (1.2.3) |
|
70 | hike (1.2.3) |
|
|
58 | i18n (0.7.0) |
|
71 | i18n (0.7.0) |
|
|
59 | in_place_editing (1.2.0) |
|
72 | in_place_editing (1.2.0) |
|
|
60 | journey (1.0.4) |
|
73 | journey (1.0.4) |
|
|
|
74 | + jquery-countdown-rails (2.0.2) | ||
|
|
61 | jquery-rails (3.1.2) |
|
75 | jquery-rails (3.1.2) |
|
|
62 | railties (>= 3.0, < 5.0) |
|
76 | railties (>= 3.0, < 5.0) |
|
|
63 | thor (>= 0.14, < 2.0) |
|
77 | thor (>= 0.14, < 2.0) |
|
|
64 | jquery-tablesorter (1.13.4) |
|
78 | jquery-tablesorter (1.13.4) |
|
|
65 | railties (>= 3.1, < 5) |
|
79 | railties (>= 3.1, < 5) |
|
|
66 | jquery-timepicker-addon-rails (1.4.1) |
|
80 | jquery-timepicker-addon-rails (1.4.1) |
| @@ -69,46 +83,50 | |||||
|
|
69 | jquery-rails |
|
83 | jquery-rails |
|
|
70 | railties (>= 3.1.0) |
|
84 | railties (>= 3.1.0) |
|
|
71 | jquery-ui-sass-rails (4.0.3.0) |
|
85 | jquery-ui-sass-rails (4.0.3.0) |
|
|
72 | jquery-rails |
|
86 | jquery-rails |
|
|
73 | jquery-ui-rails (= 4.0.3) |
|
87 | jquery-ui-rails (= 4.0.3) |
|
|
74 | railties (>= 3.1.0) |
|
88 | railties (>= 3.1.0) |
|
|
75 |
- json (1.8. |
|
89 | + json (1.8.3) |
|
|
76 | mail (2.5.4) |
|
90 | mail (2.5.4) |
|
|
77 | mime-types (~> 1.16) |
|
91 | mime-types (~> 1.16) |
|
|
78 | treetop (~> 1.4.8) |
|
92 | treetop (~> 1.4.8) |
|
|
79 | mime-types (1.25.1) |
|
93 | mime-types (1.25.1) |
|
|
80 | - multi_json (1.10.1) |
|
94 | + momentjs-rails (2.11.1) |
|
|
81 | - mysql2 (0.3.17) |
|
95 | + railties (>= 3.1) |
|
|
|
96 | + multi_json (1.12.1) | ||
|
|
|
97 | + mysql2 (0.3.20) | ||
|
|
82 | polyglot (0.3.5) |
|
98 | polyglot (0.3.5) |
|
|
83 | power_assert (0.2.2) |
|
99 | power_assert (0.2.2) |
|
|
84 | prototype-rails (3.2.1) |
|
100 | prototype-rails (3.2.1) |
|
|
85 | rails (~> 3.2) |
|
101 | rails (~> 3.2) |
|
|
86 |
- rack (1.4. |
|
102 | + rack (1.4.7) |
|
|
87 |
- rack-cache (1. |
|
103 | + rack-cache (1.6.1) |
|
|
88 | rack (>= 0.4) |
|
104 | rack (>= 0.4) |
|
|
89 | rack-ssl (1.3.4) |
|
105 | rack-ssl (1.3.4) |
|
|
90 | rack |
|
106 | rack |
|
|
91 | rack-test (0.6.3) |
|
107 | rack-test (0.6.3) |
|
|
92 | rack (>= 1.0) |
|
108 | rack (>= 1.0) |
|
|
93 |
- rails (3.2.2 |
|
109 | + rails (3.2.22.5) |
|
|
94 |
- actionmailer (= 3.2.2 |
|
110 | + actionmailer (= 3.2.22.5) |
|
|
95 |
- actionpack (= 3.2.2 |
|
111 | + actionpack (= 3.2.22.5) |
|
|
96 |
- activerecord (= 3.2.2 |
|
112 | + activerecord (= 3.2.22.5) |
|
|
97 |
- activeresource (= 3.2.2 |
|
113 | + activeresource (= 3.2.22.5) |
|
|
98 |
- activesupport (= 3.2.2 |
|
114 | + activesupport (= 3.2.22.5) |
|
|
99 | bundler (~> 1.0) |
|
115 | bundler (~> 1.0) |
|
|
100 |
- railties (= 3.2.2 |
|
116 | + railties (= 3.2.22.5) |
|
|
101 | - railties (3.2.21) |
|
117 | + rails_bootstrap_sortable (2.0.0) |
|
|
102 | - actionpack (= 3.2.21) |
|
118 | + momentjs-rails (~> 2, >= 2.8.3) |
|
|
103 |
- |
|
119 | + railties (3.2.22.5) |
|
|
|
120 | + actionpack (= 3.2.22.5) | ||
|
|
|
121 | + activesupport (= 3.2.22.5) | ||
|
|
104 | rack-ssl (~> 1.3.2) |
|
122 | rack-ssl (~> 1.3.2) |
|
|
105 | rake (>= 0.8.7) |
|
123 | rake (>= 0.8.7) |
|
|
106 | rdoc (~> 3.4) |
|
124 | rdoc (~> 3.4) |
|
|
107 | thor (>= 0.14.6, < 2.0) |
|
125 | thor (>= 0.14.6, < 2.0) |
|
|
108 |
- rake (1 |
|
126 | + rake (11.2.2) |
|
|
109 | rdiscount (2.1.8) |
|
127 | rdiscount (2.1.8) |
|
|
110 | rdoc (3.12.2) |
|
128 | rdoc (3.12.2) |
|
|
111 | json (~> 1.4) |
|
129 | json (~> 1.4) |
|
|
112 | rouge (1.8.0) |
|
130 | rouge (1.8.0) |
|
|
113 | rspec-collection_matchers (1.1.2) |
|
131 | rspec-collection_matchers (1.1.2) |
|
|
114 | rspec-expectations (>= 2.99.0.beta1) |
|
132 | rspec-expectations (>= 2.99.0.beta1) |
| @@ -127,49 +145,64 | |||||
|
|
127 | rspec-mocks (~> 2.99.0) |
|
145 | rspec-mocks (~> 2.99.0) |
|
|
128 | sass (3.4.11) |
|
146 | sass (3.4.11) |
|
|
129 | sass-rails (3.2.6) |
|
147 | sass-rails (3.2.6) |
|
|
130 | railties (~> 3.2.0) |
|
148 | railties (~> 3.2.0) |
|
|
131 | sass (>= 3.1.10) |
|
149 | sass (>= 3.1.10) |
|
|
132 | tilt (~> 1.3) |
|
150 | tilt (~> 1.3) |
|
|
|
151 | + select2-rails (4.0.1) | ||
|
|
|
152 | + thor (~> 0.14) | ||
|
|
133 | sprockets (2.2.3) |
|
153 | sprockets (2.2.3) |
|
|
134 | hike (~> 1.2) |
|
154 | hike (~> 1.2) |
|
|
135 | multi_json (~> 1.0) |
|
155 | multi_json (~> 1.0) |
|
|
136 | rack (~> 1.0) |
|
156 | rack (~> 1.0) |
|
|
137 | tilt (~> 1.1, != 1.3.0) |
|
157 | tilt (~> 1.1, != 1.3.0) |
|
|
138 | test-unit (3.0.9) |
|
158 | test-unit (3.0.9) |
|
|
139 | power_assert |
|
159 | power_assert |
|
|
140 | thor (0.19.1) |
|
160 | thor (0.19.1) |
|
|
141 | tilt (1.4.1) |
|
161 | tilt (1.4.1) |
|
|
142 | treetop (1.4.15) |
|
162 | treetop (1.4.15) |
|
|
143 | polyglot |
|
163 | polyglot |
|
|
144 | polyglot (>= 0.3.1) |
|
164 | polyglot (>= 0.3.1) |
|
|
145 |
- tzinfo (0.3. |
|
165 | + tzinfo (0.3.51) |
|
|
146 | uglifier (2.7.0) |
|
166 | uglifier (2.7.0) |
|
|
147 | execjs (>= 0.3.0) |
|
167 | execjs (>= 0.3.0) |
|
|
148 | json (>= 1.8.0) |
|
168 | json (>= 1.8.0) |
|
|
149 | will_paginate (3.0.7) |
|
169 | will_paginate (3.0.7) |
|
|
150 |
|
170 | ||
|
|
151 | PLATFORMS |
|
171 | PLATFORMS |
|
|
152 | ruby |
|
172 | ruby |
|
|
153 |
|
173 | ||
|
|
154 | DEPENDENCIES |
|
174 | DEPENDENCIES |
|
|
|
175 | + ace-rails-ap | ||
|
|
|
176 | + autoprefixer-rails | ||
|
|
155 | best_in_place (~> 3.0.1) |
|
177 | best_in_place (~> 3.0.1) |
|
|
|
178 | + bootstrap-sass (~> 3.2.0) | ||
|
|
|
179 | + bootstrap-switch-rails | ||
|
|
|
180 | + bootstrap-toggle-rails | ||
|
|
156 | coffee-rails (~> 3.2.2) |
|
181 | coffee-rails (~> 3.2.2) |
|
|
157 | dynamic_form |
|
182 | dynamic_form |
|
|
158 | haml |
|
183 | haml |
|
|
|
184 | + haml-rails | ||
|
|
159 | in_place_editing |
|
185 | in_place_editing |
|
|
|
186 | + jquery-countdown-rails | ||
|
|
160 | jquery-rails |
|
187 | jquery-rails |
|
|
161 | jquery-tablesorter |
|
188 | jquery-tablesorter |
|
|
162 | jquery-timepicker-addon-rails |
|
189 | jquery-timepicker-addon-rails |
|
|
163 | jquery-ui-sass-rails |
|
190 | jquery-ui-sass-rails |
|
|
164 |
|
191 | ||
|
|
|
192 | + momentjs-rails | ||
|
|
165 | mysql2 |
|
193 | mysql2 |
|
|
166 | prototype-rails |
|
194 | prototype-rails |
|
|
167 |
- rails ( |
|
195 | + rails (~> 3.2) |
|
|
|
196 | + rails_bootstrap_sortable | ||
|
|
168 | rdiscount |
|
197 | rdiscount |
|
|
169 | rouge |
|
198 | rouge |
|
|
170 | rspec-rails (~> 2.99.0) |
|
199 | rspec-rails (~> 2.99.0) |
|
|
171 | sass-rails (~> 3.2.6) |
|
200 | sass-rails (~> 3.2.6) |
|
|
|
201 | + select2-rails | ||
|
|
172 | test-unit |
|
202 | test-unit |
|
|
173 | uglifier |
|
203 | uglifier |
|
|
174 | verification! |
|
204 | verification! |
|
|
175 | will_paginate (~> 3.0.7) |
|
205 | will_paginate (~> 3.0.7) |
|
|
|
206 | + | ||
|
|
|
207 | + BUNDLED WITH | ||
|
|
|
208 | + 1.12.5 | ||
| @@ -7,11 +7,38 | |||||
|
|
7 | // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the |
|
7 | // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the |
|
|
8 | // the compiled file. |
|
8 | // the compiled file. |
|
|
9 | // |
|
9 | // |
|
|
10 | // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD |
|
10 | // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD |
|
|
11 | // GO AFTER THE REQUIRES BELOW. |
|
11 | // GO AFTER THE REQUIRES BELOW. |
|
|
12 | // |
|
12 | // |
|
|
13 |
- //= require |
|
13 | + //= require jquery |
|
|
14 |
- //= require |
|
14 | + //= require jquery_ujs |
|
|
15 | - //= require effects |
|
15 | + //= require jquery.ui.all |
|
|
16 |
- //= require |
|
16 | + //= require bootstrap-sprockets |
|
|
17 |
- //= require |
|
17 | + //= require moment |
|
|
|
18 | + //= require bootstrap-sortable | ||
|
|
|
19 | + //= require select2 | ||
|
|
|
20 | + //= require ace-rails-ap | ||
|
|
|
21 | + //= require ace/mode-c_cpp | ||
|
|
|
22 | + //= require ace/mode-python | ||
|
|
|
23 | + //= require ace/mode-ruby | ||
|
|
|
24 | + //= require ace/mode-pascal | ||
|
|
|
25 | + //= require ace/mode-javascript | ||
|
|
|
26 | + //= require ace/mode-java | ||
|
|
|
27 | + //= require ace/theme-merbivore | ||
|
|
|
28 | + //= require custom | ||
|
|
|
29 | + //= require jquery.countdown | ||
|
|
|
30 | + //-------------- 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 best_in_place | ||
|
|
|
36 | + //= require best_in_place.jquery-ui | ||
|
|
|
37 | + //= require brython | ||
|
|
|
38 | + | ||
|
|
|
39 | + // since this is after blank line, it is not downloaded | ||
|
|
|
40 | + //x= require prototype | ||
|
|
|
41 | + //x= require prototype_ujs | ||
|
|
|
42 | + //x= require effects | ||
|
|
|
43 | + //x= require dragdrop | ||
|
|
|
44 | + //x= require controls | ||
| 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 |
| 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