Commit Graph

475 Commits

Author SHA1 Message Date
Harry Bomrah bbd2c23b3d Themes fixed… 2012-03-30 18:06:06 +08:00
Christophe Vilayphiou 32b7d95669 Fix parser_back_end & side_bar & meta 2012-03-30 15:51:29 +08:00
Harry Bomrah aa3997f7cf with notifications and other changes 2012-03-29 19:50:23 +08:00
Harry Bomrah 176597f5af Stupid theme 2012-03-29 15:23:48 +08:00
Harry Bomrah 2e283a039d Desktop Commit 2012-03-28 18:53:30 +08:00
Harry Bomrah 4798cd43c1 Desktop commit 2012-03-28 18:53:06 +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
Christophe Vilayphiou 5223a7a3e9 Css and js changes 2012-02-29 12:45:47 +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 344ec86c57 Remove class 'error' in devise forms 2012-02-29 04:56:32 +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 18617850e5 Add categories for all the widgets 2012-02-28 22:00:05 +08:00
Christophe Vilayphiou 6a30b0a1e4 Add RSS event 2012-02-28 18:29:13 +08:00
Christophe Vilayphiou fdf4cfad2d Add category for announcement widget 2012-02-28 14:08:57 +08:00
Christophe Vilayphiou 7f9a7edc98 Changes in bulletins widget and front-end, add categories to link 2012-02-28 04:24:09 +08:00
Christophe Vilayphiou f13ebc6c46 Fix bugs and changes for nccu 2012-02-27 18:50:56 +08:00
Christophe Vilayphiou dcc64a20d2 Finish sorting for announcements 2012-02-24 15:30:49 +08:00
Christophe Vilayphiou 8f531a6fe5 Fix bus for pages and page content 2012-02-24 15:14:23 +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 63d7810b35 Add isotope, categories for announcement page, sort for announcement 2012-02-23 15:52:58 +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
unknown 9b001aa6c3 new page_content app 2012-02-21 19:22:42 +08:00
Christophe Vilayphiou 1146506063 Fix bug when no bulletins or web_links 2012-02-20 15:56:17 +08:00
Christophe Vilayphiou c304819d6b Commented out code for Windows 2012-02-20 08:55:21 +08:00
Christophe Vilayphiou cf038183b9 Ika's changes in modules 2012-02-20 08:48:27 +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 3ff2e7867e Fix bug when editing home 2012-02-20 03:22:53 +08:00
Christophe Vilayphiou 44a346ffe9 Changes for orbit bar, login 2012-02-19 16:33:22 +08:00
Christophe Vilayphiou 0b71714d44 Improve code in items, pages, links 2012-02-17 14:54:11 +08:00
Christophe Vilayphiou cf4a6c0b35 Remove useless destroy methods 2012-02-17 12:26:03 +08:00
Christophe Vilayphiou 9cd3cbc478 Modifications for design, pages, page_parts…
Move orbit_bar out of kernel.js
2012-02-17 02:09:32 +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
unknown edf236c1c7 edit tags 2012-02-15 15:38:27 +08:00
Christophe Vilayphiou af3a2547e1 Change ModuleAppTag into "Module name"Tag. 2012-02-15 15:18:11 +08:00
Christophe Vilayphiou d0c2856a3a Fix relations error in tags 2012-02-15 11:42:19 +08:00
unknown 778a85ca2b add tags 2012-02-15 10:37:07 +08:00
Christophe Vilayphiou 1913f0aca8 Add tinymce 2012-02-15 10:02:05 +08:00
Christophe Vilayphiou 3e70634add Announcement modifications and tags 2012-02-15 00:34:22 +08:00
Christophe Vilayphiou f57e9f19f7 Changes for multiple i18n_variable in bulletin 2012-02-15 00:34: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
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
unknown 964d7b6054 announcement path error 2012-02-13 17:09:37 +08:00
Christophe Vilayphiou 872a00b6a2 Forgot to change title in key in pages_controller 2012-02-06 22:09:33 +08:00
unknown f097f83f2b announcement_category edit 2012-02-06 16:20:51 +08:00
Matthew Kaito Juyuan Fu 8b3b71ca58 fix js bugs,partial bugs 2012-02-06 16:17:07 +08:00
Matthew Kaito Juyuan Fu 394099c388 Ad banner close complete,need validation 2012-02-04 09:37:23 +08:00
Matthew Kaito Juyuan Fu 68cea1ea49 AdBanner is now working 2012-02-04 09:37:23 +08:00
Matthew Kaito Juyuan Fu f530eb7112 Revert "mistake commit"
This reverts commit 2608b72d65.
2012-02-03 14:39:15 +08:00
Matthew Kaito Juyuan Fu 2608b72d65 mistake commit 2012-02-03 14:28:08 +08:00
Matthew Kaito Juyuan Fu a980847eb3 Basic function for AdBanner 2012-02-01 14:27:51 +08:00
Christophe Vilayphiou ccbde122df Fix bugs in design.
The static js were loaded after the page js.
parser_back_end.rb wasn't changed for the new routes.
The themes weren't parsed and saved correctly.
2012-01-31 16:38:25 +08:00
Christophe Vilayphiou 4906894fb5 Page edit wasn't showing when module_app was nil 2012-01-31 16:35:40 +08:00
Christophe Vilayphiou 762c2f5e8a Add key in module_app.rb to use instead of title for authorization 2012-01-30 18:12:18 +08:00
Christophe Vilayphiou 46db173e0b Modifications in the Design code: the uploader works but the edit is broken 2012-01-26 12:05:25 +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
Christophe Vilayphiou 6a196c5d3d Embedded to referenced for users 2012-01-24 15:12:06 +08:00
Christophe Vilayphiou 83827f82ec Fix custom image class 2012-01-24 15:11:42 +08:00
Matthew Fu afbb9e266a User role and sub_role simple interface complete 2012-01-24 12:28:33 +08:00
Matthew Fu 959f3e8b2f put setup APP var setup into Orbit class 2012-01-24 12:28:32 +08:00
Matthew Fu 4ed8a2164c First complete with manager and submanager 2012-01-24 12:28:32 +08:00
Matthew Fu 4df8ab6cc3 Add methods to work with manager role,add task to build user test data 2012-01-24 12:28:32 +08:00
Matthew Fu 18a82d7f47 Manger and SubManager 2012-01-24 12:28:32 +08:00
Christophe Vilayphiou 9fcf8280fa Change "_filename" to "_identifier" for carrierwave 2012-01-24 11:57:27 +08:00
Christophe Vilayphiou 5518ae362d Ray's modification before redesign 2012-01-24 11:57:27 +08:00
Christophe Vilayphiou bfd55277d7 Embed attribute_fields and sub_roles 2012-01-24 11:57:27 +08:00
chris2tof 1bbb197fba Forgot to remove ":remote => true" for asset new 2012-01-24 11:56:08 +08:00
chris2tof b04d845a5a New rss.js from Harry and fix html form for assets 2012-01-24 11:56:08 +08:00
unknown 4cfae9c107 announcement widget query 2012-01-18 21:34:26 +08:00
Christophe Vilayphiou 3e912b6262 Merge branches 'master' and 'exception_notification' into new_announcement_dev 2012-01-16 07:57:40 +08:00
chris2tof 4be97f6ea6 Merge branch 'fix_it'
Conflicts:
	app/assets/javascripts/page_edit.js
	app/assets/javascripts/rss.js
	app/assets/stylesheets/admin.css.erb
	app/assets/stylesheets/admin_back_end.css.erb
	app/controllers/admin/app_auths_controller.rb
	app/controllers/admin/module_apps_controller.rb
	app/controllers/admin/users_controller.rb
	app/controllers/application_controller.rb
	app/models/app_auth.rb
	app/models/user/user.rb
	app/views/admin/app_auths/index.html.erb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_new.html.erb
	app/views/admin/designs/new.html.erb
	app/views/admin/infos/_form.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/module_apps/index.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/roles/_form.html.erb
	app/views/admin/roles/_sub_role.html.erb
	app/views/admin/users/_form.html.erb
	app/views/admin/users/_show_sub_role.html.erb
	app/views/admin/users/_sub_role.html.erb
	app/views/admin/users/edit.html.erb
	app/views/admin/users/index.html.erb
	app/views/admin/users/new.html.erb
	app/views/admin/users/show.html.erb
	app/views/layouts/admin.html.erb
	lib/fraisier/layout.html
	lib/parsers/parser_back_end.rb
	lib/parsers/parser_layout.rb
	lib/tasks/dev.rake
	spec/models/app_auth_basic.rb
	vendor/built_in_modules/NewBlog/.gitignore
	vendor/built_in_modules/NewBlog/Gemfile
	vendor/built_in_modules/NewBlog/Gemfile.lock
	vendor/built_in_modules/NewBlog/MIT-LICENSE
	vendor/built_in_modules/NewBlog/NewBlog.gemspec
	vendor/built_in_modules/NewBlog/README.rdoc
	vendor/built_in_modules/NewBlog/Rakefile
	vendor/built_in_modules/NewBlog/app/assets/images/NewBlog/.gitkeep
	vendor/built_in_modules/NewBlog/app/assets/javascripts/NewBlog/.gitkeep
	vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep
	vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/application.css
	vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/production.css
	vendor/built_in_modules/NewBlog/app/controllers/.gitkeep
	vendor/built_in_modules/NewBlog/app/controllers/application_controller.rb
	vendor/built_in_modules/NewBlog/app/controllers/panel/blog/back_end/posts_controller.rb
	vendor/built_in_modules/NewBlog/app/helpers/.gitkeep
	vendor/built_in_modules/NewBlog/app/helpers/application_helper.rb
	vendor/built_in_modules/NewBlog/app/mailers/.gitkeep
	vendor/built_in_modules/NewBlog/app/models/.gitkeep
	vendor/built_in_modules/NewBlog/app/models/comment.rb
	vendor/built_in_modules/NewBlog/app/models/post.rb
	vendor/built_in_modules/NewBlog/app/views/.gitkeep
	vendor/built_in_modules/NewBlog/app/views/layouts/application.html.erb
	vendor/built_in_modules/NewBlog/app/views/layouts/edit_view.html.erb
	vendor/built_in_modules/NewBlog/app/views/layouts/production.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/_form.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/index.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/latest_post.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/new.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/show.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/front_end/posts/show.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/index.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/latest_post.html.erb
	vendor/built_in_modules/NewBlog/config/locales/en.yml
	vendor/built_in_modules/NewBlog/lib/NewBlog.rb
	vendor/built_in_modules/NewBlog/lib/NewBlog/engine.rb
	vendor/built_in_modules/NewBlog/lib/NewBlog/version.rb
	vendor/built_in_modules/NewBlog/lib/tasks/NewBlog_tasks.rake
	vendor/built_in_modules/NewBlog/script/rails
	vendor/built_in_modules/NewBlog/test/NewBlog_test.rb
	vendor/built_in_modules/NewBlog/test/dummy/Rakefile
	vendor/built_in_modules/NewBlog/test/dummy/app/assets/javascripts/application.js
	vendor/built_in_modules/NewBlog/test/dummy/app/assets/stylesheets/application.css
	vendor/built_in_modules/NewBlog/test/dummy/app/controllers/application_controller.rb
	vendor/built_in_modules/NewBlog/test/dummy/app/helpers/application_helper.rb
	vendor/built_in_modules/NewBlog/test/dummy/app/mailers/.gitkeep
	vendor/built_in_modules/NewBlog/test/dummy/app/models/.gitkeep
	vendor/built_in_modules/NewBlog/test/dummy/app/views/layouts/application.html.erb
	vendor/built_in_modules/NewBlog/test/dummy/config.ru
	vendor/built_in_modules/NewBlog/test/dummy/config/application.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/boot.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/database.yml
	vendor/built_in_modules/NewBlog/test/dummy/config/environment.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/environments/development.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/environments/production.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/environments/test.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/backtrace_silencers.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/inflections.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/mime_types.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/secret_token.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/session_store.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/wrap_parameters.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/locales/en.yml
	vendor/built_in_modules/NewBlog/test/dummy/config/mongoid.yml
	vendor/built_in_modules/NewBlog/test/dummy/config/routes.rb
	vendor/built_in_modules/NewBlog/test/dummy/lib/assets/.gitkeep
	vendor/built_in_modules/NewBlog/test/dummy/log/.gitkeep
	vendor/built_in_modules/NewBlog/test/dummy/public/404.html
	vendor/built_in_modules/NewBlog/test/dummy/public/422.html
	vendor/built_in_modules/NewBlog/test/dummy/public/500.html
	vendor/built_in_modules/NewBlog/test/dummy/public/favicon.ico
	vendor/built_in_modules/NewBlog/test/dummy/script/rails
	vendor/built_in_modules/NewBlog/test/integration/navigation_test.rb
	vendor/built_in_modules/NewBlog/test/test_helper.rb
	vendor/built_in_modules/blog/app/controllers/application_controller.rb
	vendor/built_in_modules/blog/app/controllers/panel/blog/posts_controller.rb
	vendor/built_in_modules/blog/app/helpers/application_helper.rb
	vendor/built_in_modules/blog/app/models/comment.rb
	vendor/built_in_modules/blog/app/models/post.rb
	vendor/built_in_modules/blog/app/views/layouts/application.html.erb
	vendor/built_in_modules/blog/app/views/panel/blog/posts/_form.html.erb
	vendor/built_in_modules/blog/app/views/panel/blog/posts/index.html.erb
	vendor/built_in_modules/blog/app/views/panel/blog/posts/show.html.erb
	vendor/built_in_modules/blog/config/initializers/backtrace_silencers.rb
	vendor/built_in_modules/blog/config/initializers/inflections.rb
	vendor/built_in_modules/blog/config/initializers/mime_types.rb
	vendor/built_in_modules/blog/public/404.html
	vendor/built_in_modules/blog/public/422.html
	vendor/built_in_modules/blog/public/500.html
	vendor/built_in_modules/blog/public/favicon.ico
	vendor/built_in_modules/blog/public/stylesheets/.gitkeep
	vendor/built_in_modules/blog/script/rails
	vendor/built_in_modules/blog/vendor/plugins/.gitkeep
	vendor/built_in_modules/new_blog/.gitignore
	vendor/built_in_modules/new_blog/Gemfile
	vendor/built_in_modules/new_blog/Gemfile.lock
	vendor/built_in_modules/new_blog/MIT-LICENSE
	vendor/built_in_modules/new_blog/README.rdoc
	vendor/built_in_modules/new_blog/Rakefile
	vendor/built_in_modules/new_blog/app/assets/images/NewBlog/.gitkeep
	vendor/built_in_modules/new_blog/app/assets/javascripts/NewBlog/.gitkeep
	vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/.gitkeep
	vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/application.css
	vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/production.css
	vendor/built_in_modules/new_blog/app/controllers/.gitkeep
	vendor/built_in_modules/new_blog/app/controllers/application_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/back_end/posts_controller.rb
	vendor/built_in_modules/new_blog/app/helpers/.gitkeep
	vendor/built_in_modules/new_blog/app/mailers/.gitkeep
	vendor/built_in_modules/new_blog/app/models/.gitkeep
	vendor/built_in_modules/new_blog/app/models/comment.rb
	vendor/built_in_modules/new_blog/app/models/post.rb
	vendor/built_in_modules/new_blog/app/views/.gitkeep
	vendor/built_in_modules/new_blog/app/views/layouts/application.html.erb
	vendor/built_in_modules/new_blog/app/views/layouts/edit_view.html.erb
	vendor/built_in_modules/new_blog/app/views/layouts/production.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/_form.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/index.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/latest_post.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/new.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/show.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/show.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/index.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/latest_post.html.erb
	vendor/built_in_modules/new_blog/config/locales/en.yml
	vendor/built_in_modules/new_blog/lib/new_blog/version.rb
	vendor/built_in_modules/new_blog/lib/tasks/NewBlog_tasks.rake
	vendor/built_in_modules/new_blog/new_blog.gemspec
	vendor/built_in_modules/new_blog/script/rails
	vendor/built_in_modules/new_blog/test/NewBlog_test.rb
	vendor/built_in_modules/new_blog/test/dummy/Rakefile
	vendor/built_in_modules/new_blog/test/dummy/app/assets/javascripts/application.js
	vendor/built_in_modules/new_blog/test/dummy/app/assets/stylesheets/application.css
	vendor/built_in_modules/new_blog/test/dummy/app/controllers/application_controller.rb
	vendor/built_in_modules/new_blog/test/dummy/app/helpers/application_helper.rb
	vendor/built_in_modules/new_blog/test/dummy/app/mailers/.gitkeep
	vendor/built_in_modules/new_blog/test/dummy/app/models/.gitkeep
	vendor/built_in_modules/new_blog/test/dummy/app/views/layouts/application.html.erb
	vendor/built_in_modules/new_blog/test/dummy/config.ru
	vendor/built_in_modules/new_blog/test/dummy/config/application.rb
	vendor/built_in_modules/new_blog/test/dummy/config/boot.rb
	vendor/built_in_modules/new_blog/test/dummy/config/database.yml
	vendor/built_in_modules/new_blog/test/dummy/config/environment.rb
	vendor/built_in_modules/new_blog/test/dummy/config/environments/development.rb
	vendor/built_in_modules/new_blog/test/dummy/config/environments/production.rb
	vendor/built_in_modules/new_blog/test/dummy/config/environments/test.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/backtrace_silencers.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/inflections.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/mime_types.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/secret_token.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/session_store.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/wrap_parameters.rb
	vendor/built_in_modules/new_blog/test/dummy/config/locales/en.yml
	vendor/built_in_modules/new_blog/test/dummy/config/mongoid.yml
	vendor/built_in_modules/new_blog/test/dummy/config/routes.rb
	vendor/built_in_modules/new_blog/test/dummy/lib/assets/.gitkeep
	vendor/built_in_modules/new_blog/test/dummy/log/.gitkeep
	vendor/built_in_modules/new_blog/test/dummy/public/404.html
	vendor/built_in_modules/new_blog/test/dummy/public/422.html
	vendor/built_in_modules/new_blog/test/dummy/public/500.html
	vendor/built_in_modules/new_blog/test/dummy/public/favicon.ico
	vendor/built_in_modules/new_blog/test/dummy/script/rails
	vendor/built_in_modules/new_blog/test/integration/navigation_test.rb
	vendor/built_in_modules/new_blog/test/test_helper.rb
	vendor/plugins/NewBlog/.gitignore
	vendor/plugins/NewBlog/Gemfile
	vendor/plugins/NewBlog/Gemfile.lock
	vendor/plugins/NewBlog/MIT-LICENSE
	vendor/plugins/NewBlog/NewBlog.gemspec
	vendor/plugins/NewBlog/README.rdoc
	vendor/plugins/NewBlog/Rakefile
	vendor/plugins/NewBlog/app/assets/images/NewBlog/.gitkeep
	vendor/plugins/NewBlog/app/assets/javascripts/NewBlog/.gitkeep
	vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep
	vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/application.css
	vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css
	vendor/plugins/NewBlog/app/controllers/.gitkeep
	vendor/plugins/NewBlog/app/helpers/.gitkeep
	vendor/plugins/NewBlog/app/mailers/.gitkeep
	vendor/plugins/NewBlog/app/models/.gitkeep
	vendor/plugins/NewBlog/app/views/.gitkeep
	vendor/plugins/NewBlog/app/views/layouts/edit_view.html.erb
	vendor/plugins/NewBlog/app/views/layouts/production.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/index.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/latest_post.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/new.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/show.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_index.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb
	vendor/plugins/NewBlog/config/locales/en.yml
	vendor/plugins/NewBlog/lib/NewBlog/version.rb
	vendor/plugins/NewBlog/lib/tasks/NewBlog_tasks.rake
	vendor/plugins/NewBlog/script/rails
	vendor/plugins/NewBlog/test/NewBlog_test.rb
	vendor/plugins/NewBlog/test/dummy/Rakefile
	vendor/plugins/NewBlog/test/dummy/app/assets/javascripts/application.js
	vendor/plugins/NewBlog/test/dummy/app/assets/stylesheets/application.css
	vendor/plugins/NewBlog/test/dummy/app/controllers/application_controller.rb
	vendor/plugins/NewBlog/test/dummy/app/mailers/.gitkeep
	vendor/plugins/NewBlog/test/dummy/app/models/.gitkeep
	vendor/plugins/NewBlog/test/dummy/app/views/layouts/application.html.erb
	vendor/plugins/NewBlog/test/dummy/config.ru
	vendor/plugins/NewBlog/test/dummy/config/application.rb
	vendor/plugins/NewBlog/test/dummy/config/boot.rb
	vendor/plugins/NewBlog/test/dummy/config/database.yml
	vendor/plugins/NewBlog/test/dummy/config/environment.rb
	vendor/plugins/NewBlog/test/dummy/config/environments/development.rb
	vendor/plugins/NewBlog/test/dummy/config/environments/production.rb
	vendor/plugins/NewBlog/test/dummy/config/environments/test.rb
	vendor/plugins/NewBlog/test/dummy/config/initializers/secret_token.rb
	vendor/plugins/NewBlog/test/dummy/config/initializers/session_store.rb
	vendor/plugins/NewBlog/test/dummy/config/initializers/wrap_parameters.rb
	vendor/plugins/NewBlog/test/dummy/config/locales/en.yml
	vendor/plugins/NewBlog/test/dummy/config/mongoid.yml
	vendor/plugins/NewBlog/test/dummy/config/routes.rb
	vendor/plugins/NewBlog/test/integration/navigation_test.rb
	vendor/plugins/NewBlog/test/test_helper.rb
