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

435 Commits

Author SHA1 Message Date
Christophe Vilayphiou 499930a680 Pull from github 2012-04-23 14:29:55 +08:00
Matthew K. Fu JuYuan 67ba2389a2 fix js 2012-04-23 14:07:14 +08:00
Matthew K. Fu JuYuan 8eedbc951e add i18n vars 2012-04-23 14:07:14 +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 e353afb5ac fix i18n vars in ad_banner 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
Matthew K. Fu JuYuan 30edc317b2 text area for ad_image 2012-04-23 14:06:36 +08:00
Matthew K. Fu JuYuan ff472714de AdBanner i18n vars patch 2012-04-23 14:05:18 +08:00
Christophe Vilayphiou 2f279c53ff Apply patch from ldap 2012-04-23 14:04:55 +08:00
Christophe Vilayphiou 72efdbd742 changes before Chirs and Ray's trip 2012-04-19 11:50:54 +08:00
Matthew K. Fu JuYuan 170c12bcdd fix js 2012-04-18 16:24:17 +08:00
Matthew K. Fu JuYuan 0ddb66a3c9 add i18n vars 2012-04-18 15:33:11 +08:00
Matthew K. Fu JuYuan 8d776fd30d AdImage and AnBanner JS fixed 2012-04-18 15:26:59 +08:00
Matthew K. Fu JuYuan 51190a79cb 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-17 16:03:48 +08:00
Matthew K. Fu JuYuan a9a4ca6ede fix i18n vars in ad_banner 2012-04-17 15:21:43 +08:00
Matthew K. Fu JuYuan 06a3128be5 realtime preview is working. but save to object when preview 2012-04-17 11:34:25 +08:00
Matthew K. Fu JuYuan 6cdebb440d Ray's fix for ad_banner 2012-04-13 18:02:36 +08:00
Matthew K. Fu JuYuan 7cf00d1d93 text area for ad_image 2012-04-13 17:51:19 +08:00
Matthew K. Fu JuYuan d81ca40f90 AdBanner i18n vars patch 2012-04-13 17:24:30 +08:00
Matthew K. Fu JuYuan 430b0fd9ae Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner 
Conflicts:
	app/views/admin/ad_banners/_ad_image_update.html.erb
 2012-04-13 16:52:14 +08:00
Matthew K. Fu JuYuan 4af73ecf6f fix preview window size. 2012-04-13 16:46:16 +08:00
Matthew K. Fu JuYuan 0fe5baf93f fix for letting ad_banner display even when file in not uploaded 2012-04-13 16:14:43 +08:00
Christophe Vilayphiou ca0fc4c767 Comment out code that bugged upload image in ad_banner 2012-04-13 15:53:25 +08:00
Christophe Vilayphiou d1feb102d0 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner 2012-04-13 15:27:10 +08:00
Matthew K. Fu JuYuan d646a9dff1 fix new ad_image data selector bug 2012-04-13 15:24:59 +08:00
Matthew K. Fu JuYuan de035cb89a fix date selector value fill back problem 2012-04-13 13:52:01 +08:00
Matthew K. Fu JuYuan 1e43349eb8 Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner 2012-04-13 12:48:57 +08:00
Matthew K. Fu JuYuan fe59446c16 fix date selector value fill back problem 2012-04-13 12:47:57 +08:00
Christophe Vilayphiou f8873267a2 Ray's fix for announcement list 2012-04-12 18:41:14 +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 93ac99d235 Add missing css in "inc" 2012-04-12 18:12:46 +08:00
Matthew K. Fu JuYuan b54578ce1e ad banner preview 2012-04-12 07:14:06 +08:00
Matthew K. Fu JuYuan 83b4443910 add pic and js for permission checkbox and filter 2012-04-12 07:14:06 +08:00
Matthew K. Fu JuYuan 57402b8602 add permission-checkbox js 2012-04-12 07:14:06 +08:00
Matthew K. Fu JuYuan e4c41ab54c A filter UI for permission select. with Harry's JS 2012-04-12 07:14:06 +08:00
Christophe Vilayphiou 5417c6fec0 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
 2012-04-12 07:13:13 +08:00
Christophe Vilayphiou 7bca339a5b Ray's fix for columns width in bulletins 2012-04-12 07:01:34 +08:00
Christophe Vilayphiou 486845460c Filter and delete for bulletins 2012-04-12 06:50:36 +08:00
Matthew K. Fu JuYuan d2e77d6bf8 Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner 2012-04-09 12:45:27 +08:00
Matthew K. Fu JuYuan d2a3a4d26e ad banner preview 2012-04-09 12:44:08 +08:00
Matthew K. Fu JuYuan 0eab9ca8fa add pic and js for permission checkbox and filter 2012-04-09 12:43:51 +08:00
Matthew K. Fu JuYuan c7c3af91dd add permission-checkbox js 2012-04-09 12:43:10 +08:00
Christophe Vilayphiou 963a0cb604 Change filter to js with history for bulletins 2012-04-07 00:20:52 +08:00
Christophe Vilayphiou 253f4bcb54 Ray's changes for orbit bar 2012-04-06 18:06:57 +08:00
Matthew K. Fu JuYuan fa441814f3 A filter UI for permission select. with Harry's JS 2012-04-06 17:46:50 +08:00
Christophe Vilayphiou 6f9363ef54 Fix bugs in upload design and missing menu 2012-04-06 17:37:45 +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
Matthew K. Fu JuYuan 01bda515a6 fact_check with Ray's permission check. 
needs Ray's new css
 2012-04-05 17:41:43 +08:00
