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

• f4fda08e86 Replace PrototypeR4 by Orbit. Move session into mongoid_store. Reset session when sing_in. Christophe Vilayphiou 2012-03-05 16:19:08 +08:00
• 785ead5209 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard Christophe Vilayphiou 2012-03-16 14:55:21 +08:00
• 6f6e84b015 fix dashboard & announcement unknown 2012-03-14 20:05:03 +08:00
• b6d49df145 Change Obit to Orbit Christophe Vilayphiou 2012-03-16 11:20:16 +08:00
• 13b6892f87 code for new fact check Matt Fu 2012-03-16 11:09:44 +08:00
• 00ab773942 fix dashboard & announcement unknown 2012-03-14 20:05:03 +08:00
• db9608d918 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-03-07 18:17:40 +08:00
• 3e22c6e61b Add bootstrap-orbit.css in front-end Christophe Vilayphiou 2012-03-07 11:37:00 +08:00
• 79c8b3861b Fix link in widget Christophe Vilayphiou 2012-03-01 14:12:47 +08:00
• 4dd9b7ffa4 Fix announcement pagination in front-end Christophe Vilayphiou 2012-03-01 10:58:31 +08:00
• 0b1f83c042 Fix extra loaded js: the widgets only need to render layout when they need js. Christophe Vilayphiou 2012-03-01 10:57:13 +08:00
• 900855724c Add bootstrap-orbit.css in front-end Christophe Vilayphiou 2012-03-07 11:37:00 +08:00
• d5a2de5476 LDAP with sync rake task Matt Fu 2012-03-06 16:41:06 +08:00
• 826a5a5f20 Fix link in widget Christophe Vilayphiou 2012-03-01 14:12:47 +08:00
• 9ae140204f Fix announcement pagination in front-end Christophe Vilayphiou 2012-03-01 10:58:31 +08:00
• ebf3a2eae4 Fix extra loaded js: the widgets only need to render layout when they need js. Christophe Vilayphiou 2012-03-01 10:57:13 +08:00
• 7f05f21930 Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap Matt Fu 2012-03-01 10:13:49 +08:00
• 7c55f6fb88 Merge branch 'announcement_dev_view_and_auth' of github.com:Rulingcom/orbit into announcement_dev_view_and_auth Christophe Vilayphiou 2012-02-29 19:03:29 +08:00
• 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. Matt Fu 2012-02-17 17:50:23 +08:00
• 8932615f05 add "all_user" for app&object auth Matthew Kaito Juyuan Fu 2012-02-16 14:59:26 +08:00
• 2e58c63ff7 fix bugs with token Matthew Kaito Juyuan Fu 2012-02-16 13:57:28 +08:00
• cc550c5745 First version for App and Object auth.Taking Announcement as experiment Matthew Kaito Juyuan Fu 2012-02-15 18:20:44 +08:00
• 3bcd7ea349 Exp with object_auth Matthew Kaito Juyuan Fu 2012-02-13 17:33:48 +08:00
• 6b2aeadde6 Changes for nccu Christophe Vilayphiou 2012-02-29 16:01:50 +08:00
• 819f815023 for different database for demo Matt Fu 2012-02-29 13:15:25 +08:00
• 9a40ecd1d9 Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine Matt Fu 2012-02-29 13:07:21 +08:00
• 5223a7a3e9 Css and js changes Christophe Vilayphiou 2012-02-29 12:45:47 +08:00
• b84b7bad63 ldap config for 0229 nccu demo Matt Fu 2012-02-29 12:35:54 +08:00
• 0a23ce7b24 Add missing i18n for announcement Christophe Vilayphiou 2012-02-29 12:00:16 +08:00
• 438dc0ad3d i18n vars for announcement Matt Fu 2012-02-29 11:54:48 +08:00
• ccb61fc2dd change Search bar Matt Fu 2012-02-29 11:29:13 +08:00
• b83a783a26 Add translation files for Announcement Matt Fu 2012-02-29 11:12:34 +08:00
• 10fd8ce455 Change locales for orbit Matt Fu 2012-02-29 10:48:15 +08:00
• 0fa5c3ba9d Fix bug in orbit-bar Christophe Vilayphiou 2012-02-29 04:56:52 +08:00
• 344ec86c57 Remove class 'error' in devise forms Christophe Vilayphiou 2012-02-29 04:56:32 +08:00
• 4b7b57bb3d Add some missing translations Christophe Vilayphiou 2012-02-29 04:48:21 +08:00
• 9aa4173933 Change orbit-bar for language but bug when user name is too long Christophe Vilayphiou 2012-02-29 04:21:56 +08:00
• 18617850e5 Add categories for all the widgets Christophe Vilayphiou 2012-02-28 22:00:05 +08:00
• 6a30b0a1e4 Add RSS event Christophe Vilayphiou 2012-02-28 18:29:13 +08:00
• fdf4cfad2d Add category for announcement widget Christophe Vilayphiou 2012-02-28 14:08:57 +08:00
• 7f9a7edc98 Changes in bulletins widget and front-end, add categories to link Christophe Vilayphiou 2012-02-28 04:24:09 +08:00
• 81bb3120ca Merge branches 'new_announcement_dev' and 'design_team' into dashboard Christophe Vilayphiou 2012-02-27 18:57:56 +08:00
• 3adfeb91a6 Merge branches 'design_team' and 'dashboard' into new_announcement_dev Christophe Vilayphiou 2012-02-27 18:57:07 +08:00
• fe4c0986e7 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-02-27 18:56:15 +08:00
• 0029ef2b5a Fix bug due to image_filename -> image_identifier Christophe Vilayphiou 2012-02-27 18:40:08 +08:00
• 680b28023a Fix ad_banner loading Christophe Vilayphiou 2012-02-27 17:48:30 +08:00
• f13ebc6c46 Fix bugs and changes for nccu Christophe Vilayphiou 2012-02-24 19:11:51 +08:00
• 70b4c83cf5 Fix bugs and changes for nccu Christophe Vilayphiou 2012-02-24 19:11:51 +08:00
• 3209f9aa27 Complete for 229 check. Matt Fu 2012-02-24 19:07:47 +08:00
• f4d663c67d Temporary changes for announcement form Christophe Vilayphiou 2012-02-24 15:35:21 +08:00
• dcc64a20d2 Finish sorting for announcements Christophe Vilayphiou 2012-02-24 15:30:49 +08:00
• 8f531a6fe5 Fix bus for pages and page content Christophe Vilayphiou 2012-02-24 15:14:23 +08:00
• f8d1d7242d Merge branch 'design_team' into dashboard Christophe Vilayphiou 2012-02-23 16:05:33 +08:00
• 1a6e497b3d Ika's changes Christophe Vilayphiou 2012-02-23 15:53:15 +08:00
• 63d7810b35 Add isotope, categories for announcement page, sort for announcement Christophe Vilayphiou 2012-02-23 15:48:23 +08:00
• 53ed4b0404 Initial changes in announcement for sorting and filtering Christophe Vilayphiou 2012-02-22 13:44:01 +08:00
• 22d9741ac8 Fix for orbit_bar Christophe Vilayphiou 2012-02-21 14:28:05 +08:00
• ba4d71a026 Changes in orbit_bar and js in announcements Christophe Vilayphiou 2012-02-21 01:13:22 +08:00
• 48d94d5e15 Fix bug widget when no bulletins or web_links, put link in bulletins Christophe Vilayphiou 2012-02-20 18:19:26 +08:00
• ad27537cf7 Change pagination in bulletins Christophe Vilayphiou 2012-02-20 17:48:04 +08:00
• 20c320961f edit page_content unknown 2012-02-23 15:13:36 +08:00
• 678f1eabef LDAP connection and modified Devise Matt Fu 2012-02-22 14:43:24 +08:00
• 9b001aa6c3 new page_content app unknown 2012-02-21 19:22:42 +08:00
• b0834c0c62 Merge branch 'new_announcement_dev' of https://github.com/Rulingcom/orbit into new_announcement_dev unknown 2012-02-20 16:25:29 +08:00
• e82fd405c9 remove bulletins_list unknown 2012-02-20 16:23:54 +08:00
• 1146506063 Fix bug when no bulletins or web_links Christophe Vilayphiou 2012-02-20 15:56:17 +08:00
• c304819d6b Commented out code for Windows Christophe Vilayphiou 2012-02-20 08:55:21 +08:00
• f43646c9b6 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-02-20 08:52:36 +08:00
• cf038183b9 Ika's changes in modules Christophe Vilayphiou 2012-02-19 17:43:47 +08:00
• 7d57b50e46 Widget for announcement and web_link with ajax reload and pagination Christophe Vilayphiou 2012-02-20 08:34:36 +08:00
• 2989366fa4 Merge branches 'new_announcement_dev' and 'new_announcement_dev' of github.com:Rulingcom/orbit into new_announcement_dev Christophe Vilayphiou 2012-02-20 03:25:36 +08:00
• 78a139ff38 update announcement & web_resource widget unknown 2012-02-17 19:45:48 +08:00
• a3f152b200 Changes for jquery 1.7 (.live -> .on), create module_layout Christophe Vilayphiou 2012-02-20 03:24:05 +08:00
• 3ff2e7867e Fix bug when editing home Christophe Vilayphiou 2012-02-20 03:22:53 +08:00
• 434e464f17 Ika's changes in modules Christophe Vilayphiou 2012-02-19 17:43:47 +08:00
• 44a346ffe9 Changes for orbit bar, login Christophe Vilayphiou 2012-02-19 16:33:22 +08:00
• daebaa43f8 update announcement & web_resource widget unknown 2012-02-17 19:45:48 +08:00
• 26cd6951db 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. Matt Fu 2012-02-17 17:50:23 +08:00
• 0b71714d44 Improve code in items, pages, links Christophe Vilayphiou 2012-02-17 14:54:11 +08:00
• cf4a6c0b35 Remove useless destroy methods Christophe Vilayphiou 2012-02-17 12:26:03 +08:00
• cbe3ccc6fe Merge branches 'master' and 'design_team' into dashboard Christophe Vilayphiou 2012-02-17 11:00:29 +08:00
• 9cd3cbc478 Modifications for design, pages, page_parts… Move orbit_bar out of kernel.js Christophe Vilayphiou 2012-02-16 19:14:16 +08:00
• 5da75161c4 announcemenet & web_resource widget unknown 2012-02-16 17:52:49 +08:00
• 9305c2045c add "all_user" for app&object auth Matthew Kaito Juyuan Fu 2012-02-16 14:59:26 +08:00
• d2689bc59c fix bugs with token Matthew Kaito Juyuan Fu 2012-02-16 13:57:28 +08:00
• e61aa6b210 Modify dev.rake to create the ModuleApp object for web_recsource Christophe Vilayphiou 2012-02-16 13:28:51 +08:00
• 4389f0cf28 Add new created files to previous commit Christophe Vilayphiou 2012-02-16 12:18:27 +08:00
• e0accbecaa Changes into page_part edition. Can choose between 'text', 'public_r_tag' and 'widget' Christophe Vilayphiou 2012-02-16 12:16:27 +08:00
• 7ea1745f73 items error unknown 2012-02-16 11:30:54 +08:00
• 5640e07733 First version for App and Object auth.Taking Announcement as experiment Matthew Kaito Juyuan Fu 2012-02-15 18:20:44 +08:00
• 4d361857cb Fix tags in web_resource Christophe Vilayphiou 2012-02-15 15:47:05 +08:00
• edf236c1c7 edit tags unknown 2012-02-15 15:38:27 +08:00
• af3a2547e1 Change ModuleAppTag into "Module name"Tag. Christophe Vilayphiou 2012-02-15 15:18:11 +08:00
• d0c2856a3a Fix relations error in tags Christophe Vilayphiou 2012-02-15 11:42:19 +08:00
• 778a85ca2b add tags unknown 2012-02-15 10:37:07 +08:00
• 6b551defce Remove therubyracer, it's already a dependency of execjs Christophe Vilayphiou 2012-02-15 10:07:41 +08:00
• 1913f0aca8 Add tinymce Christophe Vilayphiou 2012-02-15 10:02:05 +08:00
• a0f58b543b Remove ckeditor Christophe Vilayphiou 2012-02-15 01:05:24 +08:00
• a2d2e7cc3f Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard Christophe Vilayphiou 2012-02-15 00:42:29 +08:00
• 3e70634add Announcement modifications and tags Christophe Vilayphiou 2012-02-15 00:32:20 +08:00