chris
d7fd61ce55
Edit uploaded package
2012-10-26 11:19:57 +08:00
Matthew K. Fu JuYuan
9f825de288
user new interface 70%
2012-10-09 06:40:18 +08:00
Matthew K. Fu JuYuan
3a65f599e6
first version app config for Spen durning Chris's leave.
2012-09-24 11:43:48 +08:00
Matthew K. Fu JuYuan
2321116597
Merge commit '43ecebf93482cf94c73b78564509d1a352c2bcd2' into app_config
2012-09-18 16:30:34 +08:00
Matthew K. Fu JuYuan
19db9d0037
basic function
2012-09-17 13:32:52 +08:00
Matthew K. Fu JuYuan
df6c7afd68
add data_migration for rename field for attribute_field. not yet tested
2012-09-14 00:02:22 +08:00
Matthew K. Fu JuYuan
5fb94f644d
break down Ray's HTML
2012-09-14 00:02:22 +08:00
Matthew K. Fu JuYuan
f009a1c942
startup for config
2012-09-13 18:31:44 +08:00
Matthew K. Fu JuYuan
45ef7fd302
guest user
2012-09-12 16:20:15 +08:00
Harry Bomrah
3749e919cb
front ends updates
2012-09-12 02:12:15 +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
Christophe Vilayphiou
84ad9dd724
Fix ab_banner display
2012-08-15 16:34:00 +08:00
Christophe Vilayphiou
4e3dc7c438
Fix ab_banner display
2012-08-15 16:08:47 +08:00
Christophe Vilayphiou
39604d30ce
Fix ab_banner display
2012-08-15 14:58:43 +08:00
Christophe Vilayphiou
905844f7bb
Typo
2012-08-15 10:24:47 +08:00
Christophe Vilayphiou
18e18a4add
Fix for banner on ie
2012-08-13 15:10:53 +08:00
Christophe Vilayphiou
2ea3193879
Fix for banner link
2012-08-13 11:03:11 +08:00
Christophe Vilayphiou
33fc96ac7c
Changes for NCCU after email
2012-08-11 18:19:30 +08:00
Matthew K. Fu JuYuan
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
Matthew K. Fu JuYuan
06919e76ed
fix approval at news and announcement for abnormal flags that causing search result fault.
2012-08-08 11:01:50 +08:00
Matthew K. Fu JuYuan
1cdc0e24bd
First version of Solr search.
2012-08-08 10:59:55 +08:00
Christophe Vilayphiou
c4e12ff347
Add missing class to ad_banner for link
2012-08-03 13:55:22 +08:00
Matthew K. Fu JuYuan
acebec8904
don't dislay web links if no eng. lists in widget is now sorted.
2012-08-01 15:24:55 +08:00
Christophe Vilayphiou
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
Christophe Vilayphiou
c951cc6b6f
Fix for data_migration
2012-08-01 00:58:59 +08:00
Matthew K. Fu JuYuan
b989f458d3
Do not show news/anc if no context.
2012-07-31 18:22:40 +08:00
Matthew K. Fu JuYuan
7e3b59c09a
finished tag clouds
2012-07-31 11:57:32 +08:00
Matthew K. Fu JuYuan
af4865ceb7
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 11:01:11 +08:00
Matthew K. Fu JuYuan
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
Christophe Vilayphiou
39b63a970c
Fix .class to .class.to_s
2012-07-30 18:34:54 +08:00
Christophe Vilayphiou
7440727acd
Fix: "._type" to ".class"
2012-07-30 17:21:37 +08:00
Matthew K. Fu JuYuan
f76b1c02b5
first version of mid_site_sync for new i18n var
2012-07-27 19:13:40 +08:00
Christophe Vilayphiou
a8cc581279
Sitemap done for backend and fronted
2012-07-27 19:13:40 +08:00
Christophe Vilayphiou
ad3ec43a00
Remove comments in migrate task
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
804695749d
Fix bugs after removal of i18n_variable
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
780386d7f1
Remove i18n_variable for parser
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
49dd3a1770
Remove i18n_variable for controllers, helpers and models
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
327996a7b0
Task part for i18n_variable removal for web_resource
2012-07-27 19:12:59 +08:00
Christophe Vilayphiou
207b0c5886
Remove i18n_variable for web_resource
2012-07-27 19:12:59 +08:00
Christophe Vilayphiou
50813eb57d
Remove i18n_variable for page_content
2012-07-27 19:12:59 +08:00
Christophe Vilayphiou
61c1af7316
Remove i18n_variable for news
2012-07-27 19:12:58 +08:00
Christophe Vilayphiou
e2ebd48b22
Remove i18n_variable for announcement
2012-07-27 19:12:58 +08:00
Matthew K. Fu JuYuan
7c3cc30784
fix for rake encoding
2012-07-26 16:58:17 +08:00
unknown
c0cac812c5
demo site widget
2012-07-26 16:39:29 +08:00
Matthew K. Fu JuYuan
30cc3431b9
rename sub roles
2012-07-26 14:12:52 +08:00
Matthew K. Fu JuYuan
397b444390
fix for bugs
2012-07-24 20:58:34 +08:00
Matthew K. Fu JuYuan
834fcddc52
Add data migration for search widget for news and announcement.
2012-07-20 16:30:43 +08:00
Matthew K. Fu JuYuan
f9bdb4a327
New and Announcement search. Disabled impression.
2012-07-20 15:47:40 +08:00
unknown
10731dc211
demo widget
2012-07-18 18:07:45 +08:00
Matthew K. Fu JuYuan
4daf36908c
working cache
2012-07-13 15:36:10 +08:00