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

191 Commits

Author SHA1 Message Date
Christophe Vilayphiou fd52d00187 Add drag and drop to structure side_bar 2012-05-11 10:00:45 +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 de739d7d20 Merge branch 'design_team' into ldap 
Conflicts:
	vendor/built_in_modules/web_resource/web_resource.json
 2012-05-10 00:34:23 +08:00
Christophe Vilayphiou ecd21338bc Matt's changes for side_bar 2012-05-10 00:23:42 +08:00
Christophe Vilayphiou dc9af65524 Merge branch 'design_team' into ldap 2012-05-09 15:25:16 +08:00
Christophe Vilayphiou 038378be9a Ray's changes for inccu in orbit_bar 2012-05-09 15:20:09 +08:00
Christophe Vilayphiou 9d01f624da Merge branches 'nccu_0509' and 'design_team' into ldap 2012-05-09 14:21:24 +08:00
Matthew K. Fu JuYuan 6c9944918a Fix i18 variable 2012-05-09 14:18:52 +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 18c42a80a6 Put site_settings in the orbit_button 2012-05-08 20:06:56 +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
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 ba4385e3fd Add module authorization for news 
Add files and links to announcement and news
Change page.children into page.ordered_and_visible_children in parser_commom
 2012-05-08 10:50:09 +08:00
Christophe Vilayphiou 1fb6c20b86 Add site_info 2012-05-07 00:54:18 +08:00
Christophe Vilayphiou 555aa088d9 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-04 19:23:45 +08:00
Christophe Vilayphiou e0a191162d Ray's changes 2012-05-04 19:11:28 +08:00
Matthew K. Fu JuYuan bff3cefbc7 Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager. 2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan f427c3803f clean up useless flash msgs. add i18n vars for app auth and object auth 2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan 05ded8de03 Fix for NCCU 0430 all functions ok with two submanagers but different behavors 2012-05-04 15:38:18 +08:00
Christophe Vilayphiou 92a53c1b27 Ray's fix 2012-05-02 16:20:59 +08:00
Christophe Vilayphiou 767e4a3fe9 Merge branch 'design_team' into ldap 2012-04-30 08:16:17 +08:00
Christophe Vilayphiou 496b8de58a Side bar translation 2012-04-30 08:15:45 +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 b8f52fa1ec Separate announcement and news 2012-04-30 06:31:46 +08:00
Matthew K. Fu JuYuan a46a8898d7 Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen 2012-04-30 00:24:11 +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 feb2156fd3 Fix error in side_bar for web_links 2012-04-27 14:15:36 +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
Matthew K. Fu JuYuan faace9893a dehumanize ad banner 2012-04-26 17:11:05 +08:00
Christophe Vilayphiou 58d52c60d3 Fix for structure: restore js and change manifests 2012-04-25 18:17:58 +08:00
Christophe Vilayphiou 8f242e2d39 Merge branch 'design_team' into ldap 2012-04-24 17:00:51 +08:00
Christophe Vilayphiou 3308744396 Fix side_bar after Matt's changes in translation 2012-04-24 17:00:33 +08:00
Christophe Vilayphiou 0c4f1d91f7 Merge branch 'ad_banner' into ldap 2012-04-24 16:46:04 +08:00
Matthew K. Fu JuYuan db46803cda R4-Billingual 2012-04-24 16:43:45 +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
Matthew K. Fu JuYuan 33640de184 Changes for Billingual 2012-04-24 14:37:06 +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 834cbe3a11 Fix side_bar for tags 
Modules needs to use the fullpath for active or visible in tags
 2012-04-23 16:12:07 +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 e353afb5ac fix i18n vars in ad_banner 2012-04-23 14:07:13 +08:00
Christophe Vilayphiou 2f279c53ff Apply patch from ldap 2012-04-23 14:04:55 +08:00
Matt b6f64cd8a5 Announcement i18n vars 2012-04-23 11:29:00 +08:00
Matthew K. Fu JuYuan ba0677a001 Merge commit '72efdbd742d4f3ac8a910bd5c817cf5c74570ba5' into ldap 2012-04-19 14:09:37 +08:00
Matthew K. Fu JuYuan f55b3a4374 Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap 
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
 2012-04-19 14:06:00 +08:00
Christophe Vilayphiou 72efdbd742 changes before Chirs and Ray's trip 2012-04-19 11:50:54 +08:00
Christophe Vilayphiou f54dba8b0b Merge branch 'master' into desktop_harry 2012-04-13 13:39:00 +08:00
Harry Bomrah 193cee2df7 new icons and widgets 2012-04-12 22:18:58 +08:00
Christophe Vilayphiou 6728c35023 Fix side_bar. 
In the case of tags, take the uri instead of controller name
 2012-04-12 18:14:00 +08:00
Christophe Vilayphiou 015c0cb452 Delete useless code in items 2012-04-12 18:13:10 +08:00
Christophe Vilayphiou f65bb9b323 Merge branch 'master' into desktop_harry 
Conflicts:
	app/assets/stylesheets/style.css.erb
 2012-04-06 19:02:39 +08:00
Christophe Vilayphiou 253f4bcb54 Ray's changes for orbit bar 2012-04-06 18:06:57 +08:00
Harry Bomrah 77b2919d8c Desktop Commit 2012-04-06 17:47:02 +08:00
Christophe Vilayphiou ad740b0daf Missing end tag in side_bar 2012-04-05 18:13:52 +08:00
Christophe Vilayphiou 894f8764d8 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner 
Conflicts:
	app/views/layouts/_side_bar.html.erb
 2012-04-05 17:42:55 +08:00
