Rueshyna
|
f3bfe67e68
|
breadcrumb widget of back-end has done, front-end has bug...
Conflicts:
app/controllers/front_controller.rb
app/views/front/show_breadcrumb.html.erb
lib/parsers/parser_common.rb
lib/parsers/parser_front_end.rb
|
2013-02-19 17:39:41 +08:00 |
Fu Matthew
|
0a115906f1
|
fix i18n,reload problems
|
2013-02-19 14:21:54 +08:00 |
Fu Matthew
|
b7d797f9dd
|
fix member sidebar
add i18n for modules and default_widgets
|
2013-02-19 14:21:54 +08:00 |
Fu Matthew
|
fcb49723b4
|
fix sidebar icon for page.
fix i18n on sidebar
make sidebar sortable by changing db value. Need interface
|
2013-02-19 14:21:53 +08:00 |
chris
|
2b3cbc50b3
|
Fix location namespace
|
2013-02-04 18:06:45 +08:00 |
chris
|
3791046e5a
|
Add missing link to writing conference index
|
2013-02-04 18:01:42 +08:00 |
unknown
|
e244493b55
|
member plugin edit
|
2013-02-04 18:01:42 +08:00 |
Rueshyna
|
8e98aa10bc
|
modularize factories
|
2013-02-04 18:01:42 +08:00 |
Rueshyna
|
8f334f6948
|
modularize conference
|
2013-02-04 18:01:42 +08:00 |
Rueshyna
|
d4df7c82d3
|
relpace seminar to conference
|
2013-02-04 18:01:38 +08:00 |
Rueshyna
|
e0fedb4454
|
change textfiled to bilingual for co_author
|
2013-02-04 18:01:03 +08:00 |
Rueshyna
|
85ca196dec
|
add bilingual for personal journal
|
2013-02-04 18:01:03 +08:00 |
unknown
|
0b18cf48e3
|
member roles edit
|
2013-02-04 18:01:03 +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 |
Rueshyna
|
dca4f5d0be
|
mv gallery_uploader
|
2013-01-16 01:35:38 +08:00 |
Rueshyna
|
c44b4163e4
|
gprs byebye, location have two language, must have picture, long, lang have limit
|
2013-01-16 01:35:38 +08:00 |
Fu Matthew
|
91afad23ba
|
Merge branch 'new_widget_setting_interface'
|
2013-01-15 12:03:56 +08:00 |
Fu Matthew
|
8413e31048
|
add i18n
|
2013-01-15 10:25:55 +08:00 |
unknown
|
504f5027cc
|
member role edit
|
2013-01-14 19:00:08 +08:00 |
Rueshyna
|
da283e136b
|
correct personal journal language, but now hava no language config
|
2013-01-14 17:54:53 +08:00 |
Rueshyna
|
1b6bfdb80f
|
modularize personal journal and pull relational setting in desktop/index.rb
|
2013-01-14 17:54:52 +08:00 |
Rueshyna
|
68e14a7898
|
move js file to relational module but have js require problem
|
2013-01-14 17:54:52 +08:00 |
Rueshyna
|
919f951981
|
restore js,journal_pages.js,
|
2013-01-14 17:54:52 +08:00 |
Rueshyna
|
a183ac6041
|
fixed journal type page
|
2013-01-14 17:54:52 +08:00 |
Rueshyna
|
bf31d0c3dd
|
modularized personal journal
|
2013-01-14 17:54:52 +08:00 |
Rueshyna
|
758cab5ecd
|
move journal code to persional_journal modulaar
|
2013-01-14 17:53:59 +08:00 |
chris
|
de39bce4ce
|
Fix the tooltips
|
2013-01-11 12:13:16 +08:00 |
chris
|
b90e8efb1f
|
Fix filter not collapsing
Fix icon size for button
|
2013-01-11 11:37:11 +08:00 |
chris
|
41dff814fb
|
Change icons
|
2013-01-09 21:17:50 +08:00 |
Fu Matthew
|
614b6fde71
|
fix wrong html structure for announcement frontend
|
2013-01-09 12:13:55 +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 |
Fu Matthew
|
b71ebb3982
|
clean default widget
|
2013-01-07 17:20:37 +08:00 |
Fu Matthew
|
5793f0fe5d
|
default widget link.
make sure to run
rake migrate:make_default_widget_work_config
for changing announcement module app
|
2013-01-07 17:20:37 +08:00 |
chris
|
c6111460f5
|
Fix album widget options
|
2013-01-07 00:40:43 +08:00 |
chris
|
be00cec4d7
|
Fix link for ad_banner
Add missing helper for web_link_category
Show design's js in front-end
|
2013-01-07 00:36:48 +08:00 |
chris
|
7e045959b6
|
Gallery i18n
|
2013-01-04 12:01:32 +08:00 |
Rueshyna
|
8815533075
|
correct pic file format
|
2013-01-03 18:32:32 +08:00 |
Fu Matthew
|
5d6279a9ea
|
fix calendar broken
|
2013-01-03 10:58:52 +08:00 |
Rueshyna
|
f67664df29
|
custom icon for msoffice
|
2013-01-02 17:35:21 +08:00 |
Rueshyna
|
5f7453c3fb
|
generalization file type
|
2013-01-02 16:58:48 +08:00 |
Rueshyna
|
f4692182c0
|
when mouse move to button of announcement file : image => preview pic, file => type
|
2013-01-02 16:34:38 +08:00 |
Rueshyna
|
8a6f92b87b
|
fixed announcement controller syntax error
|
2013-01-02 10:19:56 +08:00 |
chris
|
9937b4ac9b
|
Fix deleting links and files in bulletin
|
2012-12-31 18:03:13 +08:00 |
chris
|
2d8400d1cc
|
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
|
2012-12-28 15:34:24 +08:00 |
chris
|
61b0f94c04
|
Remove I18n.locale for announcement front-end
Fix counter in back-end edit
|
2012-12-28 15:34:04 +08:00 |
Fu Matthew
|
5587e83419
|
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
|
2012-12-28 15:31:32 +08:00 |
Fu Matthew
|
baf1240b76
|
gallery options
|
2012-12-28 15:30:46 +08:00 |