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 |
| @@ -11,16 +11,23 | |||
|
|
11 | 11 | /db/*.sqlite3 |
|
|
12 | 12 | |
|
|
13 | 13 | # Ignore all logfiles and tempfiles. |
|
|
14 | 14 | /log/*.log |
|
|
15 | 15 | /tmp |
|
|
16 | 16 | |
|
|
17 | 17 | *~ |
|
|
18 | 18 | |
|
|
19 | 19 | /vendor/plugins/rails_upgrade |
|
|
20 | 20 | |
|
|
21 | 21 | #ignore public assets??? |
|
|
22 | 22 | /public/assets |
|
|
23 | + /public | |
|
|
24 | + | |
|
|
25 | + /data | |
|
|
23 | 26 | |
|
|
24 | 27 | #ignore .orig and .swp |
|
|
25 | 28 | *.orig |
|
|
26 | 29 | *.swp |
|
|
30 | + | |
|
|
31 | + #ignore rvm setting file | |
|
|
32 | + .ruby-gemset | |
|
|
33 | + .ruby-version | |
| @@ -1,15 +1,17 | |||
|
|
1 | 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 | 7 | # Bundle edge Rails instead: |
|
|
6 | 8 | # gem 'rails', :git => 'git://github.com/rails/rails.git' |
|
|
7 | 9 | |
|
|
8 | 10 | gem 'mysql2' |
|
|
9 | 11 | |
|
|
10 | 12 | # Gems used only for assets and not required |
|
|
11 | 13 | # in production environments by default. |
|
|
12 | 14 | group :assets do |
|
|
13 | 15 | gem 'sass-rails', '~> 3.2.6' |
|
|
14 | 16 | gem 'coffee-rails', '~> 3.2.2' |
|
|
15 | 17 | |
| @@ -36,28 +38,43 | |||
|
|
36 | 38 | # To use debugger |
|
|
37 | 39 | # gem 'debugger' |
|
|
38 | 40 | # |
|
|
39 | 41 | |
|
|
40 | 42 | #in-place editor |
|
|
41 | 43 | gem 'best_in_place', '~> 3.0.1' |
|
|
42 | 44 | |
|
|
43 | 45 | # jquery addition |
|
|
44 | 46 | gem 'jquery-rails' |
|
|
45 | 47 | gem 'jquery-ui-sass-rails' |
|
|
46 | 48 | gem 'jquery-timepicker-addon-rails' |
|
|
47 | 49 | gem 'jquery-tablesorter' |
|
|
50 | + gem 'jquery-countdown-rails' | |
|
|
48 | 51 | |
|
|
49 | 52 | #syntax highlighter |
|
|
50 | 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 | 68 | gem 'haml' |
|
|
69 | + gem 'haml-rails' | |
|
|
53 | 70 | gem 'mail' |
|
|
54 | 71 | gem 'rdiscount' |
|
|
55 | 72 | gem 'test-unit' |
|
|
56 | 73 | gem 'will_paginate', '~> 3.0.7' |
|
|
57 | 74 | gem 'dynamic_form' |
|
|
58 | 75 | gem 'in_place_editing' |
|
|
59 | 76 | gem 'verification', :git => 'https://github.com/sikachu/verification.git' |
|
|
60 | 77 | |
|
|
61 | 78 | group :test, :development do |
|
|
62 | 79 | gem 'rspec-rails', '~> 2.99.0' |
|
|
63 | 80 | end |
| @@ -1,175 +1,208 | |||
|
|
1 | 1 | GIT |
|
|
2 | 2 | remote: https://github.com/sikachu/verification.git |
|
|
3 | 3 | revision: 76eaf51b13276ecae54bd9cd115832595d2ff56d |
|
|
4 | 4 | specs: |
|
|
5 | 5 | verification (1.0.3) |
|
|
6 | 6 | actionpack (>= 3.0.0, < 5.0) |
|
|
7 | 7 | activesupport (>= 3.0.0, < 5.0) |
|
|
8 | 8 | |
|
|
9 | 9 | GEM |
|
|
10 | 10 | remote: https://rubygems.org/ |
|
|
11 | 11 | specs: |
|
|
12 | - actionmailer (3.2.21) | |
|
|
13 |
- |
|
|
|
12 | + ace-rails-ap (4.0.2) | |
|
|
13 | + actionmailer (3.2.22.5) | |
|
|
14 | + actionpack (= 3.2.22.5) | |
|
|
14 | 15 | mail (~> 2.5.4) |
|
|
15 |
- actionpack (3.2.2 |
|
|
|
16 |
- activemodel (= 3.2.2 |
|
|
|
17 |
- activesupport (= 3.2.2 |
|
|
|
16 | + actionpack (3.2.22.5) | |
|
|
17 | + activemodel (= 3.2.22.5) | |
|
|
18 | + activesupport (= 3.2.22.5) | |
|
|
18 | 19 | builder (~> 3.0.0) |
|
|
19 | 20 | erubis (~> 2.7.0) |
|
|
20 | 21 | journey (~> 1.0.4) |
|
|
21 | 22 | rack (~> 1.4.5) |
|
|
22 | 23 | rack-cache (~> 1.2) |
|
|
23 | 24 | rack-test (~> 0.6.1) |
|
|
24 | 25 | sprockets (~> 2.2.1) |
|
|
25 |
- activemodel (3.2.2 |
|
|
|
26 |
- activesupport (= 3.2.2 |
|
|
|
26 | + activemodel (3.2.22.5) | |
|
|
27 | + activesupport (= 3.2.22.5) | |
|
|
27 | 28 | builder (~> 3.0.0) |
|
|
28 |
- activerecord (3.2.2 |
|
|
|
29 |
- activemodel (= 3.2.2 |
|
|
|
30 |
- activesupport (= 3.2.2 |
|
|
|
29 | + activerecord (3.2.22.5) | |
|
|
30 | + activemodel (= 3.2.22.5) | |
|
|
31 | + activesupport (= 3.2.22.5) | |
|
|
31 | 32 | arel (~> 3.0.2) |
|
|
32 | 33 | tzinfo (~> 0.3.29) |
|
|
33 |
- activeresource (3.2.2 |
|
|
|
34 |
- activemodel (= 3.2.2 |
|
|
|
35 |
- activesupport (= 3.2.2 |
|
|
|
36 |
- activesupport (3.2.2 |
|
|
|
34 | + activeresource (3.2.22.5) | |
|
|
35 | + activemodel (= 3.2.22.5) | |
|
|
36 | + activesupport (= 3.2.22.5) | |
|
|
37 | + activesupport (3.2.22.5) | |
|
|
37 | 38 | i18n (~> 0.6, >= 0.6.4) |
|
|
38 | 39 | multi_json (~> 1.0) |
|
|
39 | 40 | arel (3.0.3) |
|
|
41 | + autoprefixer-rails (6.0.3) | |
|
|
42 | + execjs | |
|
|
43 | + json | |
|
|
40 | 44 | best_in_place (3.0.3) |
|
|
41 | 45 | actionpack (>= 3.2) |
|
|
42 | 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 | 51 | builder (3.0.4) |
|
|
44 | 52 | coffee-rails (3.2.2) |
|
|
45 | 53 | coffee-script (>= 2.2.0) |
|
|
46 | 54 | railties (~> 3.2.0) |
|
|
47 | 55 | coffee-script (2.3.0) |
|
|
48 | 56 | coffee-script-source |
|
|
49 | 57 | execjs |
|
|
50 | 58 | coffee-script-source (1.9.0) |
|
|
51 | 59 | diff-lcs (1.2.5) |
|
|
52 | 60 | dynamic_form (1.1.4) |
|
|
53 | 61 | erubis (2.7.0) |
|
|
54 | 62 | execjs (2.3.0) |
|
|
55 | 63 | haml (4.0.6) |
|
|
56 | 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 | 70 | hike (1.2.3) |
|
|
58 | 71 | i18n (0.7.0) |
|
|
59 | 72 | in_place_editing (1.2.0) |
|
|
60 | 73 | journey (1.0.4) |
|
|
74 | + jquery-countdown-rails (2.0.2) | |
|
|
61 | 75 | jquery-rails (3.1.2) |
|
|
62 | 76 | railties (>= 3.0, < 5.0) |
|
|
63 | 77 | thor (>= 0.14, < 2.0) |
|
|
64 | 78 | jquery-tablesorter (1.13.4) |
|
|
65 | 79 | railties (>= 3.1, < 5) |
|
|
66 | 80 | jquery-timepicker-addon-rails (1.4.1) |
|
|
67 | 81 | railties (>= 3.1) |
|
|
68 | 82 | jquery-ui-rails (4.0.3) |
|
|
69 | 83 | jquery-rails |
|
|
70 | 84 | railties (>= 3.1.0) |
|
|
71 | 85 | jquery-ui-sass-rails (4.0.3.0) |
|
|
72 | 86 | jquery-rails |
|
|
73 | 87 | jquery-ui-rails (= 4.0.3) |
|
|
74 | 88 | railties (>= 3.1.0) |
|
|
75 |
- json (1.8. |
|
|
|
89 | + json (1.8.3) | |
|
|
76 | 90 | mail (2.5.4) |
|
|
77 | 91 | mime-types (~> 1.16) |
|
|
78 | 92 | treetop (~> 1.4.8) |
|
|
79 | 93 | mime-types (1.25.1) |
|
|
80 | - multi_json (1.10.1) | |
|
|
81 | - mysql2 (0.3.17) | |
|
|
94 | + momentjs-rails (2.11.1) | |
|
|
95 | + railties (>= 3.1) | |
|
|
96 | + multi_json (1.12.1) | |
|
|
97 | + mysql2 (0.3.20) | |
|
|
82 | 98 | polyglot (0.3.5) |
|
|
83 | 99 | power_assert (0.2.2) |
|
|
84 | 100 | prototype-rails (3.2.1) |
|
|
85 | 101 | rails (~> 3.2) |
|
|
86 |
- rack (1.4. |
|
|
|
87 |
- rack-cache (1. |
|
|
|
102 | + rack (1.4.7) | |
|
|
103 | + rack-cache (1.6.1) | |
|
|
88 | 104 | rack (>= 0.4) |
|
|
89 | 105 | rack-ssl (1.3.4) |
|
|
90 | 106 | rack |
|
|
91 | 107 | rack-test (0.6.3) |
|
|
92 | 108 | rack (>= 1.0) |
|
|
93 |
- rails (3.2.2 |
|
|
|
94 |
- actionmailer (= 3.2.2 |
|
|
|
95 |
- actionpack (= 3.2.2 |
|
|
|
96 |
- activerecord (= 3.2.2 |
|
|
|
97 |
- activeresource (= 3.2.2 |
|
|
|
98 |
- activesupport (= 3.2.2 |
|
|
|
109 | + rails (3.2.22.5) | |
|
|
110 | + actionmailer (= 3.2.22.5) | |
|
|
111 | + actionpack (= 3.2.22.5) | |
|
|
112 | + activerecord (= 3.2.22.5) | |
|
|
113 | + activeresource (= 3.2.22.5) | |
|
|
114 | + activesupport (= 3.2.22.5) | |
|
|
99 | 115 | bundler (~> 1.0) |
|
|
100 |
- railties (= 3.2.2 |
|
|
|
101 | - railties (3.2.21) | |
|
|
102 | - actionpack (= 3.2.21) | |
|
|
103 |
- |
|
|
|
116 | + railties (= 3.2.22.5) | |
|
|
117 | + rails_bootstrap_sortable (2.0.0) | |
|
|
118 | + momentjs-rails (~> 2, >= 2.8.3) | |
|
|
119 | + railties (3.2.22.5) | |
|
|
120 | + actionpack (= 3.2.22.5) | |
|
|
121 | + activesupport (= 3.2.22.5) | |
|
|
104 | 122 | rack-ssl (~> 1.3.2) |
|
|
105 | 123 | rake (>= 0.8.7) |
|
|
106 | 124 | rdoc (~> 3.4) |
|
|
107 | 125 | thor (>= 0.14.6, < 2.0) |
|
|
108 |
- rake (1 |
|
|
|
126 | + rake (11.2.2) | |
|
|
109 | 127 | rdiscount (2.1.8) |
|
|
110 | 128 | rdoc (3.12.2) |
|
|
111 | 129 | json (~> 1.4) |
|
|
112 | 130 | rouge (1.8.0) |
|
|
113 | 131 | rspec-collection_matchers (1.1.2) |
|
|
114 | 132 | rspec-expectations (>= 2.99.0.beta1) |
|
|
115 | 133 | rspec-core (2.99.2) |
|
|
116 | 134 | rspec-expectations (2.99.2) |
|
|
117 | 135 | diff-lcs (>= 1.1.3, < 2.0) |
|
|
118 | 136 | rspec-mocks (2.99.3) |
|
|
119 | 137 | rspec-rails (2.99.0) |
|
|
120 | 138 | actionpack (>= 3.0) |
|
|
121 | 139 | activemodel (>= 3.0) |
|
|
122 | 140 | activesupport (>= 3.0) |
|
|
123 | 141 | railties (>= 3.0) |
|
|
124 | 142 | rspec-collection_matchers |
|
|
125 | 143 | rspec-core (~> 2.99.0) |
|
|
126 | 144 | rspec-expectations (~> 2.99.0) |
|
|
127 | 145 | rspec-mocks (~> 2.99.0) |
|
|
128 | 146 | sass (3.4.11) |
|
|
129 | 147 | sass-rails (3.2.6) |
|
|
130 | 148 | railties (~> 3.2.0) |
|
|
131 | 149 | sass (>= 3.1.10) |
|
|
132 | 150 | tilt (~> 1.3) |
|
|
151 | + select2-rails (4.0.1) | |
|
|
152 | + thor (~> 0.14) | |
|
|
133 | 153 | sprockets (2.2.3) |
|
|
134 | 154 | hike (~> 1.2) |
|
|
135 | 155 | multi_json (~> 1.0) |
|
|
136 | 156 | rack (~> 1.0) |
|
|
137 | 157 | tilt (~> 1.1, != 1.3.0) |
|
|
138 | 158 | test-unit (3.0.9) |
|
|
139 | 159 | power_assert |
|
|
140 | 160 | thor (0.19.1) |
|
|
141 | 161 | tilt (1.4.1) |
|
|
142 | 162 | treetop (1.4.15) |
|
|
143 | 163 | polyglot |
|
|
144 | 164 | polyglot (>= 0.3.1) |
|
|
145 |
- tzinfo (0.3. |
|
|
|
165 | + tzinfo (0.3.51) | |
|
|
146 | 166 | uglifier (2.7.0) |
|
|
147 | 167 | execjs (>= 0.3.0) |
|
|
148 | 168 | json (>= 1.8.0) |
|
|
149 | 169 | will_paginate (3.0.7) |
|
|
150 | 170 | |
|
|
151 | 171 | PLATFORMS |
|
|
152 | 172 | ruby |
|
|
153 | 173 | |
|
|
154 | 174 | DEPENDENCIES |
|
|
175 | + ace-rails-ap | |
|
|
176 | + autoprefixer-rails | |
|
|
155 | 177 | best_in_place (~> 3.0.1) |
|
|
178 | + bootstrap-sass (~> 3.2.0) | |
|
|
179 | + bootstrap-switch-rails | |
|
|
180 | + bootstrap-toggle-rails | |
|
|
156 | 181 | coffee-rails (~> 3.2.2) |
|
|
157 | 182 | dynamic_form |
|
|
158 | 183 | haml |
|
|
184 | + haml-rails | |
|
|
159 | 185 | in_place_editing |
|
|
186 | + jquery-countdown-rails | |
|
|
160 | 187 | jquery-rails |
|
|
161 | 188 | jquery-tablesorter |
|
|
162 | 189 | jquery-timepicker-addon-rails |
|
|
163 | 190 | jquery-ui-sass-rails |
|
|
164 | 191 | |
|
|
192 | + momentjs-rails | |
|
|
165 | 193 | mysql2 |
|
|
166 | 194 | prototype-rails |
|
|
167 |
- rails ( |
|
|
|
195 | + rails (~> 3.2) | |
|
|
196 | + rails_bootstrap_sortable | |
|
|
168 | 197 | rdiscount |
|
|
169 | 198 | rouge |
|
|
170 | 199 | rspec-rails (~> 2.99.0) |
|
|
171 | 200 | sass-rails (~> 3.2.6) |
|
|
201 | + select2-rails | |
|
|
172 | 202 | test-unit |
|
|
173 | 203 | uglifier |
|
|
174 | 204 | verification! |
|
|
175 | 205 | will_paginate (~> 3.0.7) |
|
|
206 | + | |
|
|
207 | + BUNDLED WITH | |
|
|
208 | + 1.12.5 | |
| @@ -1,17 +1,44 | |||
|
|
1 | 1 | // This is a manifest file that'll be compiled into application.js, which will include all the files |
|
|
2 | 2 | // listed below. |
|
|
3 | 3 | // |
|
|
4 | 4 | // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, |
|
|
5 | 5 | // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. |
|
|
6 | 6 | // |
|
|
7 | 7 | // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the |
|
|
8 | 8 | // the compiled file. |
|
|
9 | 9 | // |
|
|
10 | 10 | // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD |
|
|
11 | 11 | // GO AFTER THE REQUIRES BELOW. |
|
|
12 | 12 | // |
|
|
13 |
- //= require |
|
|
|
14 |
- //= require |
|
|
|
15 | - //= require effects | |
|
|
16 |
- //= require |
|
|
|
17 |
- //= require |
|
|
|
13 | + //= require jquery | |
|
|
14 | + //= require jquery_ujs | |
|
|
15 | + //= require jquery.ui.all | |
|
|
16 | + //= require bootstrap-sprockets | |
|
|
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