developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,469 Commits 9 Branches 0 Tags 55 MiB
Commit Graph

141 Commits

Author SHA1 Message Date
saurabhbhatia ea6909a6b0 Mailer now working in production added scope for pending users 2013-11-29 12:03:16 +08:00
Manson Wang 7ad05ef034 Dashboard with Google Chart 2013-11-04 17:48:51 +08:00
Manson Wang a885313e75 Dashboard with HighChart 2013-10-30 18:23:46 +08:00
Harry Bomrah fbea249782 jquery update and also fixed app manager bug .. jquery updated to 1.10.2 and jquery ui updated to 1.10.0 .. gem jquery-rails vs 2.1.4 changed to 3.0.4 and jquery-ui-rails changed to 4.0.5 2013-10-16 09:37:33 +08:00
Spen b9fbba2962 fix new ui ask module frontend 2013-10-15 17:01:07 +08:00
saurabhbhatia 4120be6f8e fixes in sitemap, site preference 2013-10-14 16:48:50 +08:00
saurabhbhatia ae66e7257f Added Rackprofile to development assets 2013-10-14 10:55:01 +08:00
chris 2f866891b1 Limit rubyzip version 2013-10-07 16:25:47 +08:00
saurabhbhatia a5c800d3fe Added video widget to new UI 2013-08-09 10:46:16 +08:00
saurabhbhatia 048f553be8 added timedifference gem to Gemfile required for calendar module 2013-07-23 12:18:36 +08:00
chris 6cf249ccfb Change ckeditor gem and kaminari in gemfile 2013-07-22 17:26:32 +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
Matt K. Fu 869f3b6815 fix object de-authorize failed. 2013-06-26 12:28:00 +08:00
iCross ce180839f0 finish ask module 2013-06-07 13:03:59 +08:00
Matt K. Fu 3d0a1cef56 1.fix for syntax error. 
2.Making production console works.
3.Making blank site member no errors.
 2013-05-22 16:25:12 +08:00
Matt K. Fu 88d55989de change logger 2013-05-14 10:29:11 +08:00
Matt K. Fu 2945e14385 use rack gridfs 2013-04-25 20:37:13 +08:00
devin c8aa50ee87 Lots of Update 
1. CSS to SCSS
2. Journal Paper update

Conflicts:
	Gemfile.lock
	app/assets/javascripts/orbitdesktop.js
	app/assets/stylesheets/desktop/desktop-main.css
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
 2013-04-17 14:14:23 +08:00
Rueshyna 625f2e9ad6 have done conference author filter, journal haven't been done, yet 2013-04-17 11:04:52 +08:00
Harry Bomrah 9f362d9ae6 gridster, url code fixed, views removed. 2013-02-25 11:08:56 +08:00
Rueshyna 2a61470f8b back_end widget breadcrumb finish 2013-02-19 17:24:19 +08:00
Fu Matthew 0a115906f1 fix i18n,reload problems 2013-02-19 14:21:54 +08:00
chris 774599a9f2 Set jquery-rails version to 2.1.4 2013-02-04 18:01:43 +08:00
Rueshyna b2bc62dadd fixed orbit bar that like nccu bar now, and add rails version in Gemfile 2013-02-04 18:01:03 +08:00
chris 634f647afa Set the version of mongo_session_store-rails3 to 3.0.6 2013-01-14 19:20:58 +08:00
unknown 84e4a558be member roles edit 2013-01-14 17:02:51 +08:00
chris 9745bcf7f1 Remove mysql 2013-01-07 03:02:16 +08:00
nccu 68266e17ed Update Gemfile for rails 3.2 2012-12-20 20:18:33 +08:00
Rueshyna a84cb560a0 make factory girl file clean 2012-12-07 04:21:26 +08:00
Rueshyna adb9621877 fixed bug 2012-12-07 04:21:26 +08:00
Rueshyna 43f6b7b271 make fake data 2012-11-22 21:06:31 +08:00
Rueshyna f93d019ba0 check file type 2012-11-21 07:37:42 +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
Matt 962bae9a82 merge 2012-10-01 21:09:09 +08:00
Harry Bomrah 3d9fb548e1 calendar fixed 2012-09-14 15:20:01 +08:00
Christophe Vilayphiou 7f290adfbb Fix Gemfile 2012-09-14 03:58:47 +08:00
Christophe Vilayphiou 194773f064 Fix bugs after merge 2012-09-14 02:27:49 +08:00
Matthew K. Fu JuYuan 5fb94f644d break down Ray's HTML 2012-09-14 00:02:22 +08:00
Harry Bomrah 73d5074037 minor shit updates 2012-09-13 23:57:48 +08:00
Harry Bomrah 29ea95b4c6 event_calendar testing 2012-09-13 23:57:47 +08:00
Matthew K. Fu JuYuan 45ef7fd302 guest user 2012-09-12 16:20:15 +08:00
Matthew K. Fu JuYuan 671f86b612 First version of new preview. Only plain text 2012-09-04 12:31:27 +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
Matthew K. Fu JuYuan 85a556a4a2 first version of fb_share 2012-08-08 11:04:19 +08:00
Matthew K. Fu JuYuan 1cdc0e24bd First version of Solr search. 2012-08-08 10:59:55 +08:00
Christophe Vilayphiou 292105bdf1 Remove remotipart (not working with ie9) the upload is working except that the pop-up does not disappear in ie 2012-08-08 10:53:04 +08:00
Christophe Vilayphiou ecc5c39840 Fix remote upload file for tinymce 2012-08-08 10:51:54 +08:00
Christophe Vilayphiou cd6d95204f Move Impressionist to Gemfile 2012-07-27 19:14:25 +08:00
Matthew K. Fu JuYuan de831f1f96 disable homepage cache for english page 2012-07-27 05:08:24 +08:00
Matthew K. Fu JuYuan f9bdb4a327 New and Announcement search. Disabled impression. 2012-07-20 15:47:40 +08:00