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

1719 Commits

Author SHA1 Message Date
unknown 9333503545 demo_site widget edit 2012-08-10 15:33:28 +08:00
Christophe Vilayphiou bebb8a1c1e Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard 
Conflicts:
	app/views/layouts/_side_bar.html.erb
	vendor/built_in_modules/archive/app/models/archive_file.rb
	vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
 2012-08-10 15:30:33 +08:00
Christophe Vilayphiou 53cd39f180 Delete duplicate side_bar code 2012-08-10 15:26:34 +08:00
unknown d8b0613147 archive checkbox 2012-08-10 15:26:34 +08:00
unknown 26931a7b9c new archive 2012-08-10 15:23:56 +08:00
unknown d5cc470e5d new archive 2012-08-10 15:23:56 +08:00
unknown cdb8d6c755 announcement edit to view file 2012-08-10 15:20:17 +08:00
unknown 81fa2a7428 archive checkbox 2012-08-10 15:19:45 +08:00
unknown 2dd2abc8d2 new archive 2012-08-10 15:17:16 +08:00
unknown e8cea9f0ab new archive 2012-08-10 15:14:43 +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 9e1e33798c fix search for i.e. 2012-08-09 18:35:57 +08:00
devin 50baac2cb7 gallery update 
add "tag panel", not complete
 2012-08-09 18:09:36 +08:00
Christophe Vilayphiou f77043e632 Merge branch 'new_rss' of github.com:Rulingcom/NCCU into new_rss 
Conflicts:
	vendor/built_in_modules/news/app/models/news_bulletin.rb
 2012-08-09 17:05:40 +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 561d510aa8 rss branch end 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
Harry Bomrah 2f4b93db59 Page added for desktop 2012-08-08 21:35:51 +08:00
Harry Bomrah ee03bd5b65 code merge 2012-08-08 19:35:36 +08:00
Matt 1aea8d91f4 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-08 18:16:38 +08:00
Christophe Vilayphiou 0645f04240 Ray's change in css 2012-08-08 18:11:18 +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 eb91322e1f rss branch end 2012-08-08 17:40:49 +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
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
Christophe Vilayphiou b4c2dfe0ef Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share 2012-08-08 11:53:47 +08:00
OrbitServer 3fdff9357c Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share 2012-08-08 11:52:11 +08:00
OrbitServer fbb53cca36 Ray's changes for sitemap backend 2012-08-08 11:51:20 +08:00
Christophe Vilayphiou 00e15d4814 Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share 2012-08-08 11:04:38 +08:00
Christophe Vilayphiou 05e61b63bb Fix fb share, redirect with js when the page is not requested by fb but by user 2012-08-08 11:04:19 +08:00
Christophe Vilayphiou a03d1ad10b Change for getting url from key 2012-08-08 11:04:19 +08:00
Christophe Vilayphiou 6cfdf0f25a Change the way the orig_url is passed to fb 2012-08-08 11:04:19 +08:00
Christophe Vilayphiou 4bed925e0f Try fb from override and generated page 2012-08-08 11:04:19 +08:00
Christophe Vilayphiou acf4446523 Add meta to head for fb share 2012-08-08 11:04:19 +08:00
Matthew K. Fu JuYuan 85a556a4a2 first version of fb_share 2012-08-08 11:04:19 +08:00
Christophe Vilayphiou 2ed0f709c8 Merge branch 'master' of github.com:Rulingcom/NCCU 
Conflicts:
	vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
 2012-08-08 11:03:44 +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 ef96ec841a Merge branch 'nccu_fix' of github.com:Rulingcom/NCCU into nccu_fix 
Conflicts:
	app/assets/javascripts/ajax_form.js
 2012-08-08 10:53:52 +08:00
Christophe Vilayphiou c6c8187bda Changes for design: menu, frontend news and announcement 2012-08-08 10:53:04 +08:00
Christophe Vilayphiou 9982fd880f Update the path when name is changed in item.rb 2012-08-08 10:53:04 +08:00