saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,873 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

370 Commits

Author SHA1 Message Date
Rueshyna c314745545 add link of title 2012-11-05 11:42:50 +08:00
Rueshyna e4de1e34a2 add announcement plugin 2012-11-05 11:42:50 +08:00
Rueshyna 9433d59c04 relpace tab with sapce 2012-11-05 11:42:49 +08:00
OrbitServer 9e2bc7e1c1 Ray's changes in css and js 2012-10-09 07:48:05 +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
unknown 9eed9ec7b6 demo site plugin 2012-09-17 13:32:52 +08:00
Christophe Vilayphiou 90ae361dc3 Class change for filter button 2012-09-13 17:37:17 +08:00
Christophe Vilayphiou 2e9af5d1a8 fix commit bugs 2012-09-13 15:53:36 +08:00
Christophe Vilayphiou 46177000e0 Merge branch 'visitor_dsahbroad' of github.com:Rulingcom/orbit into visitor_dsahbroad 
Conflicts:
	Gemfile.lock
	app/controllers/application_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
 2012-09-12 16:32:40 +08:00
Matthew K. Fu JuYuan 98e8f5f607 complete visitor dashbroad 2012-09-12 16:20:15 +08:00
Matthew K. Fu JuYuan 45ef7fd302 guest user 2012-09-12 16:20:15 +08:00
Matthew K. Fu JuYuan e486ac5d25 complete visitor dashbroad 2012-09-11 11:30:58 +08:00
unknown 10d9253399 announcement edit to view file 2012-08-30 14:25:51 +08:00
Matthew K. Fu JuYuan 01d278d688 guest user 2012-08-23 16:05:14 +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
chris edf9d8a159 Fix can_display 2012-08-16 18:55:34 +08:00
chris 3c283d1a7a Set default picture 
Fix tags where not in params for index fronted (news and announcement)
Change backend index for news
Home banner link for images and main title
 2012-08-16 17:24:12 +08:00
Christophe Vilayphiou c5b95e2e0f Fix rss feed i18n 2012-08-15 16:17:28 +08:00
Christophe Vilayphiou 43bc704468 Error popup only shows on flash[:error] 2012-08-15 15:55:29 +08:00
Matthew K. Fu JuYuan d9f6bb3b4e can display scope 2012-08-15 11:34:19 +08:00
Christophe Vilayphiou bcc13a47e6 Fix deadline was set to nil when update 2012-08-14 16:23:34 +08:00
Christophe Vilayphiou efaed060d9 Change for date 2012-08-14 15:11:52 +08:00
Christophe Vilayphiou fb53ad524a Add time to announcement quick edit 
Fix picture for news quick edit
Fix tags not saving when empty
Hide role in quick edit
 2012-08-14 14:38:21 +08:00
Matthew K. Fu JuYuan 77224bcc8f check deadline for news 2012-08-14 13:49:24 +08:00
Matthew K. Fu JuYuan e57b429398 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-14 13:13:25 +08:00
Matthew K. Fu JuYuan 5bb4aa95ee fix for dept 2012-08-14 13:13:06 +08:00
Christophe Vilayphiou 9196deb997 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-14 01:00:25 +08:00
Christophe Vilayphiou c32b0dd4b4 Move delete checkboxes to js 2012-08-14 00:59:01 +08:00
Matthew K. Fu JuYuan 83569fac82 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-13 18:36:04 +08:00
Matthew K. Fu JuYuan 6cc470ede9 nccu fix 2012-08-13 18:35:47 +08:00
Christophe Vilayphiou c2f3f45196 Fix for link in nccu widget 2012-08-13 11:34:14 +08:00
Matthew K. Fu JuYuan 080974b563 Merge branch 'new_rss' 
Conflicts:
	vendor/built_in_modules/announcement/app/models/bulletin.rb
 2012-08-12 23:32:28 +08:00
Matthew K. Fu JuYuan f1b4d9e204 Add authorization for rescue interface 
Change logic for NCCU site for status panel.
 2012-08-12 23:29:13 +08:00
Christophe Vilayphiou 33fc96ac7c Changes for NCCU after email 2012-08-11 18:19:30 +08:00
unknown 9333503545 demo_site widget edit 2012-08-10 15:33:28 +08:00
Christophe Vilayphiou 2bd132cef9 Pass category and tag to search to redirect to the right page 
Ray's change for mouseover (take out the black background)
 2012-08-09 19:16:26 +08:00
Matthew K. Fu JuYuan 6059edad70 Merge branch 'new_rss' of github.com:Rulingcom/NCCU into new_rss 2012-08-09 18:36:31 +08:00
Matthew K. Fu JuYuan 1e7bc9aadd 1.Rss feed but no entry for clicking now. wait for design. 
2.Unit link is now fixed.
 2012-08-09 17:04:37 +08:00
Christophe Vilayphiou e256440678 RSS first page 2012-08-09 17:04:08 +08:00
Matthew K. Fu JuYuan 2d2172752f remove announcement category column in announcement 2012-08-09 16:14:05 +08:00
unknown d5c55c9697 widget & frontend field 2012-08-09 15:25:30 +08:00
Matthew K. Fu JuYuan 987e6fff2b 1.Rss feed but no entry for clicking now. wait for design. 
2.Unit link is now fixed.
 2012-08-09 02:20:10 +08:00
Matthew K. Fu JuYuan 5fcc910723 Merge branch 'master' of github.com:Rulingcom/NCCU into new_rss 2012-08-09 00:32:09 +08:00
Matt 1aea8d91f4 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-08 18:16:38 +08:00
Christophe Vilayphiou 0d55a2f76b Hide quick edit 2012-08-08 18:11:03 +08:00
Matt 62ba8c9f18 Fix bugs on 172:180 2012-08-08 17:56:00 +08:00
Christophe Vilayphiou 41930eb693 RSS first page 2012-08-08 17:41:48 +08:00
Matthew K. Fu JuYuan 2158e0a879 Merge branch 'nccu_fix_matt' 2012-08-08 16:15:49 +08:00
Matthew K. Fu JuYuan 1b35415699 conditional showing quick edit. 2012-08-08 15:56:46 +08:00
Christophe Vilayphiou 959def6c1f Merge branch 'nccu_fix_matt' of github.com:Rulingcom/NCCU into nccu_fix_matt 
Conflicts:
	app/models/item.rb
	config/locales/en.yml
	vendor/built_in_modules/announcement/app/models/bulletin.rb
	vendor/built_in_modules/news/app/models/news_bulletin.rb
 2012-08-08 14:48:29 +08:00