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

611 Commits

Author SHA1 Message Date
Christophe Vilayphiou 9129835f23 Add tags to assets 2012-05-16 18:19:41 +08:00
Harry Bomrah 617a683d00 image insertion completed.. 2012-05-16 16:22:50 +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 b31846f424 Delete duplicate side_bar code 2012-05-16 04:35:19 +08:00
Christophe Vilayphiou ad9ac5f3f7 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard 
Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
 2012-05-16 01:31:16 +08:00
unknown cc02ea511c archive checkbox 2012-05-16 01:13:39 +08:00
unknown cf5e6c1a96 new archive 2012-05-16 01:09:21 +08:00
unknown 4e9bb1b583 new archive 2012-05-16 01:06:26 +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 80e84c10ba Remove link from dashboard 2012-05-15 23:01:00 +08:00
Christophe Vilayphiou e54f4409fb Add impressionist 2012-05-15 21:26:09 +08:00
Christophe Vilayphiou 59b55d1574 Merge branch 'design_team' into ldap 2012-05-14 12:42:06 +08:00
Matthew K. Fu JuYuan 9ba4c2cf2f Change to apply page to had object_auth 2012-05-14 12:40:50 +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
Matthew K. Fu JuYuan 7a6d30ad62 Remove unless files and change routes. 2012-05-14 00:50:36 +08:00
Matthew K. Fu JuYuan 0119ab1a74 New Interface for App Auth and Object Auth 2012-05-14 00:50:12 +08:00
Matthew K. Fu JuYuan a184f96ce7 AdBanner app_auth 2012-05-14 00:49:22 +08:00
Christophe Vilayphiou cf8d20dc84 Add category and tag to pages 2012-05-14 00:33:52 +08:00
Christophe Vilayphiou e40c76bf5f Fix new page form 
Redirect to home when not authorized
Get only module_apps with app_pages for new and edit page
Change web_resource.json
 2012-05-13 23:48:34 +08:00
Christophe Vilayphiou 01d0c002f5 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
Conflicts:
	app/views/admin/pages/_edit.html.erb
	app/views/admin/pages/_form.html.erb
	lib/parsers/parser_back_end.rb
 2012-05-13 23:14:13 +08:00
Christophe Vilayphiou 62e9a772f6 Fix titles for widgets 
Add translations
 2012-05-13 23:09:48 +08:00
Christophe Vilayphiou 4ae8299949 Add custom title to widgets 
Fix pagination conflict with main_content and widgets
 2012-05-13 22:35:00 +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 ef2d416c70 Ray's changes for page_edit 2012-05-13 19:36:04 +08:00
Christophe Vilayphiou 803253ebcf Put nestedSortable in page_edit.js.erb 2012-05-12 22:12:17 +08:00
Christophe Vilayphiou ef49df448d Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
Conflicts:
	app/helpers/admin/item_helper.rb
 2012-05-11 18:09:34 +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 6a443f0976 Add mongoid-tree to Item 2012-05-11 16:16:09 +08:00
