saurabhbhatia f8ad13a9f5 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-11-15 17:36:35 +08:00

..

assets

add Member frontend page selection options and fix backend role filter page

2013-11-15 17:08:45 +08:00

controllers

Import Data, Sync Data

2013-11-15 17:36:35 +08:00

errors

show error message when trying to show a not existed page

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

helpers

Updated Approvable to work for submanager role also

2013-11-13 10:35:03 +08:00

jobs

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

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

mailer

Updated Remember me, and Homepage widget more link

2013-11-11 17:23:03 +08:00

models

add Member frontend page selection options and fix backend role filter page

2013-11-15 17:08:45 +08:00

uploaders

Review of the uploaders

2013-10-20 16:07:20 +08:00

views

Import Data, Sync Data

2013-11-15 17:36:35 +08:00