saurabhbhatia d47b300dcf Import Data, Sync Data ...

Conflicts:

	vendor/built_in_modules/personal_book/app/models/writing_book.rb
	vendor/built_in_modules/personal_conference/app/models/writing_conference.rb
	vendor/built_in_modules/personal_journal/app/models/writing_journal.rb

2013-10-18 12:02:48 +08:00

..

assets

Update Ad_Banner for new jQuery

2013-10-16 12:28:21 +08:00

controllers

Import Data, Sync Data

2013-10-18 12:02:48 +08:00

errors

show error message when trying to show a not existed page

2013-01-03 13:50:27 +08:00

helpers

Updated fixes for site info - desktop openess, title always displayed

2013-10-16 18:33:57 +08:00

jobs

ask module: dropdown, icon, big5 encoding, redirect, admin, send mail

2013-06-07 13:03:59 +08:00

mailer

Add mail_settings

2012-05-09 11:38:29 +08:00

models

Fix editing a tag module

2013-10-16 23:34:51 +08:00

uploaders

new ui member plugin sort fix and user show avatar fix

2013-09-27 11:04:52 +08:00

views

Import Data, Sync Data

2013-10-18 12:02:48 +08:00