developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap

Browse Source
This commit is contained in:
Matt committed 2012-05-17 10:00:35 +08:00
2 parents e9dde4cefe 1e2b146c21
commit d1d25a12a1
3 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/uploaders/file_asset.rb → app/uploaders/file_asset_uploader.rb
View File
File renamed without changes.
vendor/built_in_modules/announcement/app/models/bulletin.rb
Vendored
+2 -2
View File
@@ -13,8 +13,8 @@ class Bulletin
has_one :text, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
has_and_belongs_to_many :tags, :class_name => "AnnouncementTag"
field :postdate , :type => Date
field :deadline , :type => Date
field :postdate , :type => DateTime
field :deadline , :type => DateTime
# field :url
field :create_user_id
field :update_user_id, :class_name => "User"
vendor/built_in_modules/news/app/models/news_bulletin.rb
Vendored
+2 -2
View File
@@ -13,8 +13,8 @@ class NewsBulletin
has_one :text, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
has_and_belongs_to_many :tags, :class_name => "NewsTag"
field :postdate , :type => Date
field :deadline , :type => Date
field :postdate , :type => DateTime
field :deadline , :type => DateTime
# field :url
field :create_user_id
field :update_user_id, :class_name => "User"