Matt K. Fu
|
3476237fa7
|
solved conflicts
|
2013-04-01 17:18:41 +08:00 |
chris
|
aacfcf1997
|
Fix typo in translations
|
2013-03-18 21:52:52 +08:00 |
|
chris
|
b864cc0268
|
Changes in I18n (except personal_conference and personal_journal)
|
2013-03-12 18:13:48 +08:00 |
unknown
|
f59da3ce81
|
member plugin init edit
|
2013-02-20 18:05:09 +08:00 |
|
unknown
|
bc44d38948
|
member plugin edit
|
2013-02-20 17:25:20 +08:00 |
|
unknown
|
a7bc19768e
|
member list edit
|
2013-02-20 11:12:08 +08:00 |
Fu Matthew
|
a6f6dc271c
|
fix i18n,reload problems
|
2013-02-18 15:13:31 +08:00 |
|
Fu Matthew
|
29bb92f841
|
fix member sidebar
add i18n for modules and default_widgets
|
2013-02-06 17:44:38 +08:00 |
|
chris
|
981854870a
|
Changes for mobile copyright
|
2013-02-04 18:02:11 +08:00 |
|
chris
|
6eb5061237
|
Changes for mobile map
|
2013-02-04 18:02:11 +08:00 |
|
Fu Matthew
|
71d5abae2e
|
first version of app config and modified inits.
|
2013-01-29 20:33:40 +08:00 |
|
Fu Matthew
|
bfaa22052f
|
Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config
Conflicts:
app/controllers/admin/page_parts_controller.rb
app/controllers/default_widget_controller.rb
app/uploaders/gprs_uploader.rb
app/uploaders/location_uploader.rb
app/views/admin/page_parts/_module_widget.html.erb
app/views/admin/page_parts/reload_widget_styles.js.erb
app/views/admin/page_parts/reload_widgets.js.erb
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
lib/parsers/parser_front_end.rb
vendor/built_in_modules/announcement/init.rb
vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js
vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css
vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb
vendor/built_in_modules/location/README.rdoc
vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js
vendor/built_in_modules/location/app/assets/javascripts/panel/location/back_end/locations.js
vendor/built_in_modules/location/app/assets/stylesheets/panel/gprs/back_end/locations.css
vendor/built_in_modules/location/app/assets/stylesheets/panel/location/back_end/locations.css
vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb
vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb
vendor/built_in_modules/location/app/models/location.rb
vendor/built_in_modules/location/app/uploaders/locations_uploader.rb
vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/_form.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/edit.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/index.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/new.html.erb
vendor/built_in_modules/location/config/routes.rb
vendor/built_in_modules/location/lib/location.rb
vendor/built_in_modules/location/location.gemspec
vendor/built_in_modules/location/test/functional/panel/gprs/back_end/locations_controller_test.rb
vendor/built_in_modules/location/test/functional/panel/location/back_end/locations_controller_test.rb
|
2013-01-24 16:30:02 +08:00 |
|
Fu Matthew
|
979df9ac80
|
daily commit
|
2013-01-23 18:51:18 +08:00 |
|
Fu Matthew
|
0cc616f988
|
page can use default widget
|
2013-01-21 16:56:37 +08:00 |
|
Fu Matthew
|
e1e003af6e
|
Complete new interface
|
2013-01-14 19:18:25 +08:00 |
|
Fu Matthew
|
16cfd27fe9
|
apply view
|
2013-01-14 19:18:25 +08:00 |
|
Fu Matthew
|
46b1d55ff6
|
Complete new interface
|
2013-01-14 18:49:23 +08:00 |
|
Fu Matthew
|
ca51ebc08c
|
apply view
|
2013-01-10 18:00:58 +08:00 |
|
chris
|
02e5e52159
|
Translation typo
Remove test values in ad_image form
Remove NeedReset
|
2013-01-09 21:17:50 +08:00 |
|
chris
|
1d405c3ffe
|
Add "tag" icon to orbit bar
|
2013-01-09 21:17:50 +08:00 |
|
chris
|
fac4faad6c
|
Change date picker
|
2013-01-09 05:18:16 +08:00 |
|
Fu Matthew
|
76296ab29b
|
Merge branch 'sidebar_config' into ntu
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/controllers/orbit_backend_controller.rb
app/controllers/orbit_widget_controller.rb
app/models/module_app.rb
app/views/admin/page_parts/_module_widget.html.erb
config/locales/zh_tw.yml
lib/parsers/parser_common.rb
lib/parsers/parser_front_end.rb
|
2013-01-08 14:17:21 +08:00 |
|
chris
|
83935aaa60
|
Add translations
|
2013-01-07 10:42:17 +08:00 |
|
chris
|
6c6bda988d
|
Add mobile version in site settings
|
2013-01-07 03:57:36 +08:00 |
|
chris
|
37740adb24
|
Add mobile but remove news in it
|
2013-01-07 03:03:38 +08:00 |
Rueshyna
|
cb3a9ea98b
|
change sub_menu to header in site setting
|
2013-01-03 14:46:02 +08:00 |
|
chris
|
ec96a2e0e7
|
Add page counter
|
2012-12-28 10:36:18 +08:00 |
Matthew K. Fu JuYuan
|
2dd2368378
|
remove merge marks
|
2012-12-25 11:26:23 +08:00 |
|
Matthew K. Fu JuYuan
|
49e6c33b57
|
Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
config/routes.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/init.rb
vendor/built_in_modules/archive/init.rb
vendor/built_in_modules/miss_module/config/locales/zh_tw.yml
|
2012-12-25 11:01:36 +08:00 |
|
Matthew K. Fu JuYuan
|
ec791a6646
|
keep zh_Tw alive
|
2012-12-25 10:45:33 +08:00 |
|
Matthew K. Fu JuYuan
|
5f712622ad
|
default widgets and sidebar.
|
2012-12-24 16:38:35 +08:00 |
|
Matthew K. Fu JuYuan
|
6995bb1622
|
put module app json into init,making orbit app work with module app.
|
2012-12-24 16:23:16 +08:00 |
|
chris
|
ff435a4af4
|
Change the design for the whole site form designs index
|
2012-12-07 12:14:31 +08:00 |
|
Matthew K. Fu JuYuan
|
ca290f3519
|
Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config
Conflicts:
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/init.rb
|
2012-12-05 11:36:32 +08:00 |
|
chris
|
2983b181e6
|
Fix some translations
|
2012-12-04 01:03:28 +08:00 |
|
chris
|
e2da22b29c
|
Clean translations
|
2012-12-04 00:17:12 +08:00 |
|
chris
|
dc3be3c9a1
|
Translation changes
|
2012-12-03 23:00:04 +08:00 |
|
Matthew K. Fu JuYuan
|
4bc80f2bd3
|
default widgets and sidebar.
|
2012-12-03 18:52:36 +08:00 |
|
Matthew K. Fu JuYuan
|
f9bcb27efc
|
put module app json into init,making orbit app work with module app.
|
2012-11-29 14:21:46 +08:00 |
|
Matthew K. Fu JuYuan
|
a85e5fcc0d
|
address field. js and style is broken
|
2012-11-20 09:53:36 +08:00 |
|
Matthew K. Fu JuYuan
|
be448d42c9
|
add_more ok
|
2012-11-20 09:52:50 +08:00 |
|
chris
|
43d969a72b
|
Fix attribute_field_helper and comment admin in I18n
|
2012-11-06 17:51:42 +08:00 |
|
chris
|
b40d4702d5
|
Merge branch 'master' into various_bugs
Conflicts:
config/locales/en.yml
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
|
2012-11-06 11:44:00 +08:00 |
Harry Bomrah
|
2e809c5c19
|
Calander view updated...
|
2012-11-05 11:40:11 +08:00 |
|
Matthew K. Fu JuYuan
|
beb843f75b
|
add new member with role interface. add more not usable.
role management new attribute is ok. delete is ok.
|
2012-11-04 20:42:58 +08:00 |
|
chris
|
cc5e238576
|
Fix after merge from NCCU, the translations still need to be cleaned
|
2012-10-30 11:08:26 +08:00 |
|
chris
|
65ac6980c4
|
Merge branch 'various_bugs' into nccu_master
Conflicts:
Gemfile.lock
app/assets/javascripts/ajax_form.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/application_controller.rb
app/controllers/sessions_controller.rb
app/helpers/admin/web_link_helper.rb
app/views/admin/attributes/_attribute_field.html.erb
app/views/admin/designs/_form.html.erb
app/views/admin/pages/_form.html.erb
app/views/admin/sites/_side_bar.html.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
config/locales/en.yml
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
|
2012-10-29 16:10:07 +08:00 |
|
Matthew K. Fu JuYuan
|
c305a2f687
|
add i18n variables
|
2012-10-26 11:19:56 +08:00 |
|
Matthew K. Fu JuYuan
|
03b608593d
|
can add member
|
2012-10-26 11:19:56 +08:00 |
|
Matthew K. Fu JuYuan
|
8b9cffd4f2
|
new code for attribute fields and values for new member interface
|
2012-10-26 11:19:55 +08:00 |