unknown
|
0cb573946e
|
update item page
|
2012-08-30 15:17:39 +08:00 |
chris
|
7d5531bf01
|
Merge branch 'nccu_master' into demo_site
Conflicts:
Gemfile
app/assets/javascripts/tinymce_orbit.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/admin/assets_controller.rb
app/controllers/admin/module_apps_new_interface_controller.rb
app/controllers/admin/page_parts_controller.rb
app/jobs/sync_db.rb
app/models/page.rb
app/models/page_part.rb
app/models/user/user.rb
app/uploaders/image_uploader.rb
app/views/admin/assets/create.js.erb
app/views/admin/module_apps/reload_frontend_pages.js.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
app/views/layouts/_users_checkbox_ary.html.erb
app/views/shared/_privilege_user.html.erb
config/mongoid.yml
lib/parsers/parser_common.rb
vendor/built_in_modules/announcement/announcement.json
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
|
2012-08-22 18:07:49 +08:00 |
|
unknown
|
d5c55c9697
|
widget & frontend field
|
2012-08-09 15:25:30 +08:00 |
|
Christophe Vilayphiou
|
ebc8dd33ec
|
Merge branch 'design_team' into ldap
Conflicts:
Gemfile.lock
app/controllers/admin/module_apps_controller.rb
app/controllers/application_controller.rb
vendor/built_in_modules/web_resource/web_resource.json
|
2012-05-14 00:57:17 +08:00 |
|
Christophe Vilayphiou
|
cf8d20dc84
|
Add category and tag to pages
|
2012-05-14 00:33:52 +08:00 |
|
Christophe Vilayphiou
|
5eba2638ce
|
Merge branch 'design_team' into ldap
|
2012-05-10 14:17:38 +08:00 |
Matthew K. Fu JuYuan
|
b6aad17681
|
Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.
|
2012-05-10 14:16:37 +08:00 |
|
Christophe Vilayphiou
|
20504b2205
|
Merge branch 'design_team' into ldap
Conflicts:
app/controllers/admin/page_parts_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
|
2012-04-30 07:57:20 +08:00 |
|
Matthew K. Fu JuYuan
|
a46a8898d7
|
Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
|
2012-04-30 00:24:11 +08:00 |
Matt Fu
|
d5a2de5476
|
LDAP with sync rake task
|
2012-03-06 16:41:06 +08:00 |
|
Matt Fu
|
cceb785a8d
|
change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.
|
2012-02-29 18:58:33 +08:00 |
Matthew Kaito Juyuan Fu
|
3bcd7ea349
|
Exp with object_auth
|
2012-02-29 18:50:23 +08:00 |
|
Christophe Vilayphiou
|
63d7810b35
|
Add isotope, categories for announcement page, sort for announcement
|
2012-02-23 15:52:58 +08:00 |
|
Matthew Fu
|
afbb9e266a
|
User role and sub_role simple interface complete
|
2012-01-24 12:28:33 +08:00 |
|
Matthew Fu
|
4ed8a2164c
|
First complete with manager and submanager
|
2012-01-24 12:28:32 +08:00 |
|
Matthew Fu
|
4df8ab6cc3
|
Add methods to work with manager role,add task to build user test data
|
2012-01-24 12:28:32 +08:00 |
|
Matthew Fu
|
18a82d7f47
|
Manger and SubManager
|
2012-01-24 12:28:32 +08:00 |
|
Matthew Fu
|
c0efb5d1bc
|
Listing for Module-apps
|
2012-01-12 14:13:41 +08:00 |
|
Matthew Fu
|
79f778ad8c
|
creating for disabling widgets and frontend
|
2012-01-05 16:21:33 +08:00 |
|
chris2tof
|
a09f8e4551
|
merge with november_presentation
|
2011-12-20 16:47:17 +08:00 |