Christophe Vilayphiou cedd782e7f Sidebar fix for ad_banner 2012-04-05 13:55:03 +08:00
Matthew K. Fu JuYuan d8b20ae993 fix ad_banner sidebar 2012-04-05 11:11:48 +08:00
Matthew K. Fu JuYuan 8f28d45379 The new AdBanner. 2012-04-02 03:04:38 +08:00
Christophe Vilayphiou 32b7d95669 Fix parser_back_end & side_bar & meta 2012-03-30 15:51:29 +08:00
Matt Fu 3ba89ecbcf Fact check program completed,Lin checked 2012-03-27 18:54:03 +08:00
Christophe Vilayphiou f5fd3dec7a Trying nokogiri 2012-03-27 18:42:22 +08:00
Christophe Vilayphiou 472744fc87 Changes for IE9 with html5 2012-03-21 15:51:55 +08:00
Christophe Vilayphiou 7cc075e124 Change the monkey picture 2012-03-19 15:49:40 +08:00
Christophe Vilayphiou 785ead5209 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard 
Conflicts:
	app/views/layouts/_side_bar.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
 2012-03-16 14:55:21 +08:00
unknown 6f6e84b015 fix dashboard & announcement 2012-03-16 14:44:57 +08:00
Matt Fu 13b6892f87 code for new fact check 2012-03-16 11:09:44 +08:00
unknown 00ab773942 fix dashboard & announcement 2012-03-14 20:05:03 +08:00
Matt Fu d5a2de5476 LDAP with sync rake task 2012-03-06 16:41:06 +08:00
Christophe Vilayphiou 6b2aeadde6 Changes for nccu 2012-02-29 16:01:50 +08:00
Matt Fu ccb61fc2dd change Search bar 2012-02-29 11:29:13 +08:00
Christophe Vilayphiou 0fa5c3ba9d Fix bug in orbit-bar 2012-02-29 04:56:52 +08:00
Christophe Vilayphiou 4b7b57bb3d Add some missing translations 2012-02-29 04:48:21 +08:00
Christophe Vilayphiou 9aa4173933 Change orbit-bar for language but bug when user name is too long 2012-02-29 04:21:56 +08:00
Christophe Vilayphiou f13ebc6c46 Fix bugs and changes for nccu 2012-02-27 18:50:56 +08:00
Christophe Vilayphiou f8d1d7242d Merge branch 'design_team' into dashboard 2012-02-23 16:05:33 +08:00
Christophe Vilayphiou 1a6e497b3d Ika's changes 2012-02-23 15:53:15 +08:00
Christophe Vilayphiou 53ed4b0404 Initial changes in announcement for sorting and filtering 2012-02-23 15:51:33 +08:00
Christophe Vilayphiou 22d9741ac8 Fix for orbit_bar 2012-02-23 15:51:33 +08:00
Christophe Vilayphiou ba4d71a026 Changes in orbit_bar and js in announcements 2012-02-23 15:51:33 +08:00
Christophe Vilayphiou 1146506063 Fix bug when no bulletins or web_links 2012-02-20 15:56:17 +08:00
Christophe Vilayphiou a3f152b200 Changes for jquery 1.7 (.live -> .on), create module_layout 2012-02-20 03:24:05 +08:00
Christophe Vilayphiou 44a346ffe9 Changes for orbit bar, login 2012-02-19 16:33:22 +08:00
Christophe Vilayphiou 1f7dae9bee Gemfile and bugs in js for orbit-bar 2012-02-15 00:34:22 +08:00
Christophe Vilayphiou 55ae7de01c Orbit-bar in front-end and back-end, side-bar and drop-down menu 2012-02-15 00:34:22 +08:00
Matthew Kaito Juyuan Fu dcc6a53430 brief starting for dashboard,adds i18n vars 2012-02-15 00:34:21 +08:00
Christophe Vilayphiou 5518ae362d Ray's modification before redesign 2012-01-24 11:57:27 +08:00
chris2tof 7ebfe3a7f9 Add missing id in site_editor.html.erb and comment out in parser_back_end.rb because of a loading bug 2011-12-29 18:08:08 +08:00
chris2tof c1238a7043 Prefix ids with "back_" in back-end layout to avoid conflict with site's ids 2011-12-29 15:35:13 +08:00
chris2tof 090493fd51 Re-commit 2011-12-28 20:51:52 +08:00
Christophe Vilayphiou fc591ee308 Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +08:00
Christophe Vilayphiou f774084e9a Back-end standardization 2011-12-10 18:03:32 +08:00
chris2tof 75a3c4d5b1 Modify assets 
Each layout has a manifest for css and js
 2011-12-05 09:54:41 +08:00
chris2tof a03e9bada8 Add missing translations 2011-11-20 02:14:51 +08:00
chris2tof ad9f9bbf5c Final Ray's modifications 2011-11-19 21:47:18 +08:00
chris2tof 65349796d0 Ray's modifications 2011-11-18 16:43:14 +08:00
chris2tof 861237d65b Integration of Ray' modifications 2011-11-17 20:02:58 +08:00
chris2tof 0556dc9297 ika's modification to the backend 2011-11-16 18:34:54 +08:00