developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,166 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

2166 Commits

Author SHA1 Message Date
Harry Bomrah 7b391904f7 Merge branch 'desktop_devin' of https://github.com/Rulingcom/orbit into desktop_devin 2012-04-17 21:20:36 +08:00
Harry Bomrah 95a1e266ae Custom thème done and theme id done… 2012-04-17 21:15:40 +08:00
devin 1f44a10206 wallpaper added 2012-04-17 18:06:07 +08:00
Harry Bomrah b2d72902c3 Merge branch 'desktop_harry' into desktop_devin 2012-04-17 16:35:58 +08:00
Harry Bomrah 02c6933d0b Tiles position saved in db and also change them from section manager 2012-04-17 16:33:41 +08:00
devin 8cd4844689 html change 2012-04-17 16:32:11 +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
devin 4f18257733 try 2012-04-17 01:32:53 +08:00
Matthew K. Fu JuYuan 6cdebb440d Ray's fix for ad_banner 2012-04-13 18:02:36 +08:00
Christophe Vilayphiou 92e898a656 Merge branch 'master' into ldap 2012-04-13 17:52:15 +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
Harry Bomrah 8d2e5210a1 alert removes 2012-04-13 17:06:27 +08:00
Harry Bomrah d92451d079 alert removed 2012-04-13 17:05:47 +08:00
Harry Bomrah 7479a64c95 width changes in section page 2012-04-13 17:01:11 +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 a2e35f3626 Merge branch 'master' into ldap 2012-04-13 16:03:57 +08:00
Christophe Vilayphiou 957d4eaebb Merge branch 'master' into desktop_harry 2012-04-13 16:03:43 +08:00
Christophe Vilayphiou ebf9a896aa Merge branches 'dashboard' and 'dashboard' of github.com:Rulingcom/orbit into dashboard 2012-04-13 15:57:42 +08:00
unknown 31baa2cb63 new archive 2012-04-13 15:57:15 +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
unknown 0bcb74d793 new archive 2012-04-13 15:24:19 +08:00
Christophe Vilayphiou 8167172ca9 Merge branch 'master' into desktop_harry 2012-04-13 14:05:08 +08:00
Christophe Vilayphiou 5f16059301 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner 2012-04-13 13:53:00 +08:00
Matthew K. Fu JuYuan de035cb89a fix date selector value fill back problem 2012-04-13 13:52:01 +08:00
Christophe Vilayphiou f54dba8b0b Merge branch 'master' into desktop_harry 2012-04-13 13:39:00 +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
Matthew K. Fu JuYuan 0a9ad1dfb6 starting Resque 2012-04-13 12:10:47 +08:00
Harry Bomrah 64a9579b92 final on 13 april 00:00 2012-04-13 00:00:24 +08:00
Harry Bomrah 6b43e70f53 Merge branch 'desktop_harry' into desktop_devin 2012-04-12 22:21:05 +08:00
Harry Bomrah 193cee2df7 new icons and widgets 2012-04-12 22:18:58 +08:00
Christophe Vilayphiou 198825a309 Merge branch 'master' 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
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
 2012-04-12 18:50:48 +08:00
Christophe Vilayphiou f8873267a2 Ray's fix for announcement list 2012-04-12 18:41:14 +08:00
devin eabbba76fc css change 2012-04-12 18:14:26 +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 167f6d07a0 Remove extra "]" 2012-04-12 18:13:26 +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
Harry Bomrah 01af32aa60 added divs with id 2012-04-12 16:52:32 +08:00
Harry Bomrah 92427e8831 section page done… 2012-04-12 16:25:06 +08:00
Harry Bomrah 7b423877bf new updates 2012-04-12 14:50:45 +08:00
Harry Bomrah 48323ac1af lot of changes in fetching 2012-04-12 14:44:08 +08:00
devin 67d1f7ad08 lots of change 2012-04-12 14:19:53 +08:00