Commit Graph

391 Commits

Author SHA1 Message Date
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 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
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 8eedbc951e add i18n vars 2012-04-23 14:07:14 +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 ff472714de AdBanner i18n vars patch 2012-04-23 14:05:18 +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
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
Harry Bomrah 48323ac1af lot of changes in fetching 2012-04-12 14:44:08 +08:00
Harry Bomrah 25ca29403c section page added 2012-04-11 17:58:52 +08:00
Harry Bomrah 5a6541a592 Setting page update 2012-04-11 17:26:25 +08:00
Harry Bomrah 4875b339f8 Fetching desktop from db 2012-04-11 15:31:10 +08:00
Harry Bomrah 35567c2139 Widgets Loading dynamically and semi structured 2012-04-06 23:48:03 +08:00
Harry Bomrah 7309d9c446 Dock change and getting values from db 2012-04-06 17:49:22 +08:00
Harry Bomrah ddf6a606a2 with notifications and other changes 2012-04-06 17:47:03 +08:00
Harry Bomrah 6158799a47 Stupid theme 2012-04-06 17:47:03 +08:00
Harry Bomrah 77b2919d8c Desktop Commit 2012-04-06 17:47:02 +08:00
Matthew K. Fu JuYuan 1a6242edbd fix ad_banner sidebar 2012-04-05 17:41:43 +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
Christophe Vilayphiou 32b7d95669 Fix parser_back_end & side_bar & meta 2012-03-30 15:51:29 +08:00
nccu a1034f90ba close alpha on nccu 2012-03-20 14:38:01 +08:00
Christophe Vilayphiou 47215693c4 Merge branch 'master' into ldap
Conflicts:
	Gemfile
	Gemfile.lock
	config/application.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-03-19 14:27:15 +08:00
Christophe Vilayphiou b58db48d26 Changes in Gemfile 2012-03-19 14:04:28 +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
Matt Fu d5a2de5476 LDAP with sync rake task 2012-03-06 16:41:06 +08:00
Matt Fu 7f05f21930 Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
Conflicts:
	config/environments/development.rb
2012-03-01 10:13:49 +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
Christophe Vilayphiou 6b2aeadde6 Changes for nccu 2012-02-29 16:01:50 +08:00
Matt Fu 819f815023 for different database for demo 2012-02-29 13:15:25 +08:00
Matt Fu 9a40ecd1d9 Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine
Conflicts:
	app/views/devise/passwords/new.html.erb
	app/views/devise/sessions/new.html.erb
