Commit Graph

Select branches

Hide Pull Requests

0913_nhu

0913_ntu_common

0913_ntu_ga

0913_ntu_ga_co

0913_ntu_ga_import

0913_ntu_ga_primary

0913_ntu_sa

0913_ntu_sa_en

0913_ntu_sa_regular

0913_ntue

0913_ydu

0917_ntu_mb

0917_ntu_mb_email_display_harry

0917_ntu_mb_sync_harry

1007_announcement_sorting_fix

1015_new_ui_ask_fix

1015_ntu_ga_primary_survey_b_fix

1016_new_ui_ask_module_fix

1016_ntue_fix

1017_ntu_ga

1017_ntu_ga_primary

1017_ntu_ga_rss

1018_new_ui_member_account_previlage_fix

1018_new_ui_member_settings_account

1018_ntu_ga_survey_init_fix

1021_new_ui_member_account_privilege_fix

1021_new_ui_survey_module_authorization_fix

1022_new_ui_bulletin_and_faq_init_fix

1024_new_ui_announcement_preview_fix

1029_new_ui_announcement_init_data_count_fix

1101_ntu_ga_survey_export_fix

1105_new_ui_archive_and_link_fix

1105_ntu_mb_member_fix

1108_new_ui_faq_fix

1115_new_ui_member_frontend_fix

1115_new_ui_member_role_js

1121_new_ui_member_plugins_fix

announcement_display_fix_harry

babel

backend_announcement_fix_harry

banner_fix_harry

calendar_color_category_harry

cron

desktop_devin

desktop_harry_2

development

development_dashboard_manson

fgu

fu

gallery_frontend_fix_harry

gallery_full_fix_harry

gallery_theater_url_fix_harry

geocoding_harry

isotope_fix_for_plugins_harry

jquery_update_development_harry

link_publish_fix_harry

location_category_color_added_harry

location_frontend_harry

location_widget_category_fix_harry

lukas/picked_announcement

master

more_button_harry

mtu_ga_

new_more_button_harry

nkut

nkut_footer

no_idea_harry

ntu_cph

ntu_cph_1115

ntu_cph_update

ntu_ga_1107_fix

ntu_ga_1118_archive_frontend_fix

ntu_mb_data_backup

ntu_mb_sso

ntu_mb_sso_server

ntue_1004_fix

ntue_1105_fix

out_of_names_harry

page_all_category_fix_harry

page_part_edit_form_load_fix_harry

ray_new_ui

site_structure_fix_harry

some_cool_fixes_harry

somthing_fixed_harry

thu

tmu_io

current_test

currently_testing

daily-0402

daily-0425

default_widget_fix_1

last_tested

latest_desktop

master_needs_this_1

master_needs_this_2

more_link_fix

orbit_beta

pick-me-to-product

pick-me-to-product-

pick-me-to-product--

pick-me-to-product---

to_master

to_master_needs_changes_for_new_ui

to_master_needs_changes_for_new_ui_1

to_master_needs_changes_for_new_ui_2

to_master_needs_changes_for_new_ui_3

to_master_needs_changes_for_new_ui_4

Mono Color

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