Harry Bomrah 1a9fa8f505 Merge branch 'desktop_harry' into desktop_devin 2012-05-11 15:28:05 +08:00
Harry Bomrah 2c3637e9b4 very important update for widgets management.. 2012-05-11 15:27:16 +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
devin ada56a7a63 some update 2012-05-10 10:54:43 +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 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 bc5e975fab Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-10 00:29:22 +08:00
Christophe Vilayphiou 9161dc73b5 Translation for "or" 2012-05-10 00:27:12 +08:00
Christophe Vilayphiou 13587306bc Add list widgets for announcement, news and links with categories and tags 2012-05-10 00:25:30 +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
Matthew K. Fu JuYuan 47bca643af hidding new ad_banner 2012-05-09 14:17:20 +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 f9f7ddc8ee Hide some links in side_bar for site_settings 2012-05-09 12:53:42 +08:00
Christophe Vilayphiou 44a485611a Site_info and site_setting i18n 2012-05-09 12:29:46 +08:00
Christophe Vilayphiou 9216f29bc9 Ray's changes for mail settings 2012-05-09 12:19:32 +08:00
Christophe Vilayphiou 41c0c26330 Add mail_settings 2012-05-09 11:38:29 +08:00
Christophe Vilayphiou b3be210ff7 Small adjustment for dashboard 2012-05-09 05:55:47 +08:00
Christophe Vilayphiou 2b03263fb7 Dashboard partial implementation 2012-05-09 05:53:07 +08:00
Christophe Vilayphiou 8d70d87120 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-09 04:13:14 +08:00
Christophe Vilayphiou 26a50cc862 Add sub_menu to children 2012-05-09 04:15:45 +08:00
Christophe Vilayphiou a186ae08d8 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-08 21:47:03 +08:00
Christophe Vilayphiou 18c42a80a6 Put site_settings in the orbit_button 2012-05-08 20:06:56 +08:00
Christophe Vilayphiou 5c7cf1aef2 Add sub_menu to site_info 2012-05-08 17:27: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
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
Harry Bomrah 2083e0bf4f widget structure improvised… 2012-05-07 19:00:50 +08:00
Christophe Vilayphiou 469f5c8267 Add always_display checkbox for title in site_info independent of i18n 2012-05-07 16:29:32 +08:00
Christophe Vilayphiou 9a5e7cc8fa Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
Conflicts:
	app/views/admin/sites/site_info.html.erb
 2012-05-07 16:08:05 +08:00
Christophe Vilayphiou f534e6ca7b Ray's changes for site_info 2012-05-07 15:55:45 +08:00
Christophe Vilayphiou 8a3f0b9bdc Add menu_enabled_for: the page can be shown even if there's no link in the menu 2012-05-07 15:47:14 +08:00
Christophe Vilayphiou 8b61314cc4 Add i18n for site_info. 
Add always display site title.
Changes for menu in front-end
 2012-05-07 15:11:43 +08:00
