repo
string
commit
string
message
string
diff
string
isfit/isfit-participant
9d1ea006e318094200afa4b8a41d136c98d43520
Adds numbers to filtering
diff --git a/app/models/workshop.rb b/app/models/workshop.rb index 8051d2f..d074b9c 100644 --- a/app/models/workshop.rb +++ b/app/models/workshop.rb @@ -1,3 +1,6 @@ class Workshop < ActiveRecord::Base attr_accessible :description, :lead, :title + def full_title + "#{number}. #{title}" + end end diff --git a/a...
isfit/isfit-participant
1f5360a9b28bc043c3b7c48ae0d3447b798c657c
Adds numbers to workshops in particiapants view
diff --git a/app/views/participants/index.html.erb b/app/views/participants/index.html.erb index 49a8fef..ef84b3b 100644 --- a/app/views/participants/index.html.erb +++ b/app/views/participants/index.html.erb @@ -1,94 +1,94 @@ <ol class="breadcrumb"> <li><%= link_to 'Dashboard', dashboard_path %></li> <li class=...
isfit/isfit-participant
2194794536d92260222fc494d6fc559376972255
Adds correct numbers to workshops in participant view
diff --git a/app/views/participants/show.html.erb b/app/views/participants/show.html.erb index 0923926..043a79d 100644 --- a/app/views/participants/show.html.erb +++ b/app/views/participants/show.html.erb @@ -1,174 +1,174 @@ <% content_for :breadcrumbs do %> <li><%= link_to 'Dashboard', dashboard_path %></li> <l...
isfit/isfit-participant
6d75be78c3945f234abb3af0622aa28ee2a02837
Everything is permitted
diff --git a/app/models/participant.rb b/app/models/participant.rb index 2260527..f3cf051 100644 --- a/app/models/participant.rb +++ b/app/models/participant.rb @@ -1,137 +1,138 @@ class Participant < ActiveRecord::Base # Attributes attr_accessible :approved_first_deadline, :visa_number, :approved_second_deadlin...
isfit/isfit-participant
63658e55f6c009469fab8b3e0918c9c5c63f1a1a
Fixes small bug
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 935a9e4..cf54a16 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,183 +1,183 @@ class ParticipantsController < ApplicationController load_and_autho...
isfit/isfit-participant
b41f10c58dc0bdef341873ab88547e1fb4a77c70
Adds some extra filtering
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 78adac5..935a9e4 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,177 +1,183 @@ class ParticipantsController < ApplicationController load_and_autho...
isfit/isfit-participant
17a31329e11cc2c4f85b79a07f0fb2268aa4c597
Adds one day early to hosts view
diff --git a/app/views/hosts/show.html.erb b/app/views/hosts/show.html.erb index ffe3946..4257b52 100644 --- a/app/views/hosts/show.html.erb +++ b/app/views/hosts/show.html.erb @@ -1,76 +1,83 @@ <% content_for :breadcrumbs do %> <li><%= link_to 'Dashboard', dashboard_path %></li> <li><%= link_to 'Hosts', hosts_p...
isfit/isfit-participant
4cfc9703df383973579ff62ea986714656a0c395
Adds flight tracking link
diff --git a/app/views/participants/show.html.erb b/app/views/participants/show.html.erb index 88b73ac..0923926 100644 --- a/app/views/participants/show.html.erb +++ b/app/views/participants/show.html.erb @@ -1,174 +1,174 @@ <% content_for :breadcrumbs do %> <li><%= link_to 'Dashboard', dashboard_path %></li> <l...
isfit/isfit-participant
0a69885a3f5172de5cab0615a3fb87bdb9c58e36
Changes size headers in host controllers
diff --git a/app/views/hosts/show.html.erb b/app/views/hosts/show.html.erb index 2041cac..ffe3946 100644 --- a/app/views/hosts/show.html.erb +++ b/app/views/hosts/show.html.erb @@ -1,76 +1,76 @@ <% content_for :breadcrumbs do %> <li><%= link_to 'Dashboard', dashboard_path %></li> <li><%= link_to 'Hosts', hosts_p...
isfit/isfit-participant
eb8154ad6e8863c6dc7a7ad8a213d536481d00a6
Moves controls to right col
diff --git a/app/views/hosts/show.html.erb b/app/views/hosts/show.html.erb index 245ef2a..2041cac 100644 --- a/app/views/hosts/show.html.erb +++ b/app/views/hosts/show.html.erb @@ -1,68 +1,76 @@ <% content_for :breadcrumbs do %> <li><%= link_to 'Dashboard', dashboard_path %></li> <li><%= link_to 'Hosts', hosts_p...
isfit/isfit-participant
babf271aa7d7ff4b1a5ad5788fb93c2b00f155c3
Adds missing label
diff --git a/app/views/hosts/match/host/index.html.erb b/app/views/hosts/match/host/index.html.erb index cfb941f..2f5e8bb 100644 --- a/app/views/hosts/match/host/index.html.erb +++ b/app/views/hosts/match/host/index.html.erb @@ -1,84 +1,85 @@ <% render 'hosts/match/host/sidebar' %> <% content_for :breadcrumbs do %> ...
isfit/isfit-participant
7f3c1bdd74a1deba216d49f7f977d25714ff0e18
Gives filtering dropdowns labels instead of prompts in participant matching view
diff --git a/app/views/hosts/match/index.html.erb b/app/views/hosts/match/index.html.erb index f4f001b..ba34c0c 100644 --- a/app/views/hosts/match/index.html.erb +++ b/app/views/hosts/match/index.html.erb @@ -1,74 +1,79 @@ <% if @match_now %> <% render 'hosts/match/sidebar' %> <% end %> <% content_for :breadc...
isfit/isfit-participant
2a5384815e3f10e8de20c3cec998c9d98a131a68
Adds filtering by sleeping arrangement in host matching view
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 20e15da..78adac5 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,174 +1,177 @@ class ParticipantsController < ApplicationController load_and_autho...
isfit/isfit-participant
b575b20ee9a9eb6e8e8f32e7efe3afcff56ec1f6
Gives filtering dropdowns labels instead of prompts in host matching view
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 572587d..20e15da 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,170 +1,174 @@ class ParticipantsController < ApplicationController load_and_autho...
isfit/isfit-participant
73e6cd90f7e9b6630c475131e1cf9d194337375a
Adds extra filtering to participant matching view
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index fd30de4..572587d 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,161 +1,170 @@ class ParticipantsController < ApplicationController load_and_autho...
isfit/isfit-participant
6b07ae8f317f2895fdf214d40b371aa99689cd6b
Adds workshop filtering to participant index
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index fe8f600..fd30de4 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,158 +1,161 @@ class ParticipantsController < ApplicationController load_and_autho...
isfit/isfit-participant
6810ea977390e2b24a8c2b5636dd851abf804176
Adds show only not checked in to participants index
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 994321a..fe8f600 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,153 +1,158 @@ class ParticipantsController < ApplicationController load_and_autho...
isfit/isfit-participant
e82a8bba211bbc54b217f4a01707726f5c20aaad
Fixes country order
diff --git a/app/views/hosts/match/index.html.erb b/app/views/hosts/match/index.html.erb index 03a4e20..8e4a66f 100644 --- a/app/views/hosts/match/index.html.erb +++ b/app/views/hosts/match/index.html.erb @@ -1,65 +1,65 @@ <% if @match_now %> <% render 'hosts/match/sidebar' %> <% end %> <% content_for :breadc...
isfit/isfit-participant
980202c2f2b2a88f69e38c331e6a805559dec12b
Adds festival program to finished dashboard
diff --git a/app/views/dashboard/index_finished.html.erb b/app/views/dashboard/index_finished.html.erb index 511e959..a7567bf 100644 --- a/app/views/dashboard/index_finished.html.erb +++ b/app/views/dashboard/index_finished.html.erb @@ -1,71 +1,77 @@ <div class="col-md-8"> <section id="mini-profile"> <h1><%= c...
isfit/isfit-participant
fd6a37bdc583f44479481ed0133166ebec2e4979
Adds host prefs to participant view
diff --git a/app/views/participants/show.html.erb b/app/views/participants/show.html.erb index 7f521b1..88b73ac 100644 --- a/app/views/participants/show.html.erb +++ b/app/views/participants/show.html.erb @@ -1,166 +1,174 @@ <% content_for :breadcrumbs do %> <li><%= link_to 'Dashboard', dashboard_path %></li> <l...
isfit/isfit-participant
889b547dfe263814d2593be3df98bf94c93e526b
Adds allergies and diet to participant view
diff --git a/app/views/participants/show.html.erb b/app/views/participants/show.html.erb index adb620e..7f521b1 100644 --- a/app/views/participants/show.html.erb +++ b/app/views/participants/show.html.erb @@ -1,150 +1,166 @@ <% content_for :breadcrumbs do %> <li><%= link_to 'Dashboard', dashboard_path %></li> <l...
isfit/isfit-participant
a8fc4bd1f11e29904c705a4e1440a7f6a490c43a
Adds logistics attributes to participant view
diff --git a/app/views/participants/show.html.erb b/app/views/participants/show.html.erb index f9d64c9..adb620e 100644 --- a/app/views/participants/show.html.erb +++ b/app/views/participants/show.html.erb @@ -1,129 +1,150 @@ <% content_for :breadcrumbs do %> <li><%= link_to 'Dashboard', dashboard_path %></li> <l...
isfit/isfit-participant
92b469c59212317bd94ca4c0b0439d1b491d3f83
Adds icon to edit link
diff --git a/app/views/participants/show.html.erb b/app/views/participants/show.html.erb index 6fc0939..f9d64c9 100644 --- a/app/views/participants/show.html.erb +++ b/app/views/participants/show.html.erb @@ -1,129 +1,129 @@ <% content_for :breadcrumbs do %> <li><%= link_to 'Dashboard', dashboard_path %></li> <l...
isfit/isfit-participant
44194d6fcb14f5a52c876b22b86b9a1d7c0e05a6
Adds internal_comments implementation
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 1198303..994321a 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,141 +1,153 @@ class ParticipantsController < ApplicationController load_and_autho...
isfit/isfit-participant
86c32fe2ebb41fb63b831b6aefa1ee51ae0dee23
Adds internal_comments to db
diff --git a/app/views/participants/show.html.erb b/app/views/participants/show.html.erb index 8932fa9..cd6db13 100644 --- a/app/views/participants/show.html.erb +++ b/app/views/participants/show.html.erb @@ -1,116 +1,119 @@ <% content_for :breadcrumbs do %> <li><%= link_to 'Dashboard', dashboard_path %></li> <l...
isfit/isfit-participant
cc75c6dc70422adbbe2269659ca4853a29ef1593
Fixes table layout
diff --git a/app/views/hosts/index.html.erb b/app/views/hosts/index.html.erb index a33efa5..62d5643 100644 --- a/app/views/hosts/index.html.erb +++ b/app/views/hosts/index.html.erb @@ -1,42 +1,44 @@ <% render 'sidebar' %> <% content_for :breadcrumbs do %> <li><%= link_to 'Dashboard', dashboard_path %></li> ...
isfit/isfit-participant
1b5e007c32d796263c86715e0579855f4ccd00ce
Adds extra filter fields
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 7a53305..a92b840 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,145 +1,151 @@ class ParticipantsController < ApplicationController load_and_autho...
isfit/isfit-participant
7d61e02d71f5513dbfa49f4f08a4c18d116d31cd
Adds host filtering
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 08db0a5..7a53305 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,133 +1,145 @@ class ParticipantsController < ApplicationController load_and_autho...
isfit/isfit-participant
54e6d004af1ed440d00816a3f1e006b9c9c6b08e
Adds available spaces and changes the way spaces are reduced
diff --git a/app/models/host.rb b/app/models/host.rb index 3116da7..c2a2710 100644 --- a/app/models/host.rb +++ b/app/models/host.rb @@ -1,37 +1,37 @@ class Host < ActiveRecord::Base attr_accessible :id, :firstname, :lastname, :address, :zipcode, :city, :phone, :capacity, :comments, :email, :beenhost, :sex, :isst...
isfit/isfit-participant
f036d90d2274899b248a6b771da477cd404850dc
Reverted file from master
diff --git a/db/schema.rb b/db/schema.rb index 2d38cd1..c327f8f 100755 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,227 +1,249 @@ # encoding: UTF-8 # This file is auto-generated from the current state of the database. Instead # of editing this file, please use the migrations feature of Active Record to # incremental...
isfit/isfit-participant
79e715ff38250ecc5087b4f7855ff2ad152de7bd
Adds sidebar and new fields
diff --git a/app/views/hosts/match/_sidebar.html.erb b/app/views/hosts/match/_sidebar.html.erb new file mode 100644 index 0000000..c58f12b --- /dev/null +++ b/app/views/hosts/match/_sidebar.html.erb @@ -0,0 +1,27 @@ +<% content_for :sidebar_left do %> + <div class="box box-top box-bottom"> + <div class="nav nav...
isfit/isfit-participant
65da0684b19f1586db653d7b6dbcf810010e9685
Removes deadline extender
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 08db0a5..71fbb92 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,133 +1,123 @@ class ParticipantsController < ApplicationController load_and_autho...
isfit/isfit-participant
e9e8e70ba3ae6536d327ef55bd12c38eba0f9bf9
Hides link to redundant action
diff --git a/app/views/hosts/_sidebar.html.erb b/app/views/hosts/_sidebar.html.erb index 221ce91..260c07b 100644 --- a/app/views/hosts/_sidebar.html.erb +++ b/app/views/hosts/_sidebar.html.erb @@ -1,10 +1,12 @@ <% content_for :sidebar_left do %> + <!-- <ul class="nav nav-pills nav-stacked"> - <li class="box b...
isfit/isfit-participant
3d36e1c6e2392ac1a424148f4d385eaf6d3b1e15
Changes layout for host matching view
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 87ae730..08db0a5 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,132 +1,133 @@ class ParticipantsController < ApplicationController load_and_autho...
isfit/isfit-participant
36fbdd352a5c9813f1d3b98b0a987b9fb327b703
Rewrites links in invitations
diff --git a/app/views/deadlines/invitation/download.html.erb b/app/views/deadlines/invitation/download.html.erb index 48f50d4..fd6d608 100644 --- a/app/views/deadlines/invitation/download.html.erb +++ b/app/views/deadlines/invitation/download.html.erb @@ -1,46 +1,46 @@ <!doctype html> <html> <head> <meta charset...
isfit/isfit-participant
040f8703c1da6e57baf0cfc9b2429bc068db965c
Adds filtering to participants
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index b5febe2..87ae730 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,126 +1,132 @@ class ParticipantsController < ApplicationController load_and_autho...
isfit/isfit-participant
32f260a09a41bcc8ff5972724c8f09d4bcbc1a0f
Changes table layout for host matching
diff --git a/app/views/hosts/match/host/index.html.erb b/app/views/hosts/match/host/index.html.erb index f2eadee..7e49eba 100644 --- a/app/views/hosts/match/host/index.html.erb +++ b/app/views/hosts/match/host/index.html.erb @@ -1,48 +1,50 @@ <% render 'hosts/match/host/sidebar' %> <% content_for :breadcrumbs do %> ...
isfit/isfit-participant
b2d196f3abf54dc1b9b6100182f5d960772fc05e
Hoxfix for mail
diff --git a/lib/tasks/participants.rake b/lib/tasks/participants.rake index f397a77..5fee200 100644 --- a/lib/tasks/participants.rake +++ b/lib/tasks/participants.rake @@ -1,18 +1,18 @@ namespace :participants do task send_general_information_mails: :environment do |task, args| participants = Participant.wher...
isfit/isfit-participant
9668036b15c4334e4a5cce5366d2eb919d0f0138
Adds notice regarding mail on dashboard
diff --git a/app/views/dashboard/index_finished.html.erb b/app/views/dashboard/index_finished.html.erb index a64553e..511e959 100644 --- a/app/views/dashboard/index_finished.html.erb +++ b/app/views/dashboard/index_finished.html.erb @@ -1,69 +1,71 @@ <div class="col-md-8"> <section id="mini-profile"> <h1><%= c...
isfit/isfit-participant
69165220340f088aecb128894910681743f5fa46
Added informaton mail
diff --git a/app/controllers/deadlines_controller.rb b/app/controllers/deadlines_controller.rb index f5ffe6e..9c11947 100644 --- a/app/controllers/deadlines_controller.rb +++ b/app/controllers/deadlines_controller.rb @@ -1,61 +1,67 @@ class DeadlinesController < ApplicationController def update_profile @profil...
isfit/isfit-participant
5504bad19c57c535569136d95c54608cd6e7371a
Fixes overflow in host comments
diff --git a/app/views/hosts/match/host/index.html.erb b/app/views/hosts/match/host/index.html.erb index 17526e1..f2eadee 100644 --- a/app/views/hosts/match/host/index.html.erb +++ b/app/views/hosts/match/host/index.html.erb @@ -1,48 +1,48 @@ <% render 'hosts/match/host/sidebar' %> <% content_for :breadcrumbs do %> ...
isfit/isfit-participant
fb36d4093bfb501b374f8140a59a036c047209c8
Adds waiting list rejection mailer
diff --git a/app/mailers/applicant_mailer.rb b/app/mailers/applicant_mailer.rb index ab092fd..e3772fb 100644 --- a/app/mailers/applicant_mailer.rb +++ b/app/mailers/applicant_mailer.rb @@ -1,15 +1,7 @@ class ApplicantMailer < ActionMailer::Base default from: 'no-reply@isfit.org' - def invitation_mail(user) - ...
isfit/isfit-participant
ed7aa6d105e42ce53fafa9a4cadc3963bdd119ad
Adds country filtering to participant selection
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 804ae15..b5febe2 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,123 +1,126 @@ class ParticipantsController < ApplicationController load_and_autho...
isfit/isfit-participant
392368e0c9569d409dede0089f7585c082e7b1a1
Adds checkin filtering
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 35c60eb..804ae15 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,120 +1,123 @@ class ParticipantsController < ApplicationController load_and_autho...
isfit/isfit-participant
7a667edfdea862fd8822911c7b71efcda6257346
Adds waiting list defreezer
diff --git a/app/assets/stylesheets/dashboard.css.scss b/app/assets/stylesheets/dashboard.css.scss index aa6d9ee..13236f8 100644 --- a/app/assets/stylesheets/dashboard.css.scss +++ b/app/assets/stylesheets/dashboard.css.scss @@ -1,81 +1,81 @@ -#mini-profile, #questions, #steps { +#mini-profile, #questions, #steps, #deq...
isfit/isfit-participant
e4a80a666e6db9bdc3218cafca295cdc51e193ca
Adds check in
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 341ad87..35c60eb 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,108 +1,120 @@ class ParticipantsController < ApplicationController load_and_autho...
isfit/isfit-participant
a4cb77aac53fc2aceb767fd2a3d2b29da4ed955c
Fixes removing of deleted hosts
diff --git a/app/controllers/hosts_controller.rb b/app/controllers/hosts_controller.rb index a7fef16..cb7747e 100644 --- a/app/controllers/hosts_controller.rb +++ b/app/controllers/hosts_controller.rb @@ -1,20 +1,20 @@ class HostsController < ApplicationController require 'will_paginate/array' load_and_authori...
isfit/isfit-participant
aae45d8dd37ba2a46e186641e466acb2c3cf5aa5
Fixes bug in flight number validator
diff --git a/app/validators/flight_designator_validator.rb b/app/validators/flight_designator_validator.rb index 50a8a49..495b4cf 100644 --- a/app/validators/flight_designator_validator.rb +++ b/app/validators/flight_designator_validator.rb @@ -1,7 +1,7 @@ class FlightDesignatorValidator < ActiveModel::EachValidator ...
isfit/isfit-participant
aefaffae17d0211ae77eb1fac323a114954ee8cf
Adds host stats
diff --git a/app/models/host.rb b/app/models/host.rb index f918f8f..36f138e 100644 --- a/app/models/host.rb +++ b/app/models/host.rb @@ -1,27 +1,34 @@ class Host < ActiveRecord::Base attr_accessible :id, :firstname, :lastname, :address, :zipcode, :city, :phone, :capacity, :comments, :email, :beenhost, :sex, :isst...
isfit/isfit-participant
dd69debd36478b13593fc95f7b9a898d9345f4ea
Removes unmatch button from locked participants
diff --git a/app/views/participants/show.html.erb b/app/views/participants/show.html.erb index 04405aa..d55571e 100644 --- a/app/views/participants/show.html.erb +++ b/app/views/participants/show.html.erb @@ -1,85 +1,88 @@ <% content_for :breadcrumbs do %> <li><%= link_to 'Dashboard', dashboard_path %></li> <li>...
isfit/isfit-participant
240214d2ded09d9e2362f0be8e75a4c68d976d2e
Adds host locking
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 91ff835..a110aaf 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,93 +1,108 @@ class ParticipantsController < ApplicationController load_and_author...
isfit/isfit-participant
d4b283cd5405ba16074436a4d796736126f7e647
Adds search fields and buttons
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 1f2725c..69dd2f7 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,84 +1,93 @@ class ParticipantsController < ApplicationController load_and_authori...
isfit/isfit-participant
16d700b2c1748b98e27c1e0cec6c43f35e7e8d2e
Adds reverse matching
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 3ad0f64..1f2725c 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,72 +1,84 @@ class ParticipantsController < ApplicationController load_and_authori...
isfit/isfit-participant
db4e1f015c81465dbd7af7f7c1558d128faed81e
Adds search to hosts and minor consmetic fixes
diff --git a/app/controllers/hosts_controller.rb b/app/controllers/hosts_controller.rb index 8e865e8..a7fef16 100644 --- a/app/controllers/hosts_controller.rb +++ b/app/controllers/hosts_controller.rb @@ -1,14 +1,20 @@ class HostsController < ApplicationController require 'will_paginate/array' load_and_authori...
isfit/isfit-participant
aefa362f4485e48b93ba45636b8e31c78b12c178
Changes wording and fixes bug with repeated matching
diff --git a/app/views/hosts/index.html.erb b/app/views/hosts/index.html.erb index a763e0a..79d4e12 100644 --- a/app/views/hosts/index.html.erb +++ b/app/views/hosts/index.html.erb @@ -1,32 +1,32 @@ <% render 'sidebar' %> <% content_for :breadcrumbs do %> <li><%= link_to 'Dashboard', dashboard_path %></li> ...
isfit/isfit-participant
000827a81222e347ce74dc45f1d3590f437aa6e4
Adds unmatching
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index b711246..3ad0f64 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,61 +1,72 @@ class ParticipantsController < ApplicationController load_and_authori...
isfit/isfit-participant
0d261321a2801085c1d219f0bd95ddc776bf222c
Completes host matching
diff --git a/app/controllers/hosts_controller.rb b/app/controllers/hosts_controller.rb index bc0adbc..8e865e8 100644 --- a/app/controllers/hosts_controller.rb +++ b/app/controllers/hosts_controller.rb @@ -1,14 +1,14 @@ class HostsController < ApplicationController require 'will_paginate/array' load_and_authori...
isfit/isfit-participant
fd85c4a2f0a2b00e2daeabd31b5824a87805c280
Adds new participant dashboard
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index f90b2b7..c79f90c 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -1,74 +1,76 @@ @import "bootstrap"; html { position: relative; min-height:...
isfit/isfit-participant
9f26fa8e44565db9a22c28ab7370684d4983cf1d
Addes bootstrap js
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2710440..28a8fbf 100755 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,128 +1,130 @@ <!DOCTYPE html> <!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-n...
isfit/isfit-participant
f77a8f03e36797b1c7872275622c258dcaf48d46
Fix links
diff --git a/app/views/hosts/index.html.erb b/app/views/hosts/index.html.erb index 95d63c4..53792ff 100644 --- a/app/views/hosts/index.html.erb +++ b/app/views/hosts/index.html.erb @@ -1,22 +1,22 @@ <% render 'sidebar' %> -<ol class="breadcrumb"> - <li><%= link_to 'Dashboard', dashboard_path %></li> - <li class="act...
isfit/isfit-participant
2c981d608c09d948ad5be6ea06d0091b67b01a7f
Add new deadline extender
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index e67136d..d4d44d8 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,30 +1,30 @@ class ParticipantsController < ApplicationController load_and_authori...
isfit/isfit-participant
ce6a22872ec21e8a558d56cc1863df85125ce1a8
Adds matching
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 0361365..ac37072 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,34 +1,53 @@ class ParticipantsController < ApplicationController load_and_authori...
isfit/isfit-participant
bc41dab92599f0b0a0bda96ef3a9750509533e8e
Removes arrival place model
diff --git a/app/models/arrival_place.rb b/app/models/arrival_place.rb deleted file mode 100755 index 6cdf661..0000000 --- a/app/models/arrival_place.rb +++ /dev/null @@ -1,2 +0,0 @@ -class ArrivalPlace < ActiveRecord::Base -end diff --git a/db/migrate/20150109095539_remove_arrival_place.rb b/db/migrate/20150109095539_...
isfit/isfit-participant
e1b8f0ddf538994b709472c2a0e8646364fd4a78
Adds hosts
diff --git a/app/controllers/hosts_controller.rb b/app/controllers/hosts_controller.rb index 20de5f6..bc0adbc 100644 --- a/app/controllers/hosts_controller.rb +++ b/app/controllers/hosts_controller.rb @@ -1,61 +1,14 @@ class HostsController < ApplicationController require 'will_paginate/array' load_and_authori...
isfit/isfit-participant
b81b8c041c67961e0c8779d5e762164e7b85bf20
Adds january deadline reminder
diff --git a/app/mailers/deadline_mailer.rb b/app/mailers/deadline_mailer.rb index 98002ef..426ad9a 100644 --- a/app/mailers/deadline_mailer.rb +++ b/app/mailers/deadline_mailer.rb @@ -1,27 +1,11 @@ class DeadlineMailer < ActionMailer::Base default from: "no-reply@isfit.org" - def november_reminder_visa(user) - ...
isfit/isfit-participant
25bd9740f437414cd240cf7ed321b0f1eca9c278
Adds trains to participants
diff --git a/app/assets/javascripts/dashboard.js b/app/assets/javascripts/dashboard.js index 11a310e..c2885be 100644 --- a/app/assets/javascripts/dashboard.js +++ b/app/assets/javascripts/dashboard.js @@ -1,48 +1,51 @@ $(document).ready(function() { $('#workshop_application_applying_for_support').change(function(){...
isfit/isfit-participant
1917099e681d21f957704c44319c9e21a7cebdb3
Happy new year
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 4da69cd..2710440 100755 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,130 +1,128 @@ <!DOCTYPE html> <!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-n...
isfit/isfit-participant
e10a6fc8924a7885de8f6de6aae684dddb75d05e
Adds final step
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 16313b0..ac75ff0 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -1,45 +1,47 @@ class DashboardController < ApplicationController def index if current_user....
isfit/isfit-participant
d122578a9fb2fc7e0c266ee8d9d39c9fa2504790
Adds valiadators to first january step
diff --git a/app/assets/javascripts/dashboard.js b/app/assets/javascripts/dashboard.js index 61a7eb6..11a310e 100644 --- a/app/assets/javascripts/dashboard.js +++ b/app/assets/javascripts/dashboard.js @@ -1,38 +1,48 @@ $(document).ready(function() { $('#workshop_application_applying_for_support').change(function(){...
isfit/isfit-participant
a065fb952d264f8e9d36560190215bfa3daa16b7
Add departure views
diff --git a/app/assets/javascripts/dashboard.js b/app/assets/javascripts/dashboard.js index f1c15ab..61a7eb6 100644 --- a/app/assets/javascripts/dashboard.js +++ b/app/assets/javascripts/dashboard.js @@ -1,24 +1,38 @@ $(document).ready(function() { $('#workshop_application_applying_for_support').change(function(){...
isfit/isfit-participant
8da5b77dc128262009c6d4f57f978efc46ded8aa
Adds arrival information to participants
diff --git a/app/assets/javascripts/dashboard.js b/app/assets/javascripts/dashboard.js index 229939a..f1c15ab 100644 --- a/app/assets/javascripts/dashboard.js +++ b/app/assets/javascripts/dashboard.js @@ -1,10 +1,24 @@ $(document).ready(function() { $('#workshop_application_applying_for_support').change(function(){...
isfit/isfit-participant
d1c35e5e10a18ab620783f52a6577acf2d658ac8
Removes deprecation warning
diff --git a/config/application.rb b/config/application.rb index 2d6a3e1..0bb8eaa 100755 --- a/config/application.rb +++ b/config/application.rb @@ -1,48 +1,50 @@ require File.expand_path('../boot', __FILE__) require 'rails/all' # If you have a Gemfile, require the gems listed there, including any gems # you've...
isfit/isfit-participant
97c27585768d49cb285d93121b7c01fdcd5d6488
Clean up of gemfile
diff --git a/Gemfile b/Gemfile index 61fa0a4..c1d6ddd 100755 --- a/Gemfile +++ b/Gemfile @@ -1,45 +1,35 @@ source 'http://rubygems.org' -# Core components gem 'rails', '~> 3.2' gem 'mysql2' -# Authentication +gem 'sass-rails' +gem 'coffee-rails' +gem 'jquery-rails' +gem 'uglifier' + gem 'devise', '~> 2.2' gem ...
isfit/isfit-participant
454e5eec82b6d89cb020c9da51b95930d7ff929a
Removes New Relic
diff --git a/Gemfile b/Gemfile index 28ed871..61fa0a4 100755 --- a/Gemfile +++ b/Gemfile @@ -1,47 +1,45 @@ source 'http://rubygems.org' # Core components gem 'rails', '~> 3.2' gem 'mysql2' # Authentication gem 'devise', '~> 2.2' gem 'cancancan', '~> 1.9' # Gems for document handling and preparations gem ...
isfit/isfit-participant
6a063df78459470494e3af4f17200962c921d2c5
Removes simple form
diff --git a/Gemfile b/Gemfile index 024460f..28ed871 100755 --- a/Gemfile +++ b/Gemfile @@ -1,48 +1,47 @@ source 'http://rubygems.org' # Core components gem 'rails', '~> 3.2' gem 'mysql2' # Authentication gem 'devise', '~> 2.2' gem 'cancancan', '~> 1.9' # Gems for document handling and preparations gem ...
isfit/isfit-participant
41ca4d3ff4f7e733291d2c6aa5bd01d8d3cb488d
Cleans up test suite
diff --git a/test/fixtures/answers.yml b/test/fixtures/answers.yml deleted file mode 100755 index 2893341..0000000 --- a/test/fixtures/answers.yml +++ /dev/null @@ -1,11 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html - -# This model initially had no columns defined. If you add column...
isfit/isfit-participant
e6d10129201768bae50aa8a68baac646d32a248a
Die Factory Girl, DIE
diff --git a/Gemfile b/Gemfile index e4508ba..024460f 100755 --- a/Gemfile +++ b/Gemfile @@ -1,52 +1,48 @@ source 'http://rubygems.org' # Core components gem 'rails', '~> 3.2' gem 'mysql2' # Authentication gem 'devise', '~> 2.2' gem 'cancancan', '~> 1.9' # Gems for document handling and preparations gem ...
isfit/isfit-participant
c91663b0406df8aff8da5a21f613de246709a96b
Cleans up old information pages module
diff --git a/app/controllers/information_categories_controller.rb b/app/controllers/information_categories_controller.rb deleted file mode 100755 index bb7dc28..0000000 --- a/app/controllers/information_categories_controller.rb +++ /dev/null @@ -1,85 +0,0 @@ -class InformationCategoriesController < ApplicationControlle...
isfit/isfit-participant
329409a1168c1605bb5fa8123eec1b4663f32cec
Adds rejection for december deadline and major clean up of mailer folder
diff --git a/app/mailers/deadline_mailer.rb b/app/mailers/deadline_mailer.rb index 4be5734..98002ef 100644 --- a/app/mailers/deadline_mailer.rb +++ b/app/mailers/deadline_mailer.rb @@ -1,37 +1,27 @@ class DeadlineMailer < ActionMailer::Base default from: "no-reply@isfit.org" - def deadline_approved(participant, ...
isfit/isfit-participant
c2c6be76e7ac0ed276cfd7de8fd956ee9a324c8d
Let participantsfunctionaries review participants
diff --git a/app/models/ability.rb b/app/models/ability.rb index 1a5882e..5291aeb 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -1,33 +1,34 @@ class Ability include CanCan::Ability def initialize(user) user ||= User.new if user.role == 'admin' can :manage, :all end ...
isfit/isfit-participant
780a78fb422ac073710165a990247ad84ddd8ecb
Bugfix
diff --git a/app/controllers/settings/profile_controller.rb b/app/controllers/settings/profile_controller.rb index 3014abe..3507897 100644 --- a/app/controllers/settings/profile_controller.rb +++ b/app/controllers/settings/profile_controller.rb @@ -1,54 +1,54 @@ class Settings::ProfileController < ApplicationControlle...
isfit/isfit-participant
2859595e71470b2683e3b4e639cc4988b83d0804
Fixes bug with profiles to late recruits
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index c70bf2e..979e037 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -1,38 +1,42 @@ class DashboardController < ApplicationController def index if current_user....
isfit/isfit-participant
6ecbcdfe84c5b2d779f94e578f05c1b59655d155
Fixes country bug in participants and questions
diff --git a/app/views/participants/index.html.erb b/app/views/participants/index.html.erb index 212b0f0..3529bcc 100644 --- a/app/views/participants/index.html.erb +++ b/app/views/participants/index.html.erb @@ -1,65 +1,65 @@ <ol class="breadcrumb"> <li><%= link_to 'Dashboard', dashboard_path %></li> <li class=...
isfit/isfit-participant
41060ff36d5058d884a118138645a00f65d5f62e
Fixed second deadline
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb index 08254b2..e67136d 100644 --- a/app/controllers/participants_controller.rb +++ b/app/controllers/participants_controller.rb @@ -1,30 +1,30 @@ class ParticipantsController < ApplicationController load_and_authori...
isfit/isfit-participant
def0a7e8676fb8c10eed9e73d5ed8e09120de5e2
Removes requirement for motivation essay, next year, put that shit in application
diff --git a/app/models/profile.rb b/app/models/profile.rb index 089f74b..6ab0e7e 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -1,71 +1,69 @@ class Profile < ActiveRecord::Base CONFLICT_AREAS = ['BI', 'RW', 'ZA'] DIETARY_LAW_OPTIONS = [ ['No preference', 0], ['Halal', 1], ['...
isfit/isfit-participant
478c525e500eed16e414e31dd0012d3434c369e3
Adds december deadline mailer
diff --git a/app/mailers/deadline_mailer.rb b/app/mailers/deadline_mailer.rb index aea6c12..4be5734 100644 --- a/app/mailers/deadline_mailer.rb +++ b/app/mailers/deadline_mailer.rb @@ -1,27 +1,37 @@ class DeadlineMailer < ActionMailer::Base default from: "no-reply@isfit.org" def deadline_approved(participant, ...
isfit/isfit-participant
09377f9dc23956a6898cebc112979c8c5cc53d2f
Removes old search function
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb deleted file mode 100755 index cbb4843..0000000 --- a/app/controllers/search_controller.rb +++ /dev/null @@ -1,8 +0,0 @@ -class SearchController < ApplicationController - load_and_authorize_resource - - def index - @particip...
isfit/isfit-participant
e7035f82b4e6d29c8a622662cb5e483007aa1525
Adds missing next of kin relation field
diff --git a/app/models/profile.rb b/app/models/profile.rb index 941d288..089f74b 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -1,70 +1,71 @@ class Profile < ActiveRecord::Base CONFLICT_AREAS = ['BI', 'RW', 'ZA'] DIETARY_LAW_OPTIONS = [ ['No preference', 0], ['Halal', 1], ['...
isfit/isfit-participant
34847bdda2eda6f4697545b6981931503d8538b2
Adds next deadlines
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 64560e3..c70bf2e 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -1,49 +1,38 @@ class DashboardController < ApplicationController def index if current_user....
isfit/isfit-participant
79c92cc87deed5ce36eece70ce5361041a9c8a12
Fixes typo
diff --git a/app/views/settings/profile/_form.html.erb b/app/views/settings/profile/_form.html.erb index e7f0d9b..ec31cfd 100644 --- a/app/views/settings/profile/_form.html.erb +++ b/app/views/settings/profile/_form.html.erb @@ -1,168 +1,168 @@ <h2>Personal information</h2> <div class="form-group"> <%= f.label...
isfit/isfit-participant
720b5da5d8ed6096b58f5c1a2279e8e5eeac8052
Adds second deadline to schema
diff --git a/app/models/participant.rb b/app/models/participant.rb index 5f271d1..43f4f98 100644 --- a/app/models/participant.rb +++ b/app/models/participant.rb @@ -1,31 +1,31 @@ class Participant < ActiveRecord::Base # Attributes - attr_accessible :approved_first_deadline + attr_accessible :approved_first_deadli...
isfit/isfit-participant
2cb8fbe547a1e338fbf48ce9387850f5c767a3a8
Added new profile attributes
diff --git a/app/models/profile.rb b/app/models/profile.rb index 31cae45..67b46e2 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -1,36 +1,66 @@ class Profile < ActiveRecord::Base CONFLICT_AREAS = ['BI', 'RW', 'ZA'] + DIETARY_LAW_OPTIONS = [ + ['No preference', 0], + ['Halal', 1], + ['...
isfit/isfit-participant
69eb7338b610c3729f973d401fc0767574341f0a
Removes old deadline system.
diff --git a/app/controllers/deadlines_controller.rb b/app/controllers/deadlines_controller.rb deleted file mode 100755 index d507077..0000000 --- a/app/controllers/deadlines_controller.rb +++ /dev/null @@ -1,82 +0,0 @@ -class DeadlinesController < ApplicationController - load_and_authorize_resource - - # GET /deadli...
isfit/isfit-participant
8870d5f77f3230231426faf29c3825341bc0e425
Hotfix for dashboard
diff --git a/app/views/dashboard/index_admin.html.erb b/app/views/dashboard/index_admin.html.erb index 1822f39..7d68dc8 100644 --- a/app/views/dashboard/index_admin.html.erb +++ b/app/views/dashboard/index_admin.html.erb @@ -1,29 +1,20 @@ -<% content_for :sidebar_left do %> -<ul class="nav well nav-list"> - <li clas...
isfit/isfit-participant
6200565d3672aefbdbd19659af7f8cd9b68eea91
Adds new gemfile
diff --git a/Gemfile.lock b/Gemfile.lock index b8301e9..f61fb30 100755 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,233 +1,231 @@ GEM remote: http://rubygems.org/ specs: actionmailer (3.2.20) actionpack (= 3.2.20) mail (~> 2.5.4) actionpack (3.2.20) activemodel (= 3.2.20) act...
vargolo/ruby-libnotify
8ba5861daf9c46e2b9893bea50030520ef355954
version 0.5.1
diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 index 049939b..7aea192 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,12 @@ pkgs/ doc/ +site/ TODO *.so *.[ao] *~ *.gem* *.log .config InstalledFiles Makefile diff --git a/AUTHORS.rdoc b/AUTHORS.rdoc old mode 100755 new mode 100644 diff --gi...
vargolo/ruby-libnotify
95340d982139c60a9acd87019dddb318041239c6
minor fix
diff --git a/ext/extconf.rb b/ext/extconf.rb index 4c4e129..144390a 100644 --- a/ext/extconf.rb +++ b/ext/extconf.rb @@ -1,49 +1,58 @@ #!/usr/bin/env ruby =begin type=0, DEBUG type=1, RELEASE =end require 'rubygems' begin require 'pkg-config' rescue LoadError puts "ERROR: no pkg-config.rb file found...
vargolo/ruby-libnotify
f6994d0793f75820d88d1ce07ff0d1fe5ae2d6f0
version 0.5.0
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc index be076d1..e5b8b63 100755 --- a/CHANGELOG.rdoc +++ b/CHANGELOG.rdoc @@ -1,58 +1,70 @@ = Changelog +== Release 0.5.0 + * libnotify >= 0.7.0 is required in order to use this release + * CHANGED: Notify.app_name has been renamed to Notify.name + * CHANGED: Notifica...
vargolo/ruby-libnotify
d2a4f1926d2b51ae4ef943d2c90ad317dea0a380
add pkg-config>=1.0.7 as gem dependency
diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/AUTHORS.rdoc b/AUTHORS.rdoc old mode 100644 new mode 100755 diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc old mode 100644 new mode 100755 index d96b584..be076d1 --- a/CHANGELOG.rdoc +++ b/CHANGELOG.rdoc @@ -1,55 +1,58 @@ = Changelog +==...
vargolo/ruby-libnotify
da9c56d8f7e36b8a1ffb614284f020d98e93e4b5
added gem homepage
diff --git a/README.rdoc b/README.rdoc index 573c8de..bca21af 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,46 +1,48 @@ = ruby-libnotify ruby-libnotify is a ruby binding for libnotify (http://www.galago-project.org) == Requirements * Ruby >= 1.8.6 (not tested with previous versions) * libnotify >= 0.4.1 (...