chris
|
6d1f919bb7
|
Fix links in default widget
|
2013-02-19 18:09:50 +08:00 |
Fu Matthew
|
0b88f7d1f8
|
deliver app config. fix wrong value cause error for default widget
|
2013-02-19 14:21:54 +08:00 |
Fu Matthew
|
572e512a1d
|
fix link for default widget
|
2013-02-19 14:21:54 +08:00 |
Fu Matthew
|
0a115906f1
|
fix i18n,reload problems
|
2013-02-19 14:21:54 +08:00 |
chris
|
b1a11b4dad
|
Remove isotope
|
2013-02-04 18:01:42 +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
|
fea1726f6d
|
fix ajax error when edit new page
|
2013-01-24 13:39:08 +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
|
9630d0a841
|
Merge branch 'new_widget_setting_interface' of github.com:Rulingcom/orbit into new_widget_setting_interface
|
2013-01-16 14:09:05 +08:00 |
Fu Matthew
|
9edf0dca54
|
ika re-redesign module widget
|
2013-01-16 14:07:09 +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 |
Rueshyna
|
758cab5ecd
|
move journal code to persional_journal modulaar
|
2013-01-14 17:53:59 +08:00 |
chris
|
54d098baf2
|
Change translation
|
2013-01-14 17:02:51 +08:00 |
chris
|
a7d1cdbb75
|
Fix for link in ad banner
|
2013-01-11 11:28:13 +08:00 |
Fu Matthew
|
ca51ebc08c
|
apply view
|
2013-01-10 18:00:58 +08:00 |
chris
|
48ce2278d0
|
Update disable time when separated picker new or reset date
|
2013-01-09 21:17:50 +08:00 |
chris
|
b49251afee
|
Date picker separated: reset time when reset date
|
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
|
41dff814fb
|
Change icons
|
2013-01-09 21:17:50 +08:00 |
Fu Matthew
|
5ab4bbd367
|
add ad_banner inner page,pic title.
|
2013-01-09 16:54:33 +08:00 |
chris
|
1d80b39dcb
|
Fix no responding when trying to access front end page
|
2013-01-09 11:23:18 +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
|
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 |
nccu
|
ea2d38b23b
|
Ika's changes for css default widgets
|
2013-01-04 11:54:58 +08:00 |
Fu Matthew
|
32c6f17613
|
fix object auth. show error message if user try to do object auth in a wrong way.
|
2013-01-02 14:34:34 +08:00 |
Rueshyna
|
a7cf6dd694
|
reverse structure order
|
2012-12-27 17:54:52 +08:00 |
Rueshyna
|
9e07794cbc
|
soft structure order
|
2012-12-27 14:37:29 +08:00 |
Rueshyna
|
81b0e3c38f
|
change ActiveSupport::SecureRandom to SecureRandom in orbit core
|
2012-12-27 12:19:42 +08:00 |
Matthew K. Fu JuYuan
|
5f712622ad
|
default widgets and sidebar.
|
2012-12-24 16:38:35 +08:00 |
Rueshyna
|
1289ad9f9d
|
fixed co-author relation bug....
|
2012-12-06 07:59:42 +08:00 |
Rueshyna
|
afd8e7e380
|
when delete co-author relation, the co-author will be reset nil
|
2012-12-06 07:59:42 +08:00 |
Rueshyna
|
7822ffc33d
|
can add relation between co-author
|
2012-12-04 00:31:06 +08:00 |
Rueshyna
|
5a9d9151d9
|
add journal list template
|
2012-12-04 00:25:58 +08:00 |
chris
|
dc3be3c9a1
|
Translation changes
|
2012-12-03 23:00:04 +08:00 |
chris
|
9c6c622a49
|
Add missing icons and css for icons in layout
|
2012-12-03 22:31:00 +08:00 |
chris
|
390da0e49a
|
Change icons
|
2012-11-29 00:49:53 +08:00 |
Matthew K. Fu JuYuan
|
77386f0284
|
disable data transform when switching attribute field type. new member stable
|
2012-11-22 21:10:35 +08:00 |
chris
|
475642d375
|
Remove news and fix default_url in ImageUploader
|
2012-11-22 09:30:25 +08:00 |
chris
|
2d0e8b37b2
|
Fix:
- Widgets for announcement
- Facebook link
- AdBanner nav
|
2012-11-21 18:42:14 +08:00 |
Matthew K. Fu JuYuan
|
96fe482d50
|
for openness
|
2012-11-20 20:20:59 +08:00 |
Matthew K. Fu JuYuan
|
2aa9a19deb
|
complete address field. still have javascript issue for fill back and display address ext fields in modal.
|
2012-11-20 09:53:37 +08:00 |
Matthew K. Fu JuYuan
|
17988f2fb2
|
address field and text field convert
|
2012-11-20 09:53:37 +08:00 |
Matthew K. Fu JuYuan
|
a85e5fcc0d
|
address field. js and style is broken
|
2012-11-20 09:53:36 +08:00 |