2012-02-29 13:07:21 +08:00
Matt Fu b84b7bad63 ldap config for 0229 nccu demo 2012-02-29 12:35:54 +08:00
Matt Fu 10fd8ce455 Change locales for orbit 2012-02-29 10:48:15 +08:00
Christophe Vilayphiou 4b7b57bb3d Add some missing translations 2012-02-29 04:48:21 +08:00
Matt Fu 3209f9aa27 Complete for 229 check. 2012-02-24 19:07:47 +08:00
Christophe Vilayphiou 53ed4b0404 Initial changes in announcement for sorting and filtering 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
Matt Fu 678f1eabef LDAP connection and modified Devise 2012-02-22 14:43:24 +08:00
Christophe Vilayphiou 44a346ffe9 Changes for orbit bar, login 2012-02-19 16:33:22 +08:00
Christophe Vilayphiou 4389f0cf28 Add new created files to previous commit 2012-02-16 13:09:09 +08:00
Christophe Vilayphiou e0accbecaa Changes into page_part edition.
Can choose between 'text', 'public_r_tag' and 'widget'
2012-02-16 13:09:09 +08:00
Christophe Vilayphiou a0f58b543b Remove ckeditor 2012-02-15 01:05:24 +08:00
Christophe Vilayphiou 3e70634add Announcement modifications and tags 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
Matthew Kaito Juyuan Fu 436f039c1b build interface to work with object auth. Go to panel/new_blog/back_end/posts/ ,click New Auth link 2012-02-15 00:34:21 +08:00
Matthew Kaito Juyuan Fu e20739e32b Object Auth. Now object can be included with "include OrbitCoreLib::ObjectAuthable" to use kernel method,such as
1.Object.authed_for_user(user,title_of_object_auth).  title_of_object_auth is optional
2.object.authed_users(user,title_of_object_auth) .  title_of_object_auth is optional
if title_of_object_auth is not given,then it will return calculation across all possiblity.
2012-02-15 00:34:21 +08:00
Matthew Kaito Juyuan Fu 3ed9b81df9 first commit for object auth,will take new_blog for experiment 2012-02-15 00:34:21 +08:00
Christophe Vilayphiou e02c675595 Put back exception notifications 2012-02-06 16:25:33 +08:00
unknown f097f83f2b announcement_category edit 2012-02-06 16:20:51 +08:00
Matthew Fu 3287b68354 Basic function for ad_banner 2012-02-01 14:27:51 +08:00
Christophe Vilayphiou 783eae4597 Change "NewBlog" folders into "new_blog" in assets
Modify routes and pages handling for clean front-end urls
2012-01-24 18:16:58 +08:00
Matthew Fu afbb9e266a User role and sub_role simple interface complete 2012-01-24 12:28:33 +08:00
Matthew Fu 4ed8a2164c First complete with manager and submanager 2012-01-24 12:28:32 +08:00
Matthew Fu 18a82d7f47 Manger and SubManager 2012-01-24 12:28:32 +08:00
Christophe Vilayphiou 5518ae362d Ray's modification before redesign 2012-01-24 11:57:27 +08:00
chris2tof 04f51f2d98 Update carrierwave
#{column}_identifier must be used to get the name of the file
2012-01-24 11:57:27 +08:00
Christophe Vilayphiou 3e912b6262 Merge branches 'master' and 'exception_notification' into new_announcement_dev 2012-01-16 07:57:40 +08:00
Christophe Vilayphiou a55a93cb3b Add exception notification in development env 2012-01-13 15:49:07 +08:00
unknown 9f93af100b merge with master 2012-01-11 20:14:28 +08:00
chris2tof 62aaf79491 Merge with sub_roles 2011-12-23 18:34:21 +08:00
Christophe Vilayphiou fc591ee308 Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +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 861237d65b Integration of Ray' modifications 2011-11-17 20:02:58 +08:00
Matthew Fu 84ebc8306b APP zip package placed in lib now can be unzip into vendor
APP zip package placed in lib now can be unzip into vendor,however
server can not restart
2011-11-16 15:21:31 +08:00
chris2tof c1d77fa6d6 Changes for purchases - handle different type of purchases 2011-11-14 10:22:31 +08:00
Matthew Kaito Juyuan Fu cb07a35cc9 Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD 2011-10-20 10:06:06 +08:00
Matthew Kaito Juyuan Fu ff82391b7d Revert "Merge with new_blog"
This reverts commit 64c68fcdeb.
2011-10-20 10:01:39 +08:00
chris2tof 64c68fcdeb Merge with new_blog 2011-10-18 11:36:01 +08:00
chris2tof 9101a2921e Modifications for image urls
Find and replace the urls by the file urls in DB, in the theme files and
layout.html file. Save a copy of those files under "file_orig".
2011-09-01 19:08:45 +08:00
chris2tof a570be1811 Skip callbacks 2011-09-01 18:28:04 +08:00
chris2tof f99321c279 production mode 2011-08-25 15:59:20 +08:00
chris2tof c427e2af14 Page form with drop down. Modifications for Designs 2011-08-25 08:13:38 +08:00
chris2tof 090b1fdd7f rails 3.1.rc4 -> rails 3.1.rc6 2011-08-23 19:04:45 +08:00
chris2tof e0e14ddfac Modify purchases list 2011-08-23 16:33:01 +08:00
chris2tof 2842001a3b Update source: pull from git 2011-08-23 15:01:22 +08:00
chris2tof 2cdb5a756d Set store_ip in config.yml 2011-08-22 14:01:51 +08:00
chris2tof 7a4ad240a8 Clean code for layout and modifications in dev.rake 2011-08-22 13:45:21 +08:00
chris2tof e74f2931b1 Modifications asset pipeline 2011-08-20 22:54:07 +08:00
chris2tof 86443661e9 Merge server and rails_3_1 2011-08-18 13:43:33 +08:00
Kaito e0811c14db adding upload package for design. bugs in 2011-08-11 18:20:16 +08:00
Kaito b6db304579 add nokogiri into Gemfile and fixing dup bug again... 2011-07-29 17:49:10 +08:00
Kaito 9eb80d7424 Made r_editor into class style add functions 2011-07-27 17:23:01 +08:00
Kaito a272b871e2 complete del and destroy funciton for desgin 2011-07-22 15:54:38 +08:00
Matthew Fu c48a11d9f5 Add some JS for design uploading 2011-07-19 18:31:53 +08:00
Matthew Fu f387139ae1 rails 3.1 and designs (with bug) 2011-07-12 16:00:57 +08:00
unknown 7215b56f7e changes for windows 2011-06-14 15:04:37 +08:00
chris2tof 7b5ea870a0 Delete page. 2011-06-01 12:00:41 +08:00
chris2tof ddc7c74436 Create page. 2011-06-01 10:24:14 +08:00
chris2tof 0969f6b6cc CKEditor.
The error came from some script in Application.js
2011-05-26 13:48:09 +08:00
chris2tof 964440fa86 Remove CKEditor due to conflicts with the jQuery library 2011-05-26 11:23:46 +08:00
chris2tof a8c4e17c56 CKEditor.
Edition of page part for single language.
2011-05-25 16:27:17 +08:00
chris2tof d971a8ecbe Uniformized: @page and @ link in @item
Change parser for page edition.
2011-05-25 14:50:56 +08:00
chris2tof 24ae7ed5e3 Links edition 2011-05-13 09:08:42 +08:00
chris2tof d9ba76ebd5 - No more Home object
- Sitemap on the left side and view of the current page in the main block
2011-05-09 18:49:57 +08:00
chris2tof 9fdfb140d3 Not needed in Rails 3 2011-05-02 15:59:02 +08:00
chris2tof d88cae437d update gem bson_ext and devise initializer 2011-04-14 13:40:16 +08:00
ihower 8a4cffae8f Remove files which should be deleted in previous commit 2011-04-13 18:53:47 +08:00
chris 6db9727829 revert to mongoid 2.0.0 and remove reroute_middleware 2011-04-13 18:29:33 +08:00
chris 106db069fd update radius, modify routes to handle modules, add blog module 2011-04-13 18:28:24 +08:00
chris 25752b7065 tags: image and css - show ID in assets/index 2011-04-13 18:22:52 +08:00
chris 70347d4c34 add missing file 2011-04-13 18:22:51 +08:00
chris 4b4cdbfd31 admin status change 2011-04-13 18:22:50 +08:00
chris e360baadde delete /initializers/mongoid.rb 2011-04-13 18:22:50 +08:00
chris e62df90117 user can't delete self and flash_messages 2011-04-13 18:22:50 +08:00
chris 318c264cae add user_info 2011-04-13 18:22:50 +08:00
chris 27bdbadf08 404 for pages and asset column error 2011-04-13 18:22:49 +08:00
ihower 19a7d51e60 Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST) 2011-04-13 18:19:51 +08:00
Wen-Tien Chang bebc51e8bb Admin can new/edit user_attributes 2010-03-15 17:35:01 +08:00
Wen-Tien Chang 29ee4585b2 upgrade to rails3, but grip is broken 2010-03-08 16:04:05 +08:00
Wen-Tien Chang 13065aa85a Add devise gem and panel/users controller 2010-03-04 16:33:26 +08:00
Wen-Tien Chang 93169b1098 Add Item list interface, but acts_as_list can not used 2010-02-22 16:10:13 +08:00
Wen-Tien Chang 9fa03db2c0 Let nested route works 2010-02-11 16:46:20 +08:00
Wen-Tien Chang a19e0dba6c Add asset model and controller 2010-02-01 17:24:28 +08:00
Wen-Tien Chang e1440a79d8 Add Item, Page, Component, Link inheritanced models 2010-01-14 18:30:53 +08:00
Wen-Tien Chang cd21cadfe7 Add panel namespace 2010-01-11 17:53:44 +08:00
Wen-Tien Chang 314f6d5219 Add reroute middleware hack 2010-01-11 17:09:50 +08:00
Wen-Tien Chang 9f1ba2ae66 1.fix parent page 2.add page title 2010-01-08 18:36:36 +08:00
Wen-Tien Chang e6d083acda Add zh_tw locale file 2010-01-08 15:45:13 +08:00
Wen-Tien Chang 5ab32baf88 Add MongoMapper key_i18n support 2010-01-08 15:32:44 +08:00
Wen-Tien Chang a674e46c91 clean up useless code 2010-01-04 17:49:55 +08:00
Wen-Tien Chang b17ebfb9b7 Change to MongoDB 2010-01-04 15:52:30 +08:00
Wen-Tien Chang fd8f9cace5 upgrade to rails 2.3.5 2010-01-04 15:12:03 +08:00
Wen-Tien Chang 691d514fa1 fixes announcements i18n 2009-07-06 16:36:41 +08:00
Wen-Tien Chang ff2dffaeb4 add i18n for layout and snippet 2009-07-06 16:23:34 +08:00
Wen-Tien Chang 28612514e3 Add CouchFoo.property_i18n method 2009-06-26 21:16:37 +08:00
Wen-Tien Chang db8d2bfa8f let page model support i18n 2009-06-19 17:31:10 +08:00
Wen-Tien Chang 5570a2dfbf Add announcement admin and view template 2009-06-01 14:20:15 +08:00
Wen-Tien Chang 4807066c68 Add announcement model 2009-06-01 10:54:16 +08:00
Wen-Tien Chang 438c508ea1 Add snippet support and unpack liquid plugin 2009-05-08 02:13:27 +08:00
Wen-Tien Chang 8dcde174cf Add page layout support 2009-05-08 01:54:33 +08:00
Wen-Tien Chang 78e8c32969 Add liquid template render 2009-05-08 01:32:49 +08:00
Wen-Tien Chang 66604d00f4 Add admin/pages scaffold and basic page render 2009-05-08 01:18:16 +08:00
Wen-Tien Chang 40831c1314 init rails 2.3.2 2009-05-08 00:53:18 +08:00