2012-01-12 18:15:43 +08:00
Matthew Fu c0efb5d1bc Listing for Module-apps 2012-01-12 14:13:41 +08:00
unknown ec235bcaa3 merge with master 2012-01-11 20:31:52 +08:00
Matthew Fu cae3daa9c4 Change NewBlog to new_blog 2012-01-10 18:29:11 +08:00
Matthew Fu 79f778ad8c creating for disabling widgets and frontend 2012-01-05 16:21:33 +08:00
Matthew Fu 7b40706aed fixing for app_auth 2012-01-05 16:20:51 +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 d85f29e65c Fix missing modification for "panel_main" to "back_main" 2011-12-29 17:49:48 +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 ea19f11fe2 Integrate Harry's modifications to reload pop-up content 2011-12-29 14:09:06 +08:00
chris2tof b002c411ce Merge branch 'design_team' 2011-12-28 21:03:35 +08:00
Christophe Vilayphiou 75c9851dbc Ray's back-end modifications for sub-roles 2011-12-28 20:57:18 +08:00
chris2tof 090493fd51 Re-commit 2011-12-28 20:51:52 +08:00
chris2tof 245def9cb6 Integration of pop-up and generic js.erb 2011-12-28 20:49:53 +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
Matthew Fu d3ca1647be fix page form bugs 2011-12-23 13:54:28 +08:00
chris2tof a9f06b9517 Divide parser into sub-parsers 2011-12-22 16:23:48 +08:00
chris2tof d465febca7 merge with november_presentation 2011-12-22 15:43:38 +08:00
chris2tof e7c9816139 Move NewBlog to built_in_modules and delete "vendor/templates" 2011-12-22 01:38:27 +08:00
chris2tof a09f8e4551 merge with november_presentation 2011-12-20 16:47:17 +08:00
chris2tof afbffe37d5 Users can now be saved with sub_roles 2011-12-20 14:35:28 +08:00
chris2tof 4108ebf06d Fix mongoid deeply nested polimorphic
Got the commit from github. The roles and sub_roles save.
2011-12-19 21:22:26 +08:00
chris2tof d27d7a623c Changes for sub_roles
Issues: update doesn't create new i18n_variables, role form has bugs
2011-12-18 10:07:42 +08:00
chris2tof d23cf152da Merge 'standardization' and 'role structure modification' 2011-12-10 18:21:59 +08:00
chris2tof b7ac5478b4 Change role structure
Still needs to: change the views and create sub_roles in the dev.rake
2011-12-10 18:12:39 +08:00
Christophe Vilayphiou f774084e9a Back-end standardization 2011-12-10 18:03:32 +08:00
chris2tof e0cdedfa2e Remove useless controller and view
user_attributes_controller and user_attributes views
2011-12-06 18:12:12 +08:00
chris2tof b77282c643 Test redmine service-hook 2011-12-05 19:28:06 +08:00
chris2tof 69a8fce64a Fix double loading bug
On an html load, the page was reload by the js "popstate"
2011-12-05 11:22:32 +08:00
chris2tof 26b49dcf02 Remove js from html 2011-12-05 10:36:25 +08:00
chris2tof 962bf03af2 Remove snippet 2011-12-05 10:27:22 +08:00
chris2tof f3f405c1b4 Remove useless files in items 2011-12-05 09:56:26 +08:00
chris2tof 75a3c4d5b1 Modify assets
Each layout has a manifest for css and js
2011-12-05 09:54:41 +08:00
chris2tof a0ec38ca99 Merge with branch november_presentation 2011-12-01 13:50:49 +08:00
chris2tof b68f5e11e5 Final modifications for the presentation 2011-11-22 18:54:10 +08:00
chris2tof 66bc0ce560 Modified dev.rake 2011-11-20 03:16:35 +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 dac6348402 Integration of module_app workflow 2011-11-19 14:33:26 +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 c4810274ec Rescue nil values for attribute_values in User 2011-11-16 18:41:09 +08:00
chris2tof bcf487f264 Merge branch 'november_presentation' of github.com:Rulingcom/orbit into november_presentation 2011-11-16 18:37:29 +08:00
chris2tof 0556dc9297 ika's modification to the backend 2011-11-16 18:34:54 +08:00
Matthew Fu 5c3ae104f0 Add log info for asking restart after app module installed 2011-11-16 17:01:44 +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
chris2tof d9d7099da6 Fix bug: users can now be saved 2011-11-12 17:54:45 +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 2e86d8081f Modifications for images in html code 2011-10-18 11:21:24 +08:00
chris2tof 0ca354cfd0 Clean code and new image uploader 2011-09-14 15:11:50 +08:00
chris2tof f2e3cb00db Fix bug when editing a page, the theme wasn't including blank 2011-09-13 14:03:03 +08:00
chris2tof 4db88282a1 Modification in Design structure_css -> default_css 2011-09-13 11:57:20 +08:00
chris2tof 07ccacb7d7 Modifications of the JS in Design 2011-09-09 15:40:13 +08:00
chris2tof 77b8fcdd1d Fix previous workaround for the uploaded Design 2011-09-09 13:44:43 +08:00
chris2tof a571d1dcff Clean code and workaround mongoid embedded with carrierwave 2011-09-08 18:12:04 +08:00
chris2tof a1391493a3 Revert change in layout/admin.html.erb 2011-09-07 14:03:53 +08:00
chris2tof 0956e9784a Fix bug in layout, parser and change lib/fraisier 2011-09-07 11:53:16 +08:00
chris2tof 22c9ca4c74 Handle "reset.css" and add link in the generated menu 2011-09-05 16:06:17 +08:00
chris2tof 151f005815 structure.css -> default.css
Themes are optional, a theme overrides style in default.css
2011-09-05 15:18:36 +08:00
chris2tof f4b1d1e182 Modifications in Layout
In the layout file we can have "contents" (for editable content) and
"layout_parts" (for when the layout is created from scratch)
2011-09-05 01:14:49 +08:00
chris2tof b2c0047d0f Modification in parse_urls in both layout.rb and theme.rb 2011-09-02 19:19:34 +08:00
chris2tof 25355e9c7f Force encoding and stip filename in Theme::parse_urls 2011-09-01 19:14:34 +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 f78400c274 Clean code
Moved the unzip_design method as protected
2011-09-01 19:06:49 +08:00
chris2tof 492f691469 Modifications for menu in Design 2011-09-01 09:12:49 +08:00
chris2tof 294e06d630 Change "RulingSite" into "Orbit" 2011-08-25 17:59:49 +08:00
chris2tof 983c86e653 Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1 2011-08-25 16:04:47 +08:00
chris2tof 8b576cac48 Fix bug when selecting theme 2011-08-25 15:44:52 +08:00
chris2tof 230842d26a Ika fix bug 2011-08-25 15:44:51 +08:00
chris2tof 32849f1d1b Set default design to first design 2011-08-25 15:08:42 +08:00
chris2tof c248b729db CSS problem for page 2011-08-25 15:08:23 +08:00
chris2tof f898a29fdf Add site link in menu 2011-08-25 08:56:01 +08:00
chris2tof 2afe961416 Modify check if site is up-to-date 2011-08-25 08:30:18 +08:00
chris2tof 4540f23a3f Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1 2011-08-25 08:18:22 +08:00
chris2tof c427e2af14 Page form with drop down. Modifications for Designs 2011-08-25 08:13:38 +08:00
chris2tof c678545160 Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1 2011-08-25 08:08:09 +08:00
chris2tof 4cd9854706 Ika's changes 2011-08-25 08:07:18 +08:00
chris2tof 27d47215e9 Modify edit page. Still need to handle "form" with drop down lists 2011-08-24 02:34:24 +08:00
chris2tof 1d214bedec Revert "Revert "Clean code and add 'name' in theme.rb""
This reverts commit 00813c9060.
2011-08-24 02:06:27 +08:00
chris2tof 00813c9060 Revert "Clean code and add 'name' in theme.rb"
This reverts commit 608180646b.
2011-08-24 02:04:54 +08:00
chris2tof 608180646b Clean code and add 'name' in theme.rb 2011-08-24 01:39:28 +08:00
chris2tof 118455aa81 Check if site is up-to-date 2011-08-23 19:40:49 +08:00
chris2tof e0e14ddfac Modify purchases list 2011-08-23 16:33:01 +08:00
chris2tof 09cdb9a852 CSS modifications for design team 2011-08-23 15:59:07 +08:00