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

178 Commits

Author SHA1 Message Date
Christophe Vilayphiou d88d4e58dc Merge branch 'design_team' into ldap 
Conflicts:
	config/environments/development.rb
 2012-05-09 13:51:00 +08:00
Christophe Vilayphiou 9ead6cafda Ray's changes 2012-05-09 04:15:02 +08:00
Christophe Vilayphiou d2e07f537a Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-08 17:24:40 +08:00
Christophe Vilayphiou a3868cb785 Ray's changes for front-end banner 2012-05-08 17:21:26 +08:00
Christophe Vilayphiou caba8ce7a4 Add nccu icon 
Change news list in front-end
Hide links and files in news and announcement front-end show when nothing
 2012-05-08 15:27:43 +08:00
Matthew K. Fu JuYuan b22a275360 Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap 2012-05-08 11:55:21 +08:00
Christophe Vilayphiou 2b9190a49e Merge branch 'design_team' into ldap 
Conflicts:
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
 2012-05-08 11:40:38 +08:00
Christophe Vilayphiou f534e6ca7b Ray's changes for site_info 2012-05-07 15:55:45 +08:00
Christophe Vilayphiou e0a191162d Ray's changes 2012-05-04 19:11:28 +08:00
Christophe Vilayphiou 92a53c1b27 Ray's fix 2012-05-02 16:20:59 +08:00
Christophe Vilayphiou a9ab016d52 Merge branch 'design_team' into ldap 2012-04-30 08:33:21 +08:00
Christophe Vilayphiou bda21baed2 Add missing js 2012-04-30 08:32:54 +08:00
Christophe Vilayphiou 20504b2205 Merge branch 'design_team' into ldap 
Conflicts:
	app/controllers/admin/page_parts_controller.rb
	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/_sort_headers.html.erb
 2012-04-30 07:57:20 +08:00
Christophe Vilayphiou 32faef0c70 DRY code for sorting 2012-04-30 06:30:52 +08:00
Matthew K. Fu JuYuan c4db7e2157 Fix approval setting ajax problem 2012-04-30 00:24:11 +08:00
Matthew K. Fu JuYuan 94d61abf83 A modal view for approval user 2012-04-30 00:24:10 +08:00
Christophe Vilayphiou 851dc72f42 Ray's changes in css and html 2012-04-30 00:17:18 +08:00
Christophe Vilayphiou 2362e1cfdd Merge branch 'design_team' into ldap 2012-04-27 15:28:32 +08:00
Christophe Vilayphiou 799fd1e3ac Fix css bugs (opacity=) and changes in sign_in page 2012-04-27 15:27:59 +08:00
Christophe Vilayphiou 3beb035101 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-04-27 11:11:56 +08:00
Christophe Vilayphiou 5aca3db95f Ray's changes for structure and web_links 2012-04-27 11:02:56 +08:00
Christophe Vilayphiou 7d6b82d9dd Merge branch 'ad_banner' into ldap 2012-04-26 17:15:44 +08:00
Christophe Vilayphiou 3d293f6419 Fix for quick edit file and link in announcement 
Change submit_button into ajax_for_submit
 2012-04-26 16:42:28 +08:00
Christophe Vilayphiou 6f1eb97ace Fix for structure js and css 2012-04-25 18:41:38 +08:00
Christophe Vilayphiou 58d52c60d3 Fix for structure: restore js and change manifests 2012-04-25 18:17:58 +08:00
Christophe Vilayphiou 1f4fe65430 Merge branch 'design_team' into ldap 
Conflicts:
	app/views/devise/sessions/new.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
 2012-04-25 16:45:04 +08:00
Christophe Vilayphiou 876036dd20 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
Conflicts:
	app/views/admin/ad_banners/_ad_banner_tab.html.erb
 2012-04-25 16:39:26 +08:00
Christophe Vilayphiou 65a6f9c416 Ray's css fix for quick edit 2012-04-25 16:26:27 +08:00
Matthew K. Fu JuYuan 7f285f4719 Change ad_banner preview from using title to id 2012-04-25 16:10:11 +08:00
Christophe Vilayphiou d1f687e43e Merge branch 'design_team' into ldap 2012-04-24 16:32:30 +08:00
Christophe Vilayphiou c7d8e0b27b Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
 2012-04-24 16:32:00 +08:00
Christophe Vilayphiou 291d5e3a03 Ray's changes in css 2012-04-24 16:24:50 +08:00
Christophe Vilayphiou 70f6c7b540 Merge branch 'design_team' into ldap 
Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
 2012-04-24 15:28:52 +08:00
Christophe Vilayphiou c0abaa643c Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-04-24 15:21:12 +08:00
Christophe Vilayphiou 45c194e870 Ray's changes in css 2012-04-24 15:15:36 +08:00
Matthew K. Fu JuYuan c57ba305e9 Fix ad_banner 2012-04-24 14:37:06 +08:00
Christophe Vilayphiou 42aeaead93 Ray's changes, put the js for upload image component in a separate file 2012-04-24 12:15:32 +08:00
Christophe Vilayphiou b80339d704 Ray's changes for image upload component and sign-in page 2012-04-24 11:35:50 +08:00
Christophe Vilayphiou 308cfc7cf2 Merge branch 'design_team' into ldap 
Conflicts:
	app/views/devise/sessions/new.html.erb
 2012-04-24 02:46:06 +08:00
Christophe Vilayphiou 6831a3dbbb Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-04-24 02:44:39 +08:00
Christophe Vilayphiou 0c4328987a Ray's changes for css files, sort headers in announcement and pagination 2012-04-24 02:37:51 +08:00
Christophe Vilayphiou d4aea664e2 Merge branch 'design_team' into ldap 
Conflicts:
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
 2012-04-24 02:37:03 +08:00
Christophe Vilayphiou a5b13e680f Add sub_menu in r_tags 2012-04-24 02:30:40 +08:00
Christophe Vilayphiou 5a423178e3 Merge branch 'design_team' into ldap 
Conflicts:
	app/assets/stylesheets/new_admin.css.erb
	app/assets/stylesheets/widget.css
 2012-04-23 15:16:50 +08:00
Christophe Vilayphiou 499930a680 Pull from github 2012-04-23 14:29:55 +08:00
Christophe Vilayphiou 2eeb530422 Merge branch 'master' into ldap 
Conflicts:
	app/assets/stylesheets/new_admin.css.erb
 2012-04-23 14:13:37 +08:00
Matthew K. Fu JuYuan 0c46b4da23 AdImage and AnBanner JS fixed 2012-04-23 14:07:13 +08:00
Matthew K. Fu JuYuan 81b0046f42 Preview now can be use at both ad_banner and ad_image,however it won't run correctly if user change its ad_banner at ad_image. 2012-04-23 14:07:13 +08:00
Matthew K. Fu JuYuan 1b70852ff7 realtime preview is working. but save to object when preview 2012-04-23 14:06:37 +08:00
Matthew K. Fu JuYuan 8cc0611c4a Ray's fix for ad_banner 2012-04-23 14:06:36 +08:00