Commit Graph

  • c6048ada82 Include therubyracer in Gemfile Christophe Vilayphiou 2012-02-07 11:18:54 +0800
  • dea9783b93 edit announcement widget unknown 2012-02-13 16:57:56 +0800
  • 3f9a041d44 Gemfile and bugs in js for orbit-bar Christophe Vilayphiou 2012-02-13 13:28:42 +0800
  • 23796396e9 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard Christophe Vilayphiou 2012-02-13 13:04:29 +0800
  • 60556c5be9 Orbit-bar in front-end and back-end, side-bar and drop-down menu Christophe Vilayphiou 2012-02-13 13:02:52 +0800
  • 98b74e5cf4 brief starting for dashboard,adds i18n vars Matthew Kaito Juyuan Fu 2012-02-10 16:43:58 +0800
  • ad34d5b8a6 include ad_banner query code. cleaned up parser Matthew Kaito Juyuan Fu 2012-02-10 10:50:03 +0800
  • 3496a37a71 Merge branch 'obj_auth' Christophe Vilayphiou 2012-02-13 02:24:52 +0800
  • bc34ad323e Merge branch 'new_announcement_dev' Christophe Vilayphiou 2012-02-13 02:23:16 +0800
  • c88e1c8419 Merge branch 'obj_auth' into announcement_dev_view_and_auth Matthew Kaito Juyuan Fu 2012-02-12 23:24:50 +0800
  • 50d3aba1a0 brief starting for dashboard,adds i18n vars Matthew Kaito Juyuan Fu 2012-02-10 16:43:58 +0800
  • 3e37f72730 Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner Matthew Kaito Juyuan Fu 2012-02-10 10:51:32 +0800
  • 79ae598c4f include ad_banner query code. cleaned up parser Matthew Kaito Juyuan Fu 2012-02-10 10:50:03 +0800
  • 32159564cd build interface to work with object auth. Go to panel/new_blog/back_end/posts/ ,click New Auth link Matthew Kaito Juyuan Fu 2012-02-09 19:04:06 +0800
  • 31d7cd5b38 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. Matthew Kaito Juyuan Fu 2012-02-09 17:48:51 +0800
  • e638c1c7c3 Change announcement route Christophe Vilayphiou 2012-02-09 15:07:43 +0800
  • 338d18e909 announcement path error unknown 2012-02-09 14:58:59 +0800
  • 3a8dbd6af4 first commit for object auth,will take new_blog for experiment Matthew Kaito Juyuan Fu 2012-02-07 16:16:48 +0800
  • e26c5529df Include therubyracer in Gemfile Christophe Vilayphiou 2012-02-07 11:18:54 +0800
  • 872a00b6a2 Forgot to change title in key in pages_controller Christophe Vilayphiou 2012-02-06 22:09:33 +0800
  • 8f885e8bb7 Use key not title for module_app in parser. Modify announcement routes. Christophe Vilayphiou 2012-02-06 16:58:19 +0800
  • e02c675595 Put back exception notifications Christophe Vilayphiou 2012-02-06 16:25:33 +0800
  • 819a896a4b Merge branch 'new_announcement_dev' of github.com:Rulingcom/orbit into new_announcement_dev Christophe Vilayphiou 2012-02-06 16:21:32 +0800
  • f097f83f2b announcement_category edit unknown 2012-02-06 15:23:27 +0800
  • 65901edf6f Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner Christophe Vilayphiou 2012-02-06 16:18:15 +0800
  • 8b3b71ca58 fix js bugs,partial bugs Matthew Kaito Juyuan Fu 2012-02-04 10:32:24 +0800
  • e0409c2c8e Merge branch 'new_announcement_dev' of https://github.com/Rulingcom/orbit into new_announcement_dev unknown 2012-02-06 15:46:17 +0800
  • ca735e43ce announcement_category edit unknown 2012-02-06 15:23:27 +0800
  • fff918cd78 Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner Matthew Kaito Juyuan Fu 2012-02-04 10:35:40 +0800
  • ac0b681779 fix js bugs,partial bugs Matthew Kaito Juyuan Fu 2012-02-04 10:32:24 +0800
  • dec2359c3f Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner Christophe Vilayphiou 2012-02-04 09:40:58 +0800
  • 0af37c0688 Add rake task for ad_banner. Will have ad_banner at dev:build Matthew Kaito Juyuan Fu 2012-02-03 18:02:27 +0800
  • 394099c388 Ad banner close complete,need validation Matthew Kaito Juyuan Fu 2012-02-03 15:14:42 +0800
  • 68cea1ea49 AdBanner is now working Matthew Kaito Juyuan Fu 2012-02-02 09:55:09 +0800
  • 2b2b057583 Add rake task for ad_banner. Will have ad_banner at dev:build Matthew Kaito Juyuan Fu 2012-02-03 18:02:27 +0800
  • d107d54a82 Ad banner close complete,need validation Matthew Kaito Juyuan Fu 2012-02-03 15:14:42 +0800
  • f530eb7112 Revert "mistake commit" Matthew Kaito Juyuan Fu 2012-02-03 14:39:15 +0800
  • 2608b72d65 mistake commit Matthew Kaito Juyuan Fu 2012-02-03 14:28:08 +0800
  • 5cebb638ce AdBanner is now working Matthew Kaito Juyuan Fu 2012-02-02 09:55:09 +0800
  • dddd1f33fd Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team verts commit 331d2c28ef. Christophe Vilayphiou 2012-02-01 14:38:35 +0800
  • 6b9a6b99b1 Merge branch 'ad_plugin' of github.com:Rulingcom/orbit into ad_plugin Christophe Vilayphiou 2012-02-01 14:30:34 +0800
  • 331d2c28ef Merge branches 'master' and 'ad_plugin' into design_team Christophe Vilayphiou 2012-02-01 14:28:53 +0800
  • a980847eb3 Basic function for AdBanner Matthew Kaito Juyuan Fu 2012-01-31 18:31:31 +0800
  • 3287b68354 Basic function for ad_banner Matthew Fu 2012-01-31 18:23:32 +0800
  • dcecb78afb Basic function for AdBanner Matthew Kaito Juyuan Fu 2012-01-31 18:31:31 +0800
  • ec428f240c Basic function for ad_banner Matthew Fu 2012-01-31 18:23:32 +0800
  • 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. Christophe Vilayphiou 2012-01-31 16:38:25 +0800
  • 4906894fb5 Page edit wasn't showing when module_app was nil Christophe Vilayphiou 2012-01-31 16:35:40 +0800
  • 762c2f5e8a Add key in module_app.rb to use instead of title for authorization Christophe Vilayphiou 2012-01-30 18:12:18 +0800
  • 7f999f20ab Modify rake.dev for new design structure Christophe Vilayphiou 2012-01-30 15:45:55 +0800
  • 46db173e0b Modifications in the Design code: the uploader works but the edit is broken Christophe Vilayphiou 2012-01-26 12:05:25 +0800
  • 783eae4597 Change "NewBlog" folders into "new_blog" in assets Modify routes and pages handling for clean front-end urls Christophe Vilayphiou 2012-01-24 18:16:58 +0800
  • 6a196c5d3d Embedded to referenced for users Christophe Vilayphiou 2012-01-24 15:12:06 +0800
  • 83827f82ec Fix custom image class Christophe Vilayphiou 2012-01-24 15:11:42 +0800
  • b8243df5b5 Update gems but stay on rails 3.1 for now Christophe Vilayphiou 2012-01-24 13:07:40 +0800
  • 8ce796b667 Merge branch 'fix_it' of github.com:Rulingcom/orbit into fix_it Christophe Vilayphiou 2012-01-24 12:30:57 +0800
  • afbb9e266a User role and sub_role simple interface complete Matthew Fu 2012-01-19 17:47:52 +0800
  • 25cbe0c2a5 update app package for previous commit Matthew Fu 2012-01-18 12:04:01 +0800
  • 959f3e8b2f put setup APP var setup into Orbit class Matthew Fu 2012-01-18 11:51:38 +0800
  • 4ed8a2164c First complete with manager and submanager Matthew Fu 2012-01-17 16:20:03 +0800
  • 4df8ab6cc3 Add methods to work with manager role,add task to build user test data Matthew Fu 2012-01-16 18:52:08 +0800
  • 18a82d7f47 Manger and SubManager Matthew Fu 2012-01-13 18:20:04 +0800
  • 5ae8e84b93 Merge branch 'master' of github.com:Rulingcom/orbit Christophe Vilayphiou 2012-01-24 11:59:30 +0800
  • 9fcf8280fa Change "_filename" to "_identifier" for carrierwave Christophe Vilayphiou 2012-01-24 11:36:24 +0800
  • 5518ae362d Ray's modification before redesign Christophe Vilayphiou 2012-01-24 11:38:53 +0800
  • bfd55277d7 Embed attribute_fields and sub_roles Christophe Vilayphiou 2012-01-16 08:14:05 +0800
  • 04f51f2d98 Update carrierwave chris2tof 2012-01-13 12:35:46 +0800
  • 1bbb197fba Forgot to remove ":remote => true" for asset new chris2tof 2011-12-30 02:34:13 +0800
  • b04d845a5a New rss.js from Harry and fix html form for assets chris2tof 2011-12-29 19:45:21 +0800
  • 2ed422fbc4 Merge branch 'master' of github.com:Rulingcom/orbit Christophe Vilayphiou 2012-01-24 11:48:51 +0800
  • 5f684ba0f4 Change "_filename" to "_identifier" for carrierwave Christophe Vilayphiou 2012-01-24 11:36:24 +0800
  • 9ea613cf4e Embed attribute_fields and sub_roles Christophe Vilayphiou 2012-01-16 08:14:05 +0800
  • 4d2809d40b Update carrierwave chris2tof 2012-01-13 12:35:46 +0800
  • 6ee1d71c64 Ray's modification before redesign Christophe Vilayphiou 2012-01-24 11:38:53 +0800
  • 68ad208777 announcement widget page unknown 2012-01-20 16:36:25 +0800
  • 2c8940e350 announcement widget page unknown 2012-01-20 14:04:52 +0800
  • d284e1e26b User role and sub_role simple interface complete Matthew Fu 2012-01-19 17:47:52 +0800
  • 4cfae9c107 announcement widget query unknown 2012-01-18 21:34:26 +0800
  • f1a3008e2b update app package for previous commit Matthew Fu 2012-01-18 12:04:01 +0800
  • 37b8b85554 put setup APP var setup into Orbit class Matthew Fu 2012-01-18 11:51:38 +0800
  • 9fa6131ad3 First complete with manager and submanager Matthew Fu 2012-01-17 16:20:03 +0800
  • 1dea9ba156 Add methods to work with manager role,add task to build user test data Matthew Fu 2012-01-16 18:52:08 +0800
  • b6eba5ad9d Merge branch 'carrierwave' Christophe Vilayphiou 2012-01-16 08:14:18 +0800
  • f86777b617 Embed attribute_fields and sub_roles Christophe Vilayphiou 2012-01-16 08:14:05 +0800
  • b4f2354642 Merge branch 'master' into design_team Christophe Vilayphiou 2012-01-16 08:07:49 +0800
  • 3e912b6262 Merge branches 'master' and 'exception_notification' into new_announcement_dev Christophe Vilayphiou 2012-01-16 07:57:40 +0800
  • 7e7fc69a37 add announcemet search & set top unknown 2012-01-13 19:15:03 +0800
  • 42c89220e3 Manger and SubManager Matthew Fu 2012-01-13 18:20:04 +0800
  • a55a93cb3b Add exception notification in development env Christophe Vilayphiou 2012-01-13 15:49:07 +0800
  • 4cdef76550 Update carrierwave chris2tof 2012-01-13 12:35:46 +0800
  • 4b838b5ef5 edit announcement upload & show unknown 2012-01-12 18:38:50 +0800
  • 4be97f6ea6 Merge branch 'fix_it' chris2tof 2012-01-12 18:15:43 +0800
  • c0efb5d1bc Listing for Module-apps Matthew Fu 2012-01-12 14:13:41 +0800
  • ec235bcaa3 merge with master unknown 2012-01-11 20:31:52 +0800
  • 9f93af100b merge with master unknown 2012-01-11 20:14:28 +0800
  • 3d9fd359ed Moving Orbit frontend and widget controller to controllers folder Matthew Fu 2012-01-10 18:30:08 +0800
  • cae3daa9c4 Change NewBlog to new_blog Matthew Fu 2012-01-10 18:29:11 +0800
  • 79f778ad8c creating for disabling widgets and frontend Matthew Fu 2012-01-05 16:21:33 +0800
  • 7b40706aed fixing for app_auth Matthew Fu 2012-01-05 16:20:51 +0800
  • 1dd85d6ff1 Forgot to remove ":remote => true" for asset new chris2tof 2011-12-30 02:34:13 +0800