b7d797f9dd
fix member sidebar
...
add i18n for modules and default_widgets
2013-02-19 14:21:54 +08:00
fcb49723b4
fix sidebar icon for page.
...
fix i18n on sidebar
make sidebar sortable by changing db value. Need interface
2013-02-19 14:21:53 +08:00
9771d42587
migrate for app config. fix panel style intro misplace
2013-02-04 18:10:39 +08:00
bbd30759f5
fix web resource frontend page
2013-02-04 18:01:42 +08:00
d4df7c82d3
relpace seminar to conference
2013-02-04 18:01:38 +08:00
71d5abae2e
first version of app config and modified inits.
2013-01-29 20:33:40 +08:00
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
fc702a6210
add front-end page for web_resource
2013-01-24 13:54:14 +08:00
979df9ac80
daily commit
2013-01-23 18:51:18 +08:00
0cc616f988
page can use default widget
2013-01-21 16:56:37 +08:00
46b1d55ff6
Complete new interface
2013-01-14 18:49:23 +08:00
5ab4bbd367
add ad_banner inner page,pic title.
2013-01-09 16:54:33 +08:00
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
b71ebb3982
clean default widget
2013-01-07 17:20:37 +08:00
5793f0fe5d
default widget link.
...
make sure to run
rake migrate:make_default_widget_work_config
for changing announcement module app
2013-01-07 17:20:37 +08:00
c6111460f5
Fix album widget options
2013-01-07 00:40:43 +08:00
39f715319b
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
...
Conflicts:
lib/tasks/migrate.rake
2013-01-03 19:41:52 +08:00
a70110f787
make default widget works without init
2013-01-03 19:38:14 +08:00
fa83dbf791
Fix order in structure
2013-01-03 19:15:08 +08:00
6da528ef98
show error message when trying to show a not existed page
2013-01-03 13:50:27 +08:00
5d6279a9ea
fix calendar broken
2013-01-03 10:58:52 +08:00
641b5310b0
fix NTU album module_app data
2013-01-02 16:04:11 +08:00
32c6f17613
fix object auth. show error message if user try to do object auth in a wrong way.
2013-01-02 14:34:34 +08:00
2d8400d1cc
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
2012-12-28 15:34:24 +08:00
61b0f94c04
Remove I18n.locale for announcement front-end
...
Fix counter in back-end edit
2012-12-28 15:34:04 +08:00
5587e83419
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
2012-12-28 15:31:32 +08:00
baf1240b76
gallery options
2012-12-28 15:30:46 +08:00
974a190eaf
Fix orbit_front parser
2012-12-28 11:51:56 +08:00
0a0298aaad
Fix counter front-end
2012-12-28 11:44:33 +08:00
37309a452d
Fix site map and menu order
2012-12-28 11:37:37 +08:00
ec96a2e0e7
Add page counter
2012-12-28 10:36:18 +08:00
751d3b1220
Announcement widget: remove I18n.locale
...
Add part_id in url
2012-12-27 16:52:58 +08:00
269e5b033f
Fix for page_part and widget back-end
2012-12-27 16:20:40 +08:00
2d6b70b97f
regenerate pageparts
2012-12-27 15:50:05 +08:00
81b0e3c38f
change ActiveSupport::SecureRandom to SecureRandom in orbit core
2012-12-27 12:19:42 +08:00
71fc85c24e
fix widget.
2012-12-26 19:01:17 +08:00
47a63e3dab
fix widget.
2012-12-25 10:45:08 +08:00
062ebecae3
fix serval bugs on sidebar.
2012-12-24 16:39:53 +08:00
53afb6ea0c
sidebar rewrited
2012-12-24 16:39:53 +08:00
5f712622ad
default widgets and sidebar.
2012-12-24 16:38:35 +08:00
6995bb1622
put module app json into init,making orbit app work with module app.
2012-12-24 16:23:16 +08:00
36f6a6fdd6
first version of confined sidebar render
2012-12-24 16:17:00 +08:00
b89cd80800
fix widget bug
2012-12-24 14:04:32 +08:00
3c79200c2f
Fix wrong deletion in parser for gallery
2012-12-20 16:02:03 +08:00
fcbba6660b
Only one parser for front end
...
Separate site map for i18n
2012-12-19 17:15:31 +08:00
fbe2b26e9f
Do not create layout part if it already exists
2012-12-03 18:59:32 +08:00
77386f0284
disable data transform when switching attribute field type. new member stable
2012-11-22 21:10:35 +08:00
475642d375
Remove news and fix default_url in ImageUploader
2012-11-22 09:30:25 +08:00
2d0e8b37b2
Fix:
...
- Widgets for announcement
- Facebook link
- AdBanner nav
2012-11-21 18:42:14 +08:00
703324063e
change journal list json link
2012-11-21 07:37:44 +08:00
96fe482d50
for openness
2012-11-20 20:20:59 +08:00
3beed406a7
Fix Nokogiri when '.first' returns nothing
2012-11-20 12:00:18 +08:00
192e52b5de
Remove middle site
2012-11-20 10:06:07 +08:00
a85e5fcc0d
address field. js and style is broken
2012-11-20 09:53:36 +08:00
eaf465525a
rake update
2012-11-06 12:35:15 +08:00
b40d4702d5
Merge branch 'master' into various_bugs
...
Conflicts:
config/locales/en.yml
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
2012-11-06 11:44:00 +08:00
da5e7f670e
Desktop Widgtes updates..
2012-11-06 10:36:34 +08:00
ca3e06c58b
update for desktop widgets
2012-11-05 11:40:11 +08:00
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
bd0d975014
for user new interface, member role is working.
2012-10-26 11:27:37 +08:00
d7fd61ce55
Edit uploaded package
2012-10-26 11:19:57 +08:00
38e6d6c2c8
add rake task
2012-10-16 15:43:31 +08:00
6dfe10040b
fix object auth without app_auth
2012-10-16 14:23:44 +08:00
d027cf8e6a
add new data from NCCU
2012-10-09 14:40:28 +08:00
9f825de288
user new interface 70%
2012-10-09 06:40:18 +08:00
89b1aace8a
fix for rescue job failed on 171
2012-10-08 16:42:49 +08:00
4a5fc47c0a
NCCU maintenance rake task
2012-10-08 10:35:11 +08:00
54b874b2c9
fix nccu login
2012-09-25 15:07:07 +08:00
87e2510d02
add rake task for rebuild index
2012-09-24 18:46:38 +08:00
3a65f599e6
first version app config for Spen durning Chris's leave.
2012-09-24 11:43:48 +08:00
2321116597
Merge commit '43ecebf93482cf94c73b78564509d1a352c2bcd2' into app_config
2012-09-18 16:30:34 +08:00
19db9d0037
basic function
2012-09-17 13:32:52 +08:00
df6c7afd68
add data_migration for rename field for attribute_field. not yet tested
2012-09-14 00:02:22 +08:00
5fb94f644d
break down Ray's HTML
2012-09-14 00:02:22 +08:00
f009a1c942
startup for config
2012-09-13 18:31:44 +08:00
45ef7fd302
guest user
2012-09-12 16:20:15 +08:00
3749e919cb
front ends updates
2012-09-12 02:12:15 +08:00
0a3a140b18
Fix migration bug
2012-09-11 16:32:20 +08:00
73e48aebc6
Change news subtitle to textarea, no tinymce
2012-09-11 15:40:27 +08:00
6044857fea
complete preview for both new and announcement
2012-09-07 17:55:59 +08:00
671f86b612
First version of new preview. Only plain text
2012-09-04 12:31:27 +08:00
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
84ad9dd724
Fix ab_banner display
2012-08-15 16:34:00 +08:00
4e3dc7c438
Fix ab_banner display
2012-08-15 16:08:47 +08:00
39604d30ce
Fix ab_banner display
2012-08-15 14:58:43 +08:00
905844f7bb
Typo
2012-08-15 10:24:47 +08:00
18e18a4add
Fix for banner on ie
2012-08-13 15:10:53 +08:00
2ea3193879
Fix for banner link
2012-08-13 11:03:11 +08:00
33fc96ac7c
Changes for NCCU after email
2012-08-11 18:19:30 +08:00
e8317e0a4b
1.Remove category column when category is specified
...
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
2012-08-08 14:46:08 +08:00
06919e76ed
fix approval at news and announcement for abnormal flags that causing search result fault.
2012-08-08 11:01:50 +08:00
1cdc0e24bd
First version of Solr search.
2012-08-08 10:59:55 +08:00
c4e12ff347
Add missing class to ad_banner for link
2012-08-03 13:55:22 +08:00
acebec8904
don't dislay web links if no eng. lists in widget is now sorted.
2012-08-01 15:24:55 +08:00
f092aff9e9
Fix for data_migration but there's still a bug with red is, the red is code has to be commented out to run the rake task
2012-08-01 02:43:06 +08:00
c951cc6b6f
Fix for data_migration
2012-08-01 00:58:59 +08:00
b989f458d3
Do not show news/anc if no context.
2012-07-31 18:22:40 +08:00
7e3b59c09a
finished tag clouds
2012-07-31 11:57:32 +08:00
af4865ceb7
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 11:01:11 +08:00
4dea025c8a
fix for
...
1.Announcement 15 per page
2.Search keywords.
3.Redis search index with new code.
2012-07-31 10:59:48 +08:00
Fu Matthew
chris
Rueshyna
Matthew K. Fu JuYuan
Harry Bomrah