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