Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / app / assets / javascripts / ap.js

diff --git a/app/assets/javascripts/ap.js b/app/assets/javascripts/ap.js
index 19d77ef..7178793 100644 (file)
--- a/app/assets/javascripts/ap.js
+++ b/app/assets/javascripts/ap.js
@@ -10,10 +10,11 @@
 //require jquery.validate
 //require additional-methods
 //require jquery.validate.localization/messages_ja
+//= require rails-timeago
+//= require locales/jquery.timeago.ja.js
 //= require textchange
 //= require underscore
 //= require backbone
-//= require backbone-relational
 //= require i18n
 //= require ./tags
 //= require ./manifest_base/manifest_base
@@ -306,6 +307,7 @@
 //= require_directory ./views/stories
 //= require_directory ./views/story_sheets
 //= require_directory ./views/system_pictures
+//= require_directory ./views/writing_formats
 //= require_directory ./addons/pettanr_creative_commons_v30_licenses
 //= require_directory ./addons/pettanr_pettan_commons_v01_licenses
 //= require_directory ./addons/pettanr_pettan_protected_v01_licenses