Description:
merge with algo and add brython files that were missing
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r584:056392c00e67 - - The requested commit is too big and content was truncated. 408 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 |
| @@ -2,6 +2,8 | |||
|
|
2 | 2 | |
|
|
3 | 3 | gem 'rails', '3.2.21' |
|
|
4 | 4 | |
|
|
5 | + gem 'select2-rails' | |
|
|
6 | + | |
|
|
5 | 7 | # Bundle edge Rails instead: |
|
|
6 | 8 | # gem 'rails', :git => 'git://github.com/rails/rails.git' |
|
|
7 | 9 | |
| @@ -45,11 +47,26 | |||
|
|
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' |
| @@ -9,6 +9,7 | |||
|
|
9 | 9 | GEM |
|
|
10 | 10 | remote: https://rubygems.org/ |
|
|
11 | 11 | specs: |
|
|
12 | + ace-rails-ap (4.0.2) | |
|
|
12 | 13 | actionmailer (3.2.21) |
|
|
13 | 14 | actionpack (= 3.2.21) |
|
|
14 | 15 | mail (~> 2.5.4) |
| @@ -37,9 +38,16 | |||
|
|
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) |
| @@ -54,10 +62,16 | |||
|
|
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) |
| @@ -77,6 +91,8 | |||
|
|
77 | 91 | mime-types (~> 1.16) |
|
|
78 | 92 | treetop (~> 1.4.8) |
|
|
79 | 93 | mime-types (1.25.1) |
|
|
94 | + momentjs-rails (2.11.1) | |
|
|
95 | + railties (>= 3.1) | |
|
|
80 | 96 | multi_json (1.10.1) |
|
|
81 | 97 | mysql2 (0.3.20) |
|
|
82 | 98 | polyglot (0.3.5) |
| @@ -98,6 +114,8 | |||
|
|
98 | 114 | activesupport (= 3.2.21) |
|
|
99 | 115 | bundler (~> 1.0) |
|
|
100 | 116 | railties (= 3.2.21) |
|
|
117 | + rails_bootstrap_sortable (2.0.0) | |
|
|
118 | + momentjs-rails (~> 2, >= 2.8.3) | |
|
|
101 | 119 | railties (3.2.21) |
|
|
102 | 120 | actionpack (= 3.2.21) |
|
|
103 | 121 | activesupport (= 3.2.21) |
| @@ -130,6 +148,8 | |||
|
|
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) |
| @@ -152,23 +172,33 | |||
|
|
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 | 195 | rails (= 3.2.21) |
|
|
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! |
| @@ -10,8 +10,35 | |||
|
|
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 |
| 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