developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,026 Commits 86 Branches 21 Tags 58 MiB
Commit Graph

207 Commits

Author SHA1 Message Date
Matt 6a022c90da Changes on nccu 2012-05-18 15:20:45 +08:00
Christophe Vilayphiou 17b6a70506 Merge branch 'design_team' into ldap 2012-05-17 23:36:24 +08:00
Matthew K. Fu JuYuan 16ada34585 fix ad_banner. new ad_image with best size from ad_banner. content editable at tab 2012-05-17 23:35:46 +08:00
Harry Bomrah 1b1c2c0032 image title and description callback fixed… 2012-05-17 20:19:31 +08:00
Christophe Vilayphiou 5e93fe51a9 Merge branch 'design_team' into ldap 2012-05-17 16:41:11 +08:00
Christophe Vilayphiou 29c54e6480 Add mandatory fields to assets 2012-05-17 16:40:09 +08:00
Christophe Vilayphiou eba4671733 Merge branch 'design_team' into ldap 2012-05-17 06:46:29 +08:00
Matthew K. Fu JuYuan a3acd865d7 AdBanner reopen new banner and delete. Rename title with content editable tag. 2012-05-17 06:44:14 +08:00
Christophe Vilayphiou 6b9c8eb15d Merge branch 'design_team' into ldap 2012-05-17 06:31:57 +08:00
Christophe Vilayphiou 26292f0dcc Asset upload 2012-05-17 06:28:29 +08:00
Harry Bomrah 617a683d00 image insertion completed.. 2012-05-16 16:22:50 +08:00
Harry Bomrah c380c4cad0 popup fixed 2012-05-16 15:34:23 +08:00
Harry Bomrah 30137b50b4 popup fix.. 2012-05-16 15:33:54 +08:00
Christophe Vilayphiou 0b0916179f Change assets 2012-05-16 11:07:11 +08:00
Christophe Vilayphiou f950f77f36 Merge branch 'design_team' into ldap 
Conflicts:
	Gemfile
	app/models/ad_banner.rb
 2012-05-15 23:02:22 +08:00
Christophe Vilayphiou 53a0fbddf0 Fix commit error 2012-05-15 21:25:51 +08:00
Christophe Vilayphiou ebc8dd33ec Merge branch 'design_team' into ldap 
Conflicts:
	Gemfile.lock
	app/controllers/admin/module_apps_controller.rb
	app/controllers/application_controller.rb
	vendor/built_in_modules/web_resource/web_resource.json
 2012-05-14 00:57:17 +08:00
Christophe Vilayphiou 281cfa6518 Changes for widgets 2012-05-13 21:55:39 +08:00
Christophe Vilayphiou 4685952bd6 Changes in page_edit 2012-05-13 20:13:26 +08:00
Christophe Vilayphiou 803253ebcf Put nestedSortable in page_edit.js.erb 2012-05-12 22:12:17 +08:00
Christophe Vilayphiou 076f5ad6ef Ray's changes for drag and drop in structure's side_bar 2012-05-11 17:54:33 +08:00
Christophe Vilayphiou fd52d00187 Add drag and drop to structure side_bar 2012-05-11 10:00:45 +08:00
Christophe Vilayphiou 63f904d3b0 Fix tinymce js load 
Change to full_name for page_context index
 2012-05-10 20:36:19 +08:00
Christophe Vilayphiou 5eba2638ce Merge branch 'design_team' into ldap 2012-05-10 14:17:38 +08:00
Matthew K. Fu JuYuan b6aad17681 Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page. 2012-05-10 14:16:37 +08:00
Christophe Vilayphiou 87449ec6a8 Merge branch 'design_team' into ldap 2012-05-10 10:34:28 +08:00
Christophe Vilayphiou a43877323e Add tinymce to page_part edit for text 2012-05-10 10:34:13 +08:00
Christophe Vilayphiou 1785da51a2 Merge branch 'design_team' into ldap 2012-05-09 15:04:06 +08:00
Christophe Vilayphiou 50edfdd02f Changes for tag key in side_bar announcement and news, fix ad_banner css for dot 2012-05-09 14:59:06 +08:00
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