Christophe Vilayphiou ef8eb0450b Changes in tinymce bar 2012-04-05 17:28:21 +08:00
unknown d45725cf3b fix announcement & add lang tab 2012-04-05 15:23:20 +08:00
Matthew K. Fu JuYuan ef88c2dbc2 fact_check with Ray's permission check. 
needs Ray's new css
 2012-04-05 15:06:01 +08:00
Christophe Vilayphiou 1259d62249 Fix mainTablePosition in js -> remove the notable class 2012-04-05 14:55:41 +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 a9988a0d5c Change for interface,form. 2012-04-02 11:00:51 +08:00
Matthew K. Fu JuYuan 8f28d45379 The new AdBanner. 2012-04-02 03:04:38 +08:00
Matthew K. Fu JuYuan b17cd7570f changing to new admin_layout 2012-04-02 02:58:02 +08:00
Matthew K. Fu JuYuan 928c642840 change layout from old admin to new_admin. not complete code 2012-04-02 02:58:01 +08:00
Christophe Vilayphiou 503f71e554 Ray's changes in tags, css and js 2012-04-02 02:55:36 +08:00
Christophe Vilayphiou 6c50aa5243 Add pagination to bulletin index and remove ajax to make it simple 2012-04-02 02:55:36 +08:00
Christophe Vilayphiou 32519f308f Fix several bus when there is no design 2012-04-02 02:41:42 +08:00
Christophe Vilayphiou 32b7d95669 Fix parser_back_end & side_bar & meta 2012-03-30 15:51:29 +08:00
Christophe Vilayphiou d6e4da6dad Ray's fix for margin-top 2012-03-28 11:31:07 +08:00
Christophe Vilayphiou cf297fc424 Changed inherited controller in module_apps to OrbitBackendController 2012-03-27 18:58:04 +08:00
Christophe Vilayphiou d02bbdbaa5 Nokogiri in parsers 2012-03-27 18:58:04 +08:00
Christophe Vilayphiou 55d12e50f2 Ray's changes in announcenment back-end 2012-03-27 18:58:03 +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 f9c5ee5d18 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard 
Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
	vendor/built_in_modules/announcement/config/routes.rb
 2012-03-27 18:37:14 +08:00
unknown e8d1352890 fix announcement 2012-03-27 14:29:11 +08:00
unknown a30bc499c7 fix announcement & links 2012-03-27 14:19:58 +08:00
unknown 42519d9f78 fix announcement & links 2012-03-23 18:04:11 +08:00
Christophe Vilayphiou 61698f3f2c Remove quick_edit on bulletin index load 2012-03-23 17:32:59 +08:00
Christophe Vilayphiou a126935d2c Clean the parsers and introduce the metas 2012-03-21 18:30:12 +08:00
Christophe Vilayphiou 472744fc87 Changes for IE9 with html5 2012-03-21 15:51:55 +08:00
Christophe Vilayphiou 3aa7c5120d Put tinymce in its own js file. 
To use on a text area just add the class "tinymce_textarea".
 2012-03-21 12:41:32 +08:00
Christophe Vilayphiou e953344965 Fix before_filter order for object_auth 2012-03-20 14:17:28 +08:00
Christophe Vilayphiou 7cc075e124 Change the monkey picture 2012-03-19 15:49:40 +08:00
unknown a755eb184b fix announcement links & files 2012-03-16 16:49:25 +08:00
unknown 7d553acaec fix announcement link & files 2012-03-16 15:53:57 +08:00
Christophe Vilayphiou 07edf44643 Merge branches 'design_team' and 'design_team' of github.com:Rulingcom/orbit into design_team 2012-03-16 15:13:06 +08:00
Christophe Vilayphiou 29ec36130e css and js changes 2012-03-16 15:06:45 +08:00
Christophe Vilayphiou f4fda08e86 Replace PrototypeR4 by Orbit. 
Move session into mongoid_store.
Reset session when sing_in.
 2012-03-16 14:58:32 +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
Christophe Vilayphiou b6d49df145 Change Obit to Orbit 2012-03-16 11:54:31 +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
Christophe Vilayphiou 4dd9b7ffa4 Fix announcement pagination in front-end 2012-03-07 18:16:59 +08:00
Christophe Vilayphiou 0b1f83c042 Fix extra loaded js: the widgets only need to render layout when they need js. 2012-03-07 18:16:59 +08:00
Matt Fu cceb785a8d change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action. 2012-02-29 18:58:33 +08:00
Matthew Kaito Juyuan Fu 8932615f05 add "all_user" for app&object auth 2012-02-29 18:56:42 +08:00
Matthew Kaito Juyuan Fu 2e58c63ff7 fix bugs with token 2012-02-29 18:56:42 +08:00
Matthew Kaito Juyuan Fu cc550c5745 First version for App and Object auth.Taking Announcement as experiment 2012-02-29 18:55:55 +08:00
Matthew Kaito Juyuan Fu 3bcd7ea349 Exp with object_auth 2012-02-29 18:50:23 +08:00
Christophe Vilayphiou 6b2aeadde6 Changes for nccu 2012-02-29 16:01:50 +08:00