Christophe Vilayphiou 0246341aef Add footer to site_info 2012-05-07 11:25:33 +08:00
Christophe Vilayphiou 1fb6c20b86 Add site_info 2012-05-07 00:54:18 +08:00
Christophe Vilayphiou 48f8fbde7f Fix site_locale_default_head and active for current locale 2012-05-07 00:53:52 +08:00
Christophe Vilayphiou 51f87e7212 Add missing translation for enabled_for 2012-05-06 03:36:01 +08:00
Christophe Vilayphiou ce1fecaf93 Add position ordering and hiding page for i18n 2012-05-06 00:35:13 +08:00
Christophe Vilayphiou f190ce18ee Put sorting in web_link, page_context and design 2012-05-05 21:20:20 +08:00
Harry Bomrah fcc875bb5d app store page added… and few other changes.. 2012-05-04 20:28:12 +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 453cb21066 Announcement preivew 2012-05-04 15:50:45 +08:00
Matthew K. Fu JuYuan f6307abfbf fix broken ad_banner 2012-05-04 15:40:43 +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
Harry Bomrah 3ad11f2098 View functionality, changed controller, journal and pages collections 2012-05-03 21:38:03 +08:00
Harry Bomrah a3a1e4b92e controller change, views working and db for paper and journals 2012-05-03 21:30:12 +08:00
devin aeaf2f05d1 Start Add Page - no function 2012-05-03 17:59:07 +08:00
Harry Bomrah 1fce99c96f Merge branch 'desktop_harry' into desktop_devin 2012-05-03 14:42:07 +08:00
Harry Bomrah d6cbbff9de connection page working now.. 2012-05-03 14:40:54 +08:00
devin b87cf0e2ff list page 2012-05-03 14:39:22 +08:00
devin 887bda1491 lots of change 2012-05-02 17:04:16 +08:00
Christophe Vilayphiou b8cd7097b0 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-02 16:27:09 +08:00
Christophe Vilayphiou 2762c24593 Fix wrong variable names in translations 2012-05-02 16:22:06 +08:00
Christophe Vilayphiou 92a53c1b27 Ray's fix 2012-05-02 16:20:59 +08:00
devin bfc4507696 Connection page design 2012-05-01 18:05:17 +08:00
Harry Bomrah 769a67f026 the group more structured and also demo connecting with gmail account.. 2012-04-30 21:17:20 +08:00
Harry Bomrah 1b7fb106f8 lot of updates 2012-04-30 14:33:12 +08:00
Harry Bomrah aacd9da9fb auto login encryption done… 2012-04-30 14:29:42 +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
Matthew K. Fu JuYuan 9d97b7c008 Change for the notice msg at login page 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 feb2156fd3 Fix error in side_bar for web_links 2012-04-27 14:15:36 +08:00
devin 2ebba577eb journal start 2012-04-27 14:04:11 +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
Harry Bomrah c158375d02 with connection and some save settings… 2012-04-26 21:30:13 +08:00
Christophe Vilayphiou 7d6b82d9dd Merge branch 'ad_banner' into ldap 2012-04-26 17:15:44 +08:00
Matthew K. Fu JuYuan 4af2068c1f Fix ad_banner sec and msec 2012-04-26 17:11:06 +08:00
Matthew K. Fu JuYuan faace9893a dehumanize ad banner 2012-04-26 17:11:05 +08:00
Matthew K. Fu JuYuan 9a5ce5f512 Remove unless sidebar links. 2012-04-26 17:11:05 +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
Harry Bomrah 64be61d61b with gmail widget.. 2012-04-26 14:47:49 +08:00
Christophe Vilayphiou 6bf4c60d45 Changes for js and ccs load for site's pages 2012-04-26 01:49:02 +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 44ded537b3 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-04-25 16:28:34 +08:00
Christophe Vilayphiou 65a6f9c416 Ray's css fix for quick edit 2012-04-25 16:26:27 +08:00
Matthew K. Fu JuYuan a3a109fb8b Remove JS debug msg. 2012-04-25 16:10:11 +08:00
Matthew K. Fu JuYuan 7f285f4719 Change ad_banner preview from using title to id 2012-04-25 16:10:11 +08:00
Matthew K. Fu JuYuan 72921d6dfd fix useless notice at login 2012-04-25 16:10:11 +08:00
Christophe Vilayphiou 8adb9c6878 Merge branch 'design_team' into ldap 2012-04-25 15:10:50 +08:00
Christophe Vilayphiou 3ec8bb7be6 Fix assets bug: when having a '.' in the name, the extension must be specified 2012-04-25 15:10:28 +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
Harry Bomrah a298cbd5f6 Publication started 2012-04-24 16:45:26 +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
Matthew K. Fu JuYuan e7bb9ea86b Fix ad image date selector 2012-04-24 14:37:06 +08:00
Matthew K. Fu JuYuan c57ba305e9 Fix ad_banner 2012-04-24 14:37:06 +08:00
Christophe Vilayphiou c856b4cdce Fix for upload image component in announcement 2012-04-24 12:41:28 +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
Harry Bomrah 670ec2a40e Themes from db fixed.. 2012-04-23 21:04:02 +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
unknown 3280ff8311 archive checkbox 2012-04-23 15:53:58 +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 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 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
Matt b6f64cd8a5 Announcement i18n vars 2012-04-23 11:29:00 +08:00
nccu fe9032787c NCCU ldap debug 2012-04-23 10:13:44 +08:00
Harry Bomrah 8c42f6bb7c Merge branch 'desktop_harry' into desktop_devin 2012-04-20 14:44:57 +08:00
devin 19750d69e0 some update 2012-04-20 05:38:53 +08:00
Harry Bomrah 3eaf97babe title and heading and welcome msg… 2012-04-19 20:26:21 +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
Harry Bomrah 4bad25e682 Msg box added and background image saving complete 2012-04-18 22:01:12 +08:00
Harry Bomrah 11a0875c44 color changes in custom color… 2012-04-18 17:57:47 +08:00
devin b743413be9 function update 2012-04-18 13:17:12 +08:00
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
devin 8cd4844689 html change 2012-04-17 16:32: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 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
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
Harry Bomrah 64a9579b92 final on 13 april 00:00 2012-04-13 00:00:24 +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
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