repo string | commit string | message string | diff string |
|---|---|---|---|
wangqy/zbs | 6e2229201a9316fdc8f093f80520a19f56f24fba | ä¿®æ£æ ¡éªä¸éè¿æ¶æ æ示æ¶æ¯çé®é¢ | diff --git a/app/views/dispatches/new.haml b/app/views/dispatches/new.haml
index bfb335a..cad2af0 100644
--- a/app/views/dispatches/new.haml
+++ b/app/views/dispatches/new.haml
@@ -1,51 +1,54 @@
-form_tag dispatches_path, :class => 'j-form' do
=hidden_field_tag 'id', params[:id]
.nav
%span ä½ ç°å¨çä½... |
wangqy/zbs | e4a79fd6be8b3694a904f03df0194712bc553fd4 | å å
¥å¨çº¿ç¨æ·åè½æ¨¡å | diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 082a876..a4287c4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,100 +1,108 @@
# Filters added to this controller apply to all controllers in the applica... |
wangqy/zbs | 7f587efdf5708a922e94f9bd93083fe6c2e3803f | ç³»ç»å å
¥æéæ§å¶ | diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 258b52e..1a7a041 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,91 +1,98 @@
# Filters added to this controller apply to all controllers in the applicati... |
wangqy/zbs | 043fb3ef1c939bd164bed911046b95c305f3569e | æ°å¢ç¨æ·æéææï¼ç¼è¾ç¨æ·ä¿®æ¹ææçcucumberæµè¯ | diff --git a/features/manage_users.feature b/features/manage_users.feature
index 40391e3..018e712 100644
--- a/features/manage_users.feature
+++ b/features/manage_users.feature
@@ -1,91 +1,123 @@
åè½: 管çç¨æ·
为äºç»ä¸ç®¡çç¨æ·ä¿¡æ¯
ä½ä¸ºç®¡çå
å¯ä»¥æ°å¢ãä¿®æ¹ãå é¤ç¨æ·
å... |
wangqy/zbs | d0887e13c4cb6c76fdbace95e08db0d3b6cbfd93 | ç¨æ·æ°å¢ä¿®æ¹æé | diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 38b24db..5a2e9e6 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,132 +1,143 @@
class UsersController < ApplicationController
+ before_filter :set_menu, :only => [:new, :create,... |
wangqy/zbs | 9b5f7e2b15eecee0bc8dd7e8d856807328b0b4fc | ç»å½åæ ¹æ®æéæ¾ç¤ºèå | diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index e68c20f..daee545 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,7 +1,8 @@
class HomeController < ApplicationController
layout nil
def head
- @menus = Resource.top
+ ... |
wangqy/zbs | 3ed378e8fb4f0269c9bd058f8acd1a3c2802292a | ä¿®æ£å¿
å¡«æ ·å¼ä¸æ¯çº¢è²çé®é¢ | diff --git a/public/stylesheets/default.css b/public/stylesheets/default.css
index 6a665ed..e63ed65 100644
--- a/public/stylesheets/default.css
+++ b/public/stylesheets/default.css
@@ -1,78 +1,78 @@
#content-container {
overflow: hidden;
width: 99.5%;
height: 99.6%; }
.hide, .show_by_other {
display: no... |
wangqy/zbs | 20e563898e469169f60bbc21ba463c8767b1a50c | ä¿®æ£ä¹åå¾æ¥è®°å½å¢å æ¾ç¤ºå½äºäººå¯¼è´æµè¯ä¸éè¿çé®é¢ | diff --git a/features/manage_conversations.feature b/features/manage_conversations.feature
index 1e85238..17cf9f6 100644
--- a/features/manage_conversations.feature
+++ b/features/manage_conversations.feature
@@ -1,64 +1,64 @@
åè½: åçäºä»¶
为äºå¿«éå½å
¥æ¥çµ,æ¥è®¿çä¿¡æ¯
ä½ä¸ºå¼ç室人å
... |
wangqy/zbs | cc1849af1a02a9a7ad944f1be71ecb72e4ee418f | å å
¥å¼å¸¸ä¿¡æ¯çç»ä¸ææãæ¥ç(注æ:å¼å¸¸åªå¨productionç¯å¢ä¸ä¼è¢«ææ) exception_loggeréè¦RedCloth gem | diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 258b52e..35756df 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,91 +1,93 @@
# Filters added to this controller apply to all controllers in the applicati... |
wangqy/zbs | eba2a98390ff093f0970d9a7f6f343ac8dcac31e | æ´æ°gem:request_log_analyzer | diff --git a/config/deploy.rb b/config/deploy.rb
index 58b12ce..c7fee22 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,55 +1,52 @@
require 'deprec'
set :domain, "192.168.1.67"
set :application, "cogentzbs"
set :repository, "git://github.com/cogentsoft/zbs.git"
# If you aren't deploying to /u/apps/... |
wangqy/zbs | 388d4dc77ae1a836beea31e2050d8dccd3f545d1 | ä¿®æ¹é¡¶ç«¯èåèæ¯å¾ç | diff --git a/app/views/home/head.haml b/app/views/home/head.haml
index a16b765..fe6d132 100644
--- a/app/views/home/head.haml
+++ b/app/views/home/head.haml
@@ -1,73 +1,73 @@
!!! Strict
%html
%head
%meta{'http-equiv' => 'Content-Type', :content => 'text/html; charset=utf-8'}
%title æ°åå¼ç室
... |
wangqy/zbs | 614d1339cbee40cbcabf26ae041624a90351741f | å¾æ¥è®°å½ä¸åçµå访æ¾ç¤ºå½äºäººå§å | diff --git a/app/views/conversations/_events.haml b/app/views/conversations/_events.haml
index f8f1093..49550bd 100644
--- a/app/views/conversations/_events.haml
+++ b/app/views/conversations/_events.haml
@@ -1,12 +1,14 @@
%ul#conversation_event.list
-conversation.events.each do |event|
%li
%a
... |
wangqy/zbs | 53525fe0e53ba7fe77312c22792d4f6333fb0ebb | ä¿®æ£æ·»å å¾æ¥è®°å½å表å¤æ¡è®°å½æå æä¸æ¡çé®é¢ | diff --git a/app/views/events/index.haml b/app/views/events/index.haml
index 6313eec..abe198b 100644
--- a/app/views/events/index.haml
+++ b/app/views/events/index.haml
@@ -1,33 +1,33 @@
.nav
%span ä½ ç°å¨çä½ç½®ï¼æ·»å å¾æ¥è®°å½
.search-panel
-form_tag events_path, :method=>:get, :class=>"j-form" ... |
wangqy/zbs | f9050530d678ffb28acd53b1b63b6860df9d5851 | ä¿®æ£æå¡å¨mongrel clusteræ¥logè·¯å¾ä¸æ£ç¡®çé®é¢ | diff --git a/config/deploy.rb b/config/deploy.rb
index 40e0b9b..58b12ce 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,55 +1,55 @@
require 'deprec'
set :domain, "192.168.1.67"
set :application, "cogentzbs"
set :repository, "git://github.com/cogentsoft/zbs.git"
# If you aren't deploying to /u/apps/... |
wangqy/zbs | 46b7f2b57d726164255587d32983783247ff92c5 | å å
¥æé表 | diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb
index 6edc346..a74847f 100644
--- a/app/controllers/conversations_controller.rb
+++ b/app/controllers/conversations_controller.rb
@@ -1,63 +1,61 @@
class ConversationsController < ApplicationController
def index
... |
wangqy/zbs | 7c0f79c02c67253c82fdb68a80ce842a49c92598 | ä¿®æ£apt-packgetå
å«nginxçå¤ä½é
置导è´deprecæ¥éçé®é¢ | diff --git a/config/deploy.rb b/config/deploy.rb
index 471e920..40e0b9b 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,49 +1,55 @@
require 'deprec'
set :domain, "192.168.1.67"
set :application, "cogentzbs"
set :repository, "git://github.com/cogentsoft/zbs.git"
# If you aren't deploying to /u/apps/... |
wangqy/zbs | 019a0430215ed37c7de067b3cf8a8efb5f852b71 | ä¿®æ¹ææ¾å¨æ ·å¼ | diff --git a/app/views/events/_wavobject.haml b/app/views/events/_wavobject.haml
index 99d660a..2e6a4d0 100644
--- a/app/views/events/_wavobject.haml
+++ b/app/views/events/_wavobject.haml
@@ -1,6 +1,2 @@
- if record
- %object{:type=>"audio/x-wav",:width=>42,:height=>25}
- %param{:name=>"src", :value=>"#{HTTP_WAV_... |
wangqy/zbs | ffa0f030c1b532ea88d727ee2bcdcbd0bb5d25db | å å
¥capé¨ç½² | diff --git a/Capfile b/Capfile
new file mode 100644
index 0000000..c36d48d
--- /dev/null
+++ b/Capfile
@@ -0,0 +1,3 @@
+load 'deploy' if respond_to?(:namespace) # cap2 differentiator
+Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
+load 'config/deploy'
\ No newline at end of file
diff --git a/confi... |
wangqy/zbs | 88e5686787278ad078ab7dc51fb9f23b76275ff1 | éè¿seleniumæµè¯ | diff --git a/spec/selenium/depart/turn_to.rsel b/spec/selenium/depart/turn_to.rsel
index 82980b1..d54d9df 100644
--- a/spec/selenium/depart/turn_to.rsel
+++ b/spec/selenium/depart/turn_to.rsel
@@ -1,55 +1,56 @@
setup :fixtures => [:conversations, :events, :people, :duties, :workitems, :histories]
include_partial 'dig... |
wangqy/zbs | 37c4e0a6f9542429eb0710cf5ec6ea16614e09de | éè¿selenium,cucumberæµè¯ | diff --git a/app/models/department.rb b/app/models/department.rb
index b80e377..94e67ba 100644
--- a/app/models/department.rb
+++ b/app/models/department.rb
@@ -1,21 +1,21 @@
class Department < ActiveRecord::Base
#è´è´£äºº
has_many :managers, :class_name => "User", :foreign_key => "department_id"
#å建人
... |
wangqy/zbs | 5bb222480bbe11615c70ecbadd02f06bc368c428 | å¤ä»½unixODBC,FreeTDSæéçé
ç½®æ件è³é¡¹ç®ä¸ | diff --git a/config/etc/freetds.conf b/config/etc/freetds.conf
new file mode 100644
index 0000000..0f5500a
--- /dev/null
+++ b/config/etc/freetds.conf
@@ -0,0 +1,5 @@
+[SQL2000HOST]
+ host = 192.168.1.13
+ port = 1433
+ tds version = 8.0
+ client charset = UTF-8
diff --git a/config/etc/odbc.ini b/config/etc/odbc.in... |
wangqy/zbs | 785e8f75e5be84d6aee77534352e2f689493f862 | éææºææ°å¢ä¿®æ¹é¡µé¢ä¸çå
Œ
±é¨å | diff --git a/app/views/departments/_form.haml b/app/views/departments/_form.haml
new file mode 100644
index 0000000..83a8b79
--- /dev/null
+++ b/app/views/departments/_form.haml
@@ -0,0 +1,35 @@
+#pop-errorExplanation.errorExplanation{:style => 'display:none'}
+%table.j-form-table
+ %thead
+ %tr
+ %th{:width=>... |
wangqy/zbs | 7842bd283882b3fdb072337e655a925b4dd86143 | æºæå¢å èè½,线路æ°;è°æ´æ ·å¼(左边æ å 大宽度) | diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c2e69ec..119db6b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,62 +1,71 @@
# Methods added to this helper will be available to all templates in the application.
module ApplicationHel... |
wangqy/zbs | b76fcc03b875943fcd60c166063e90f566c069b8 | é¢è¦æ ·å¼ | diff --git a/public/stylesheets/default.css b/public/stylesheets/default.css
index 28bca99..3e5473b 100644
--- a/public/stylesheets/default.css
+++ b/public/stylesheets/default.css
@@ -1,60 +1,63 @@
#content-container {
overflow: hidden;
width: 99.5%;
height: 99.6%; }
.hide {
display: none; }
#flash-... |
wangqy/zbs | 2b931ea7c517f7940fd2044dd8fbb6e3d2ff4b8e | ä¿®æ£æ°å¢äºä»¶æ¶ï¼ä¿®æ¹è系人ä¼åºç°å¤ä¸ªradio被éä¸çé®é¢ | diff --git a/app/views/events/_form.haml b/app/views/events/_form.haml
index 36f3594..7679ab5 100644
--- a/app/views/events/_form.haml
+++ b/app/views/events/_form.haml
@@ -1,24 +1,24 @@
%tr
%td.caption{:colspan=>5} äºä»¶ä¿¡æ¯
=render :partial => "events/wavfile", :locals => {:event => event}
%tr
%td= f.labe... |
wangqy/zbs | 692f5206fdf238ec816ef0c1f8a30da5cdbee2a9 | ä¿®æ£åçäºä»¶æå¤ä¸ªç»æåªæ¾ç¤ºä¸ä¸ªçé®é¢ | diff --git a/app/views/conversations/index.haml b/app/views/conversations/index.haml
index 2f0df7d..03a11f1 100644
--- a/app/views/conversations/index.haml
+++ b/app/views/conversations/index.haml
@@ -1,37 +1,37 @@
.nav
%span ä½ ç°å¨çä½ç½®ï¼åçäºä»¶
.search-panel
-form_tag conversations_path, :me... |
wangqy/zbs | 570795f3d883aa52722b27e739bcad2adbd30c81 | ä¿®æ£ä¿åäºä»¶åå次ä¿åæ¥æ¾ä¸å°update actionçé®é¢ | diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb
index c0629cd..6edc346 100644
--- a/app/controllers/conversations_controller.rb
+++ b/app/controllers/conversations_controller.rb
@@ -1,61 +1,63 @@
class ConversationsController < ApplicationController
def index
... |
wangqy/zbs | 7ac29193a396f23742af83f0eb99d94f74b21330 | ä¿®æ¹å¼å«ä¸å¿æ ·å¼,ä¿®æ¹æ¥çµå¼¹çªæ ·å¼(å»ææ»å¨æ ) | diff --git a/app/views/events/new.haml b/app/views/events/new.haml
index 4542955..94ec170 100644
--- a/app/views/events/new.haml
+++ b/app/views/events/new.haml
@@ -1,58 +1,58 @@
-form_for @event, :html => {:class => 'j-form'} do |f|
=f.hidden_field :record_id, :value => params[:record_id]
=hidden_field_tag :pho... |
wangqy/zbs | 63c56eb453bae274a77ec32134bba98cae5047b9 | éè¿ææseleniumæµè¯ | diff --git a/app/views/departments/_new.haml b/app/views/departments/_new.haml
index fc1fdbe..b59e6fa 100644
--- a/app/views/departments/_new.haml
+++ b/app/views/departments/_new.haml
@@ -1,48 +1,49 @@
-remote_form_for @department, :html => {:class => 'j-form'} do |f|
=f.hidden_field :parent_id
.j-panel-head
... |
wangqy/zbs | 0298cc2b658a18b81eb1d33253dcbe5f5b672857 | ä¿®æ¹åç±»æ°å¢æ ·å¼ | diff --git a/app/controllers/kinds_controller.rb b/app/controllers/kinds_controller.rb
index 8e45c37..370d058 100644
--- a/app/controllers/kinds_controller.rb
+++ b/app/controllers/kinds_controller.rb
@@ -1,20 +1,18 @@
class KindsController < ApplicationController
- layout 'facebox'
-
def new
@parent_list = K... |
wangqy/zbs | 5df00fe44f8275dc0177a7b3bdfca82ccc34cd07 | æ¾ç¤ºåäºä»¶çæ ·å¼ | diff --git a/app/views/conversations/_events.haml b/app/views/conversations/_events.haml
index 3db77d0..0212b9f 100644
--- a/app/views/conversations/_events.haml
+++ b/app/views/conversations/_events.haml
@@ -1,12 +1,12 @@
-%ul#shared-ticket-bins.stacked.wbadges.sortable
+%ul.list
-conversation.events.each do |event... |
wangqy/zbs | f1cfc44bdd777017b0c8910be0234cbaf766d228 | ä¿®æ£æ ¡éªä¸éè¿æ¶ï¼å¼çä¿¡æ¯ä¸æ¾ç¤ºçé®é¢ | diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 23762b0..7a86e8a 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -1,91 +1,91 @@
class EventsController < ApplicationController
include ConversationsHelper
def index
... |
wangqy/zbs | 91621f3a803434dfc9b22073a5bef202db9d0e78 | ä¿®æ¹æ°å¢èç³»äººæ ·å¼ | diff --git a/app/helpers/conversations_helper.rb b/app/helpers/conversations_helper.rb
index ff26e2a..3631faf 100644
--- a/app/helpers/conversations_helper.rb
+++ b/app/helpers/conversations_helper.rb
@@ -1,35 +1,33 @@
module ConversationsHelper
#éæ©äºä»¶åç±»
def select_kind(kind)
kind ||= Kind.new
... |
wangqy/zbs | 919c6be0372ffe664a3ab1e263d558817531641d | ä¿®æ¹æ示信æ¯çæ ·å¼ | diff --git a/public/stylesheets/default.css b/public/stylesheets/default.css
index 5eafb35..d3386d9 100644
--- a/public/stylesheets/default.css
+++ b/public/stylesheets/default.css
@@ -1,5 +1,24 @@
#singheadBody {
z-index: 99; }
.hide {
display: none; }
+
+#flash-notice {
+ font-weight: bold;
+ background: ... |
wangqy/zbs | 4da30b37aa23f2ab36d27b50285ae1070ff10d8f | éè¿cucumberæµè¯ | diff --git a/app/controllers/dispatches_controller.rb b/app/controllers/dispatches_controller.rb
index a150aa9..f52e523 100644
--- a/app/controllers/dispatches_controller.rb
+++ b/app/controllers/dispatches_controller.rb
@@ -1,44 +1,44 @@
class DispatchesController < ApplicationController
def index
- @list = Con... |
wangqy/zbs | cdf2b1f5f7ce1c32a66cd5c662047995c5726152 | åºç«¯åè½æ ·å¼ | diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index c7f4348..69c0326 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,139 +1,132 @@
class UsersController < ApplicationController
- layout 'facebox', :only => ["pass", "updatepass",... |
wangqy/zbs | f4fe6a2490c4608f65c9f9552c41b519bedce983 | ä¿®æ¹æºæ管ççæ ·å¼ | diff --git a/app/controllers/logs_controller.rb b/app/controllers/logs_controller.rb
index 7fe5a50..82fe8c0 100644
--- a/app/controllers/logs_controller.rb
+++ b/app/controllers/logs_controller.rb
@@ -1,29 +1,24 @@
class LogsController < ApplicationController
#å表
def index
@conditions = ["1=1 "]
if... |
wangqy/zbs | 5f4f9861bb290d83a44d337897bac42f558ebfe1 | ä¿®æ¹åç,åæ´¾,å¾
åäºé¡¹æ ·å¼ | diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 52963d9..71e9cdb 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,62 +1,58 @@
# This controller handles the login/logout function of the site.
class SessionsContro... |
wangqy/zbs | 48f07ec54ff36628ec91d5305dc84f2d5b58a405 | åçäºä»¶æ ·å¼æ´æ° | diff --git a/.gitignore b/.gitignore
index 64f4797..a458d9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,17 @@
config/database.yml
nbproject/**
log/
*.log
+*.pid
config/initializers/email.rb
#share by capistrano
public/photos/**
vendor/plugins/selenium-on-rails/log/default.yml
tmp/**
#vim swap file
*... |
wangqy/zbs | 644a7d4043dd1a61debead11f01aacc2242bb8eb | railså级è³2.3.2 | diff --git a/.gitmodules b/.gitmodules
index d804434..1f0cfcf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "vendor/plugins/thinking-sphinx"]
path = vendor/plugins/thinking-sphinx
- url = git://github.com/saberma/thinking-sphinx.git
+ url = git://github.com/saberma/thinking-sphinx.git
diff -... |
wangqy/zbs | a926eb2edb6e1093fa4e2059cc2b9ec43153c4a7 | ä¿®æ£æ°å¢ç¨æ·çseleniumä¸éè¿çé®é¢ | diff --git a/spec/selenium/admin/add_departmenter.rsel b/spec/selenium/admin/add_departmenter.rsel
index a494d3c..103221e 100644
--- a/spec/selenium/admin/add_departmenter.rsel
+++ b/spec/selenium/admin/add_departmenter.rsel
@@ -1,20 +1,19 @@
setup :fixtures => :users
open "/logout"
type "login", "cogentsoft"
type ... |
wangqy/zbs | a4c38f1317a8c5ee9ddb2b0efb5e82d80d06925b | å¾
åäºé¡¹é¢è¦çå¯,çä¿¡åéæ¶æ示é¢è¦äºä»¶æ° | diff --git a/app/controllers/workitems_controller.rb b/app/controllers/workitems_controller.rb
index f08ac25..3fe906b 100644
--- a/app/controllers/workitems_controller.rb
+++ b/app/controllers/workitems_controller.rb
@@ -1,53 +1,53 @@
class WorkitemsController < ApplicationController
def index
@list = Workitem... |
wangqy/zbs | 177c4ea43d2dc8010f2b4ce3af43e4e9277a0b08 | ä¸åºåè§è²,å»æç¨æ·æ¯å¦è´£ä»»äºº,å表å¢å æç¤ºä¿¡æ¯ | diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 59a9ab6..52963d9 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,66 +1,62 @@
# This controller handles the login/logout function of the site.
class SessionsContro... |
wangqy/zbs | 301f2e2aa23d4686c46022b0c54976ebd812df07 | ä¿®æ£åæ´¾æ¶æ·»å å¾æ¥è®°å½,è系人æªé»è®¤éä¸çé®é¢ | diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 692cec7..23762b0 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -1,89 +1,91 @@
class EventsController < ApplicationController
include ConversationsHelper
def index
... |
wangqy/zbs | ba952bd2f1dda90758a762d3761fe406eda68544 | å å
¥å¼å«ä¸å¿é¢æ¿,é
ç½®å¼å«ä¸å¿å°åå¨config.rb | diff --git a/app/views/conversations/_form.haml b/app/views/conversations/_form.haml
index 57a8027..8519698 100644
--- a/app/views/conversations/_form.haml
+++ b/app/views/conversations/_form.haml
@@ -1,68 +1,68 @@
%fieldset
%legend äºä»¶ä¿¡æ¯
%table.formin
=render :partial => "events/wavfile", :locals =>... |
wangqy/zbs | 3672815f9cb7bfe79444962f445e98444539489d | æ°å¢åæ¸
空ææè¾å
¥é¡¹(å
æ¬å¤è¡ææ¬æ¡),å»æcucumberæºææµè¯ | diff --git a/app/views/departments/create.rjs b/app/views/departments/create.rjs
index 21c9d7f..22c3ed7 100644
--- a/app/views/departments/create.rjs
+++ b/app/views/departments/create.rjs
@@ -1,6 +1,6 @@
parent = @department.parent ? "sub_#{@department.parent_id}" : "tree"
page.show parent
page.insert_html :bottom,... |
wangqy/zbs | edd3f2069cab5ae7390421f6fcfd7ea4318d4fe1 | æºææ¯æä¸ä¸çº§ | diff --git a/app/controllers/departments_controller.rb b/app/controllers/departments_controller.rb
index f39ac39..38a37e5 100644
--- a/app/controllers/departments_controller.rb
+++ b/app/controllers/departments_controller.rb
@@ -1,68 +1,58 @@
class DepartmentsController < ApplicationController
def index
- @condi... |
wangqy/zbs | 360e74e1434a59f3b08114fd7569bbbbeadb6568 | æ¥å»çµå
³èå½é³æ件 | diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb
index b2ca044..c0629cd 100644
--- a/app/controllers/conversations_controller.rb
+++ b/app/controllers/conversations_controller.rb
@@ -1,60 +1,61 @@
class ConversationsController < ApplicationController
def index
... |
wangqy/zbs | 5dd909e572fc20bce4d7a968bdc8e18048b96914 | å å
¥uniqueidåæ°,é¿å
å½é³æ件éå¤ä¿å | diff --git a/app/controllers/records_controller.rb b/app/controllers/records_controller.rb
index 843ce61..da89529 100644
--- a/app/controllers/records_controller.rb
+++ b/app/controllers/records_controller.rb
@@ -1,21 +1,22 @@
class RecordsController < ApplicationController
def index
@page = Record.paginate :c... |
wangqy/zbs | 56d005cccda719ffb436423c12dbdb8063d5e69b | å å
¥å½é³è®°å½,æ¥çµå»çµæ¶ä¿åå½é³è®°å½ | diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index ff019d6..258b52e 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -1,86 +1,91 @@
# Filters added to this controller apply to all controllers in the application.
# Likewise, all the methods added will ... |
wangqy/zbs | eba6107e4bace560c522272040368e7b7906a196 | ä¿®æ£cucumberæ´æ°åæ æ³è¿è¡çé®é¢ | diff --git a/features/support/paths.rb b/features/support/paths.rb
index e7a27e8..fad8804 100644
--- a/features/support/paths.rb
+++ b/features/support/paths.rb
@@ -1,25 +1,21 @@
module NavigationHelpers
def path_to(page_name)
case page_name
when /the homepage/i
root_path
when /the new l... |
wangqy/zbs | f4af1e421b8d72a10d9aa11dbcfe35474230932c | åæ´¾æ转åæ¶å¼æ¥åéçä¿¡ | diff --git a/app/controllers/dispatches_controller.rb b/app/controllers/dispatches_controller.rb
index b1496da..a150aa9 100644
--- a/app/controllers/dispatches_controller.rb
+++ b/app/controllers/dispatches_controller.rb
@@ -1,42 +1,44 @@
class DispatchesController < ApplicationController
def index
@list = Con... |
wangqy/zbs | 09098fa37f6eb0d6f063ca3e3201664b17de789e | 使ç¨wheneverå®æ¶åéçä¿¡,å®æ¶æ´æ°å¢éç´¢å¼ | diff --git a/app/models/message.rb b/app/models/message.rb
index 05c3f23..44da89a 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -1,27 +1,18 @@
class Message < ActiveRecord::Base
belongs_to :conversation
belongs_to :user
#å建人
belongs_to :creator, :class_name => "User"
validate... |
wangqy/zbs | d83d4cb6119ef489e166d0b46d096a3af64baf02 | äºä»¶è®°å½å表 | diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb
index 1c2659e..b2ca044 100644
--- a/app/controllers/conversations_controller.rb
+++ b/app/controllers/conversations_controller.rb
@@ -1,50 +1,60 @@
class ConversationsController < ApplicationController
def index
... |
wangqy/zbs | 08c3f3fefa0348dca5524fb2887e7cdd58b21936 | äºä»¶åç±»ä¸å¢å æéè¾å
¥é¡¹ | diff --git a/app/helpers/conversations_helper.rb b/app/helpers/conversations_helper.rb
index b08e95d..ab8715f 100644
--- a/app/helpers/conversations_helper.rb
+++ b/app/helpers/conversations_helper.rb
@@ -1,26 +1,30 @@
module ConversationsHelper
#éæ©äºä»¶åç±»
def select_kind(kind)
kind ||= Kind.new
... |
wangqy/zbs | 79b7fe5f35aa593811393c1968f7c293e07c169b | å»æé¦é¡µ | diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index b397549..59a9ab6 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,62 +1,66 @@
# This controller handles the login/logout function of the site.
class SessionsContro... |
wangqy/zbs | ed614a48dc4bfa11585d27ffcfa267246d7032b6 | äºä»¶åæ´¾æå¤çè¿ç¨ä¸å¯ä»¥æ·»å åçµå访çè®°å½ | diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index ea2859a..8debbe7 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -1,67 +1,77 @@
class EventsController < ApplicationController
def new
@conversation = Conversation.find... |
wangqy/zbs | 3fd269dcb792792a5e8e49ea703742f21a45a1c0 | åçäºä»¶,éè¿æææµè¯ | diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index e1c025c..ff019d6 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -1,87 +1,86 @@
# Filters added to this controller apply to all controllers in the application.
# Likewise, all the methods added will ... |
wangqy/zbs | 90b23a0aa28b86353cc0e36fd5ae43a90d0f884c | å°äºä»¶ä¿ååæ´æ°æä½ | diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 4c7e617..ea2859a 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -1,51 +1,67 @@
class EventsController < ApplicationController
def new
@conversation = Conversation.find... |
wangqy/zbs | 6638836cdde3b50ce1e1d541af6dfd68c2909426 | å¢å å°äºä»¶æ¶å¯ä¿®æ¹æ°å¢è系人,å·²å å
¥seleniumæµè¯ | diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 40d7d8b..e1c025c 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -1,87 +1,87 @@
# Filters added to this controller apply to all controllers in the application.
# Likewise, all the methods added will ... |
wangqy/zbs | e5caed04ea48bd279981fa8ada15f17749d924e9 | éè¿åçäºä»¶cucumberæµè¯ | diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
new file mode 100644
index 0000000..3a48251
--- /dev/null
+++ b/app/controllers/people_controller.rb
@@ -0,0 +1,14 @@
+class PeopleController < ApplicationController
+ def new
+ end
+
+ def create
+ end
+
+ def edit
+ end
+
+... |
wangqy/zbs | f1f247b7f2b6d52f5f7e191b82858a2420408321 | å å
¥å°äºä»¶æ¶,éæ©è系人 | diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb
index df12094..1c2659e 100644
--- a/app/controllers/conversations_controller.rb
+++ b/app/controllers/conversations_controller.rb
@@ -1,48 +1,50 @@
class ConversationsController < ApplicationController
def index
... |
wangqy/zbs | 0a543d5c6356de2ff59fde9010d7bed90c9e60c9 | éè¿cucumberæ°å¢äºä»¶æµè¯ | diff --git a/app/helpers/conversations_helper.rb b/app/helpers/conversations_helper.rb
index fe30c45..ab5654e 100644
--- a/app/helpers/conversations_helper.rb
+++ b/app/helpers/conversations_helper.rb
@@ -1,2 +1,14 @@
module ConversationsHelper
+ def select_kind(kind)
+ kind ||= Kind.new
+ options = []
+ par... |
wangqy/zbs | 84052563edc0fcdaba0c1e42153a22d0e919d12b | å¼ååçäºä»¶:å表 | diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb
new file mode 100644
index 0000000..df12094
--- /dev/null
+++ b/app/controllers/conversations_controller.rb
@@ -0,0 +1,48 @@
+class ConversationsController < ApplicationController
+ def index
+ @list = []
+ unl... |
wangqy/zbs | 8968a44c627e09050de8cd801bfde5c742a6e3ec | 1. æ°å¢äºä»¶æ¶,æ¥çµäººçææºå·ç å°±æ¯æ¥çµå·ç 2. åæ´¾äºä»¶æ¶,主é¢æ¾é¡¶ç«¯ 3. äºä»¶æè¿°é»è®¤æ¾ç¤ºä¸¤è¡,å¯ç¹å»æ´å¤æ¥ç 4. äºä»¶å ä¸ææ å½é³æ è®° 5. å¾
åäºé¡¹å¤ç页æ¾ç¤ºå½åäºä»¶ç¶æ 6. å¤çäºä»¶æ¶,ä¿åæ¹ä¸ºæ交 7. å¤çäºä»¶æ¶,æ¾ç¤ºä¸ä¸äººçåçæ... | diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 70d31a6..66c5967 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -1,113 +1,114 @@
class EventsController < ApplicationController
def index
#TODO make this finder dynami... |
robmckinnon/tell_us_once | 4b696010bcfcee79d0fba68790dc4e5514bf2271 | added footnote explanation and link to rewiredstate | diff --git a/app/stylesheets/screen.sass b/app/stylesheets/screen.sass
index 790026f..4f04b71 100644
--- a/app/stylesheets/screen.sass
+++ b/app/stylesheets/screen.sass
@@ -1,145 +1,155 @@
/*
Welcome to Susy. Use this file to define screen styles.
Import this file using the following HTML or equivalent:
<link... |
robmckinnon/tell_us_once | fe44ac950d6b97f41f3feb865a0657596e94b897 | Attempt to post to recipient (untested) | diff --git a/app/models/department_notification.rb b/app/models/department_notification.rb
index 06b95d3..4fb2c37 100644
--- a/app/models/department_notification.rb
+++ b/app/models/department_notification.rb
@@ -1,53 +1,52 @@
class DepartmentNotification < ActiveRecord::Base
belongs_to :submitter
belongs_to :ch... |
robmckinnon/tell_us_once | dfa9a744f985f2b0e099577fb34ee2cabc1975dc | Final go! | diff --git a/config/initializers/smtp_gmail.rb b/config/initializers/smtp_gmail.rb
index 339d88a..3b6c503 100644
--- a/config/initializers/smtp_gmail.rb
+++ b/config/initializers/smtp_gmail.rb
@@ -1,13 +1,20 @@
config_file = "#{RAILS_ROOT}/config/smtp_gmail.yml"
raise "Sorry, you must have #{config_file}" unless File... |
robmckinnon/tell_us_once | d7d3449b0c3c0f9862e3e6cf868ec08668d83def | Try again | diff --git a/config/initializers/smtp_gmail.rb b/config/initializers/smtp_gmail.rb
index 36a3fa6..339d88a 100644
--- a/config/initializers/smtp_gmail.rb
+++ b/config/initializers/smtp_gmail.rb
@@ -1,13 +1,13 @@
config_file = "#{RAILS_ROOT}/config/smtp_gmail.yml"
raise "Sorry, you must have #{config_file}" unless File... |
robmckinnon/tell_us_once | 02b6502fc42f7e340d038114ed904ad672ba3f0d | New settings for gmail (server is 1.8.6) | diff --git a/app/models/department_notification.rb b/app/models/department_notification.rb
index 874f279..06b95d3 100644
--- a/app/models/department_notification.rb
+++ b/app/models/department_notification.rb
@@ -1,48 +1,53 @@
class DepartmentNotification < ActiveRecord::Base
belongs_to :submitter
belongs_to :ch... |
robmckinnon/tell_us_once | f49ec9544bf013d58b11e4e0b882a6e2be58760d | dont repeat details preview | diff --git a/app/controllers/death_notifications_controller.rb b/app/controllers/death_notifications_controller.rb
index 6fa05ef..7058a4d 100644
--- a/app/controllers/death_notifications_controller.rb
+++ b/app/controllers/death_notifications_controller.rb
@@ -1,77 +1,77 @@
class DeathNotificationsController < Resourc... |
robmckinnon/tell_us_once | 45c888ac7027b1678d3fb24a44f795dc2cab6938 | added preview screen | diff --git a/app/controllers/death_notifications_controller.rb b/app/controllers/death_notifications_controller.rb
index fae4c73..6fa05ef 100644
--- a/app/controllers/death_notifications_controller.rb
+++ b/app/controllers/death_notifications_controller.rb
@@ -1,71 +1,77 @@
class DeathNotificationsController < Resourc... |
robmckinnon/tell_us_once | 21f8246bfd8b705dbcc3a6bfa54cd276ed742b7e | Moved gmail config stuff into initializers (where it should have been in first place, Doh!) | diff --git a/config/environment.rb b/config/environment.rb
index 2c8b283..5289d2c 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,48 +1,48 @@
# Be sure to restart your server when you modify this file
# Specifies gem version of Rails to use when vendor/rails is not present
RAILS_GEM_VERSION = ... |
robmckinnon/tell_us_once | 3ee51eaeca6dd5e6cbdc8dd37572d5ca9934b4ee | put http auth over most actions | diff --git a/.gitignore b/.gitignore
index 85d5c7e..2f83b3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,31 +1,32 @@
bin
config/initializers/constants.rb
config/deploy.rb
+config/auth.yml
config/passenger
db/development_structure.sql
Gemfile
.bundle
vendor/plugins
vendor/bundler_gems
test
config/database.y... |
robmckinnon/tell_us_once | 38cf3c5fd8824bafc1c710377e78b43c68b9b60d | prevent notification being seen outside of user session | diff --git a/app/controllers/death_notifications_controller.rb b/app/controllers/death_notifications_controller.rb
index ea8ab4d..447ed5c 100644
--- a/app/controllers/death_notifications_controller.rb
+++ b/app/controllers/death_notifications_controller.rb
@@ -1,21 +1,69 @@
class DeathNotificationsController < Resourc... |
robmckinnon/tell_us_once | ce1b1bebdbcd6dcf3b320ffff8109126ecf3a0cc | formatting | diff --git a/app/stylesheets/screen.sass b/app/stylesheets/screen.sass
index 80268d4..6c8575a 100644
--- a/app/stylesheets/screen.sass
+++ b/app/stylesheets/screen.sass
@@ -1,137 +1,139 @@
/*
Welcome to Susy. Use this file to define screen styles.
Import this file using the following HTML or equivalent:
<link... |
robmckinnon/tell_us_once | c834cff2a68d54c134376b196c8747153b2aab14 | improved final success page content | diff --git a/app/stylesheets/screen.sass b/app/stylesheets/screen.sass
index 806cdb9..80268d4 100644
--- a/app/stylesheets/screen.sass
+++ b/app/stylesheets/screen.sass
@@ -1,134 +1,137 @@
/*
Welcome to Susy. Use this file to define screen styles.
Import this file using the following HTML or equivalent:
<link... |
robmckinnon/tell_us_once | a8ba95a106a57717c81f2dda04fd549afb2256b1 | color change | diff --git a/app/stylesheets/screen.sass b/app/stylesheets/screen.sass
index 0681d10..806cdb9 100644
--- a/app/stylesheets/screen.sass
+++ b/app/stylesheets/screen.sass
@@ -1,133 +1,134 @@
/*
Welcome to Susy. Use this file to define screen styles.
Import this file using the following HTML or equivalent:
<link... |
robmckinnon/tell_us_once | 38a619bdf050037c2030ad088a0c045906de6e15 | Added notification, submitter details in email to department | diff --git a/app/models/department_mailer.rb b/app/models/department_mailer.rb
index 7bc57bc..1d5e7b0 100644
--- a/app/models/department_mailer.rb
+++ b/app/models/department_mailer.rb
@@ -1,12 +1,13 @@
class DepartmentMailer < ActionMailer::Base
def notification(department_notification)
@recipients = de... |
robmckinnon/tell_us_once | 46d4441fe03c3d1313e801b96b8d3cf042b619cf | ignore constants.rb | diff --git a/.gitignore b/.gitignore
index e05695f..85d5c7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1,31 @@
bin
+config/initializers/constants.rb
config/deploy.rb
config/passenger
db/development_structure.sql
Gemfile
.bundle
vendor/plugins
vendor/bundler_gems
test
config/database.yml
.DS_Store
do... |
robmckinnon/tell_us_once | 5bc106fbd757e3ec9df7dfe3a634860da772f2da | formatting home page | diff --git a/app/stylesheets/screen.sass b/app/stylesheets/screen.sass
index 8ce0128..0681d10 100644
--- a/app/stylesheets/screen.sass
+++ b/app/stylesheets/screen.sass
@@ -1,119 +1,133 @@
/*
Welcome to Susy. Use this file to define screen styles.
Import this file using the following HTML or equivalent:
<link... |
robmckinnon/tell_us_once | e4562384a8d840defc59af180cbef9a91d6910a5 | Added processed_at field to department notifications | diff --git a/app/models/department_notification.rb b/app/models/department_notification.rb
index 34dd4ea..874f279 100644
--- a/app/models/department_notification.rb
+++ b/app/models/department_notification.rb
@@ -1,47 +1,48 @@
class DepartmentNotification < ActiveRecord::Base
belongs_to :submitter
belongs_to :ch... |
robmckinnon/tell_us_once | b7723d3d497a120030daae34367f13e89249c217 | Fixed tests. Added department notifications to delayed job queue. Misc other stuff | diff --git a/app/models/death_notification.rb b/app/models/death_notification.rb
index de7e5ff..e0875d2 100644
--- a/app/models/death_notification.rb
+++ b/app/models/death_notification.rb
@@ -1,6 +1,5 @@
class DeathNotification < ActiveRecord::Base
include ChangeNotificationMethods
- accepts_nested_attributes_for... |
robmckinnon/tell_us_once | e563305fc58ed5e9900c8e3ddda95f1db9e7f368 | header styling | diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c76ec62..e59d6cd 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,14 +1,20 @@
# Filters added to this controller apply to all controllers in the applicati... |
robmckinnon/tell_us_once | 00c252d00fd4c0fdb3c9e1b459e8a08236423265 | show submitter details on show view | diff --git a/app/views/death_notifications/new.html.haml b/app/views/death_notifications/new.html.haml
index c60db79..c4e35af 100644
--- a/app/views/death_notifications/new.html.haml
+++ b/app/views/death_notifications/new.html.haml
@@ -1,8 +1,8 @@
%h1 Please enter the following details:
- unless error_messages_for... |
robmckinnon/tell_us_once | 821fd70c0fcb7d6d38c1201c2871bdbceb665aff | removed validation of submitter_id | diff --git a/lib/change_notification_methods.rb b/lib/change_notification_methods.rb
index 949b51a..e04ef25 100644
--- a/lib/change_notification_methods.rb
+++ b/lib/change_notification_methods.rb
@@ -1,24 +1,24 @@
module ChangeNotificationMethods
module ClassMethods
end
module InstanceMethods
... |
robmckinnon/tell_us_once | 451611dd1a53802cab6d2818335605ab0315ba1f | unpacked compass-susy-plugin to vendor/gems ; cp susy.rb to compass-susy-plugin.rb | diff --git a/vendor/gems/compass-susy-plugin-0.6.3/.specification b/vendor/gems/compass-susy-plugin-0.6.3/.specification
new file mode 100644
index 0000000..eae41fe
--- /dev/null
+++ b/vendor/gems/compass-susy-plugin-0.6.3/.specification
@@ -0,0 +1,114 @@
+--- !ruby/object:Gem::Specification
+name: compass-susy-plugin... |
robmckinnon/tell_us_once | fbbe0f4ef2c6b8069965e7ceb5947113d6b5cf9d | allow birth date to be blank | diff --git a/app/views/death_notifications/_form.html.haml b/app/views/death_notifications/_form.html.haml
index 7ba5b0b..e0442b6 100644
--- a/app/views/death_notifications/_form.html.haml
+++ b/app/views/death_notifications/_form.html.haml
@@ -1,48 +1,48 @@
%fieldset
%legend Your details
- f.fields_for :submitt... |
robmckinnon/tell_us_once | 971df722d7e8225e7fd32c91e2d9f59f93be51cd | moved to config.gem | diff --git a/config/environment.rb b/config/environment.rb
index 029a58b..e6a5237 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,41 +1,46 @@
# Be sure to restart your server when you modify this file
# Specifies gem version of Rails to use when vendor/rails is not present
RAILS_GEM_VERSION = ... |
robmckinnon/tell_us_once | 694e57f42a0c1281ce69661fa3dff585aceab421 | commented out | diff --git a/config/preinitializer.rb b/config/preinitializer.rb
index 8e17564..67864da 100644
--- a/config/preinitializer.rb
+++ b/config/preinitializer.rb
@@ -1,18 +1,20 @@
# require File.expand_path(File.join(File.dirname(__FILE__), "..", "vendor", "bundler_gems", "environment"))
+=begin
begin
# Require the... |
robmckinnon/tell_us_once | c08443122b9206a575a2dd84ff9da4b5ce6e35a0 | ensure entered submitter fields are shown in preview | diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3608a71..f42cdc6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,36 +1,36 @@
# Methods added to this helper will be available to all templates in the application.
module ApplicationHel... |
robmckinnon/tell_us_once | 49baf0e23bfa1e5d72fd1b2c9b6256daf7839e9e | ensure entered submitter fields are shown in preview | diff --git a/app/controllers/death_notifications_controller.rb b/app/controllers/death_notifications_controller.rb
index 9d4bbbb..ea8ab4d 100644
--- a/app/controllers/death_notifications_controller.rb
+++ b/app/controllers/death_notifications_controller.rb
@@ -1,12 +1,21 @@
class DeathNotificationsController < Resourc... |
robmckinnon/tell_us_once | 5f97d29d4c134052dd36b176dad12a223133a5c0 | moved Date functions to controller | diff --git a/app/controllers/death_notifications_controller.rb b/app/controllers/death_notifications_controller.rb
index b21ef98..9d4bbbb 100644
--- a/app/controllers/death_notifications_controller.rb
+++ b/app/controllers/death_notifications_controller.rb
@@ -1,7 +1,12 @@
class DeathNotificationsController < Resource... |
robmckinnon/tell_us_once | e01352756996fe9dd540b8de23f114c416d92341 | use Date not Time | diff --git a/app/views/death_notifications/_form.html.haml b/app/views/death_notifications/_form.html.haml
index 375be95..ecd6bfb 100644
--- a/app/views/death_notifications/_form.html.haml
+++ b/app/views/death_notifications/_form.html.haml
@@ -1,48 +1,48 @@
%fieldset
%legend Your details
- f.fields_for :submitt... |
robmckinnon/tell_us_once | 71cc5287dec540883f8d6130ac2be13d7d58b08c | better styling of field errors on preview view | diff --git a/.gitignore b/.gitignore
index 8ca38ec..76f0c10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,28 +1,29 @@
bin
config/deploy.rb
+config/passenger
db/development_structure.sql
Gemfile
.bundle
vendor/plugins
vendor/bundler_gems
test
config/database.yml
.DS_Store
doc
log
rerun.txt
data
config/sc... |
robmckinnon/tell_us_once | f84ab6e5b33f96f9c956b9b930506479b6511aa2 | Added ChangeNotificationMethods module to add common methods to change notifications, including callback that creates department notifications | diff --git a/.gitignore b/.gitignore
index dd49c32..6c1009a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,28 @@
bin
db/development_structure.sql
Gemfile
.bundle
vendor/plugins
vendor/bundler_gems
test
config/database.yml
.DS_Store
doc
log
rerun.txt
data
config/scalpel.yml
\#*\#
public/www*
temp.... |
robmckinnon/tell_us_once | 114ab3b305459815a7d37c0d5c9f2d00cf9ad5df | better display of validation errors in form | diff --git a/.gitignore b/.gitignore
index dd49c32..8ca38ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,28 @@
bin
+config/deploy.rb
db/development_structure.sql
Gemfile
.bundle
vendor/plugins
vendor/bundler_gems
test
config/database.yml
.DS_Store
doc
log
rerun.txt
data
config/scalpel.yml
\#*\#
... |
robmckinnon/tell_us_once | 7dc4dad88a50df2d231fa576bad0a577b2e28368 | Attempt to revert from messed up commit | diff --git a/.gitignore b/.gitignore
index bbf7647..dd49c32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,27 @@
bin
+db/development_structure.sql
Gemfile
.bundle
vendor/plugins
vendor/bundler_gems
test
config/database.yml
.DS_Store
doc
log
rerun.txt
data
config/scalpel.yml
\#*\#
public/www*
temp.... |
robmckinnon/tell_us_once | c3a387ba33d9b5f6f35b7cdd6e71a790eadf4061 | create submitter with notification | diff --git a/app/controllers/death_notifications_controller.rb b/app/controllers/death_notifications_controller.rb
index 7468319..b21ef98 100644
--- a/app/controllers/death_notifications_controller.rb
+++ b/app/controllers/death_notifications_controller.rb
@@ -1,2 +1,7 @@
class DeathNotificationsController < ResourceC... |
robmckinnon/tell_us_once | b1d2fd3b416b305f257e6e9a6f7b00ad3d4afdd8 | Overrode DepartmentNotification#to_xml Added basic post to endpoint | diff --git a/app/models/department_notification.rb b/app/models/department_notification.rb
index a92e46e..b093c05 100644
--- a/app/models/department_notification.rb
+++ b/app/models/department_notification.rb
@@ -1,30 +1,42 @@
class DepartmentNotification < ActiveRecord::Base
belongs_to :submitter
belongs_to :ch... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.