c3ece3b7af
both manual and automatic methods working
...
Conflicts:
config/routes.rb
2014-01-23 11:59:58 +08:00
5fee058006
Import Data, Sync Data
...
Conflicts:
config/mongoid.yml
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
2014-01-23 11:59:58 +08:00
Harry Bomrah
4888195566
more button works according to categories
2013-11-15 22:35:20 +08:00
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
Harry Bomrah
e129b25554
more button fix and also new way to select more page.
2013-11-15 15:13:58 +08:00
Harry Bomrah
f91c08ce4b
color added to location categories.
2013-11-12 16:45:42 +08:00
528f7d28b9
theaterurk fix
2013-11-12 12:20:36 +08:00
5e0696890a
Updated Remember me, and Homepage widget more link
2013-11-11 17:23:03 +08:00
72a37afddb
announcment fixed for frontend
2013-11-08 17:37:55 +08:00
d636248073
Updated Sidebar, Application Controllers
2013-11-01 16:42:39 +08:00
a885313e75
Dashboard with HighChart
2013-10-30 18:23:46 +08:00
13da6fc6a1
Added a new rake task with arguments
2013-10-25 21:59:03 +08:00
a067bcd304
Add Brief intro. for all personal plugins
...
Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " )
Apply New UI to Member Plugin Edit Page
Personal Plugin Summary fix
Academic Info. list fix
2013-09-18 18:55:40 +08:00
2fea428b67
Changed mongoid production back to test_site
2013-07-30 17:17:17 +08:00
Harry Bomrah
6d89eab98a
desktop final fix
2013-07-30 16:43:28 +08:00
Harry Bomrah
c18a8a8c6f
mongoid yml fix
2013-07-30 16:43:22 +08:00
Harry Bomrah
bd5f3d1a44
some changes
...
Conflicts:
config/mongoid.yml
2013-07-30 16:43:14 +08:00
0c208d0020
Remove some css causing errors in precompile
...
Remove the image in announcement index
Set the db to test_site
2013-07-25 13:15:49 +08:00
c8292a7619
Updated zh_tw translation for sidebar labels
...
Conflicts:
vendor/built_in_modules/location/config/locales/zh_tw.yml
2013-07-22 12:17:31 +08:00
869f3b6815
fix object de-authorize failed.
2013-06-26 12:28:00 +08:00
Harry Bomrah
300de76c3a
Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed.
2013-06-26 12:25:58 +08:00
253cca06cc
New widget for tag cloud
2013-06-06 17:17:45 +08:00
fcfdd562a6
reverse harrys db setting
2013-04-17 14:29:56 +08:00
Harry Bomrah
e2802d94d0
rake task added
2013-04-17 14:28:13 +08:00
0781779ac0
solved conflicts
2013-04-17 14:14:24 +08:00
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
96455f31e1
deliver app config. fix wrong value cause error for default widget
2013-02-18 19:04:04 +08:00
5e04ec70a3
make a 'real' fake data
2012-11-26 11:52:11 +08:00
5b39d10ac6
user roles starts
2012-11-22 21:10:35 +08:00
868d1c2201
fix for json and some other bugs
2012-11-22 21:06:30 +08:00
1279af0c11
fix and hide for visitors,except for album
2012-11-21 18:31:57 +08:00
c1da80761e
Remove wrong mongo port
2012-11-20 12:04:34 +08:00
be448d42c9
add_more ok
2012-11-20 09:52:50 +08:00
cc5e238576
Fix after merge from NCCU, the translations still need to be cleaned
2012-10-30 11:08:26 +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
962bae9a82
merge
2012-10-01 21:09:09 +08:00
b6c06c6d4f
tiny mce fix
2012-09-19 17:59:17 +08:00
7c57c947c7
Fix typo in mongoid.yml
2012-09-12 03:52:04 +08:00
816b542ca6
Change side bar to use key instead of title for ModuleApps
2012-09-12 03:07:25 +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
68aed18956
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
...
Conflicts:
app/views/layouts/_side_bar.html.erb
config/mongoid.yml
vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb
vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
2012-08-20 23:24:41 +08:00
5fd367a8d9
fixed db error
2012-08-20 23:14:10 +08:00
22c43e7f7d
database fixing
2012-08-20 23:14:10 +08:00
207d360d1e
fixed db error
2012-08-20 23:11:32 +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
ded9326d1f
db fixed
2012-07-16 20:27:34 +08:00
9f0c0bee71
fixed db error
2012-07-16 20:26:32 +08:00
b51e656909
database fixing
2012-07-16 13:25:35 +01:00
833c08eafc
fixed db error
2012-07-16 17:29:46 +08:00
98b274d9dd
add slave_ok: true to nccu172
2012-07-09 17:03:26 +08:00
saurabhbhatia
Harry Bomrah
rulingcom
Manson Wang
Spen
chris
Matt K. Fu
Fu Matthew
Rueshyna
Matthew K. Fu JuYuan
Harry Bomrah
Joshua