Harry Bomrah
|
800f108be3
|
added enabling and disabling feature of widget count in module init
|
2013-12-10 17:43:31 +08:00 |
Spen
|
20e2f07b26
|
add Member frontend page selection options and fix backend role filter page
|
2013-11-15 17:08:45 +08:00 |
saurabhbhatia
|
ce8e9c0a5f
|
Revert "more button fix and also new way to select more page."
This reverts commit e129b25554 .
|
2013-11-15 16:58:27 +08:00 |
saurabhbhatia
|
dc5ef21516
|
Revert "add Member frontend page selection options and fix backend role filter page"
This reverts commit ea3f9c8163 .
|
2013-11-15 16:58:11 +08:00 |
Spen
|
ea3f9c8163
|
add Member frontend page selection options and fix backend role filter page
|
2013-11-15 16:16:39 +08:00 |
Harry Bomrah
|
e129b25554
|
more button fix and also new way to select more page.
|
2013-11-15 15:13:58 +08:00 |
Harry Bomrah
|
d17953ab86
|
partial is rendered when editing a page part
|
2013-11-07 17:23:15 +08:00 |
saurabhbhatia
|
591a3e0bc4
|
Updated redirect path after saving a page
|
2013-11-06 17:20:40 +08:00 |
saurabhbhatia
|
9760100b69
|
Removed the logger
|
2013-11-06 16:38:55 +08:00 |
saurabhbhatia
|
ef67941ba5
|
Fix for widgets edit form
|
2013-11-06 15:11:09 +08:00 |
chris
|
6bc00ce3a3
|
Use module_app label instead of title
|
2013-10-29 11:17:02 +08:00 |
chris
|
a14d69211b
|
PagePart widgets for "system widget"
Delete useless code
|
2013-10-28 16:29:23 +08:00 |
chris
|
218cb03641
|
PagePart widgets except "system widget"
|
2013-10-28 16:29:23 +08:00 |
chris
|
ff59feb2e7
|
Fix for structure
|
2013-07-29 18:46:38 +08:00 |
chris
|
856898016b
|
New UI changes(tags, categories, authorisations, module index…)
To run:
- ruby lib/remove_old_tags.rb DB_NAME
- rake new_ui:migrate_tags
- rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details)
|
2013-07-02 16:46:44 +08:00 |
chris
|
253cca06cc
|
New widget for tag cloud
|
2013-06-06 17:17:45 +08:00 |
Matt K. Fu
|
425a320c02
|
fix widget and fronted setting interface. checked with Spen
|
2013-04-17 14:16:24 +08:00 |
Matt K. Fu
|
0781779ac0
|
solved conflicts
|
2013-04-17 14:14:24 +08:00 |
Matt K. Fu
|
0f6f5aafce
|
fix for both part and page part settings
Conflicts:
app/helpers/admin/page_parts_helper.rb
app/views/admin/pages/reload_front_end_setting.js.erb
app/views/admin/pages/reload_frontend_pages.js.erb
|
2013-04-17 14:12:52 +08:00 |
Fu Matthew
|
f6b600df59
|
deliver API
|
2013-04-17 14:09:01 +08:00 |
Fu Matthew
|
6efef253a6
|
add conditions for making multi cates and tags more stable
|
2013-04-17 11:08:57 +08:00 |
Fu Matthew
|
8e98cb3ec9
|
put add admin pages using orbit back end controller
|
2013-04-17 10:54:38 +08:00 |
chris
|
e208e99a73
|
Fix page part update when no tag or category
|
2013-03-13 15:45:30 +08:00 |
Fu Matthew
|
285119a5f3
|
fix for multi select cates and tags
|
2013-03-04 19:29:45 +08:00 |
Fu Matthew
|
0dabd5b95f
|
fix widget field reload
|
2013-02-27 10:51:41 +08:00 |
Fu Matthew
|
8a8bfcb8fb
|
fix default widget link
|
2013-02-27 10:50:47 +08:00 |
Fu Matthew
|
99e67c8719
|
first version of multi categories and tags
|
2013-02-27 10:49:48 +08:00 |
chris
|
5b0b8e6c79
|
Fix bug in widget selection
|
2013-02-23 17:25:07 +08:00 |
chris
|
caac9191ce
|
Fix public_r_tag selection
|
2013-02-23 16:52:37 +08:00 |
Fu Matthew
|
a6f6dc271c
|
fix i18n,reload problems
|
2013-02-18 15:13:31 +08:00 |
chris
|
e9f2983176
|
Fix page part kind being removed
|
2013-02-04 18:02:09 +08:00 |
Fu Matthew
|
71d5abae2e
|
first version of app config and modified inits.
|
2013-01-29 20:33:40 +08:00 |
Fu Matthew
|
bfaa22052f
|
Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config
Conflicts:
app/controllers/admin/page_parts_controller.rb
app/controllers/default_widget_controller.rb
app/uploaders/gprs_uploader.rb
app/uploaders/location_uploader.rb
app/views/admin/page_parts/_module_widget.html.erb
app/views/admin/page_parts/reload_widget_styles.js.erb
app/views/admin/page_parts/reload_widgets.js.erb
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
lib/parsers/parser_front_end.rb
vendor/built_in_modules/announcement/init.rb
vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js
vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css
vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb
vendor/built_in_modules/location/README.rdoc
vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js
vendor/built_in_modules/location/app/assets/javascripts/panel/location/back_end/locations.js
vendor/built_in_modules/location/app/assets/stylesheets/panel/gprs/back_end/locations.css
vendor/built_in_modules/location/app/assets/stylesheets/panel/location/back_end/locations.css
vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb
vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb
vendor/built_in_modules/location/app/models/location.rb
vendor/built_in_modules/location/app/uploaders/locations_uploader.rb
vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/_form.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/edit.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/index.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/new.html.erb
vendor/built_in_modules/location/config/routes.rb
vendor/built_in_modules/location/lib/location.rb
vendor/built_in_modules/location/location.gemspec
vendor/built_in_modules/location/test/functional/panel/gprs/back_end/locations_controller_test.rb
vendor/built_in_modules/location/test/functional/panel/location/back_end/locations_controller_test.rb
|
2013-01-24 16:30:02 +08:00 |
Fu Matthew
|
979df9ac80
|
daily commit
|
2013-01-23 18:51:18 +08:00 |
Fu Matthew
|
0cc616f988
|
page can use default widget
|
2013-01-21 16:56:37 +08:00 |
Fu Matthew
|
46b1d55ff6
|
Complete new interface
|
2013-01-14 18:49:23 +08:00 |
Fu Matthew
|
76296ab29b
|
Merge branch 'sidebar_config' into ntu
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/controllers/orbit_backend_controller.rb
app/controllers/orbit_widget_controller.rb
app/models/module_app.rb
app/views/admin/page_parts/_module_widget.html.erb
config/locales/zh_tw.yml
lib/parsers/parser_common.rb
lib/parsers/parser_front_end.rb
|
2013-01-08 14:17:21 +08:00 |
chris
|
c6111460f5
|
Fix album widget options
|
2013-01-07 00:40:43 +08:00 |
Fu Matthew
|
baf1240b76
|
gallery options
|
2012-12-28 15:30:46 +08:00 |
Matthew K. Fu JuYuan
|
5f712622ad
|
default widgets and sidebar.
|
2012-12-24 16:38:35 +08:00 |
Matthew K. Fu JuYuan
|
6995bb1622
|
put module app json into init,making orbit app work with module app.
|
2012-12-24 16:23:16 +08:00 |
chris
|
fb74d74c72
|
Fix:
- page_part not including items_helper
- categories for bulletins front-end
|
2012-11-15 18:01:49 +08:00 |
chris
|
65ac6980c4
|
Merge branch 'various_bugs' into nccu_master
Conflicts:
Gemfile.lock
app/assets/javascripts/ajax_form.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/application_controller.rb
app/controllers/sessions_controller.rb
app/helpers/admin/web_link_helper.rb
app/views/admin/attributes/_attribute_field.html.erb
app/views/admin/designs/_form.html.erb
app/views/admin/pages/_form.html.erb
app/views/admin/sites/_side_bar.html.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
config/locales/en.yml
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
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/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
|
2012-10-29 16:10:07 +08:00 |
Christophe Vilayphiou
|
bdd5a1a047
|
Changes for i18n yml
|
2012-09-24 09:02:45 +08:00 |
unknown
|
0cb573946e
|
update item page
|
2012-08-30 15:17:39 +08:00 |
unknown
|
a1560ebcf5
|
update archive
|
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 |
unknown
|
c0cac812c5
|
demo site widget
|
2012-07-26 16:39:29 +08:00 |
Matthew K. Fu JuYuan
|
4daf36908c
|
working cache
|
2012-07-13 15:36:10 +08:00 |