chris
|
26a8be2f0f
|
Fix bulletins_controller.rb missing 'end'
|
2013-07-19 19:52:44 +08:00 |
Matt K. Fu
|
8043573370
|
fix delay impressionist for tags and pages
|
2013-07-19 17:00:38 +08:00 |
Matt K. Fu
|
ceac2b842c
|
fix impression page counter
|
2013-07-18 12:04:37 +08:00 |
Matt K. Fu
|
7729161123
|
fix for passing args. code in complete,fronted controller need to take care params,too. backend parser need to catch up.
|
2013-06-06 17:38:17 +08:00 |
Matt K. Fu
|
30824d1620
|
add search to archive
|
2013-06-05 18:03:09 +08:00 |
Matt K. Fu
|
54a35b30be
|
fix design index bug when start start from blank DB.
add delay impressionist.
add several i18n vars
|
2013-05-23 12:07:43 +08:00 |
Matt K. Fu
|
3d0a1cef56
|
1.fix for syntax error.
2.Making production console works.
3.Making blank site member no errors.
|
2013-05-22 16:25:12 +08:00 |
chris
|
127ab3845c
|
Changes for queries
|
2013-05-03 12:12:19 +08:00 |
chris
|
167a71272a
|
queries need to be rethink
|
2013-05-03 12:12:19 +08:00 |
Matt K. Fu
|
caf0426bd4
|
bulletin search
|
2013-05-01 12:16:28 +08:00 |
Matt K. Fu
|
64101109dd
|
disable all sorted_tags
|
2013-04-26 18:07:59 +08:00 |
Matthew K. Fu JuYuan
|
d047a3d62a
|
chris tags update
|
2013-04-26 11:26:10 +08:00 |
Fu Matthew
|
4a08a1992b
|
1.make module app forbid unearthed access except from admin
2.override sidebar link when it's object_auth or app_auth.
|
2013-04-17 10:56:15 +08:00 |
chris
|
f3c809fd58
|
Fix link switch not showing for default front end
|
2013-03-19 17:49:46 +08:00 |
chris
|
b864cc0268
|
Changes in I18n (except personal_conference and personal_journal)
|
2013-03-12 18:13:48 +08:00 |
chris
|
61648d23e1
|
Change delete_all to destroy_all
|
2013-02-19 17:39:42 +08:00 |
chris
|
3676de8a14
|
Change validation for url: can include IPs
|
2013-02-19 17:39:42 +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 |
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 |
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
|
61b0f94c04
|
Remove I18n.locale for announcement front-end
Fix counter in back-end edit
|
2012-12-28 15:34:04 +08:00 |
chris
|
e8e7c38221
|
Changes for announcement widget style 1 and categories
|
2012-12-28 14:01:04 +08:00 |
chris
|
455a27437d
|
Changes for announcement widget style 2
|
2012-12-28 13:47:30 +08:00 |
chris
|
751d3b1220
|
Announcement widget: remove I18n.locale
Add part_id in url
|
2012-12-27 16:52:58 +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
|
5f712622ad
|
default widgets and sidebar.
|
2012-12-24 16:38:35 +08:00 |
Matthew K. Fu JuYuan
|
36f6a6fdd6
|
first version of confined sidebar render
|
2012-12-24 16:17:00 +08:00 |
Rueshyna
|
b4633a2ccb
|
.not_guest_user
|
2012-12-19 19:48:13 +08:00 |
chris
|
fcbba6660b
|
Only one parser for front end
Separate site map for i18n
|
2012-12-19 17:15:31 +08:00 |
Rueshyna
|
4a8878132e
|
add content for announcement rss
|
2012-12-06 07:59:42 +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
|
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 |
chris
|
390da0e49a
|
Change icons
|
2012-11-29 00:49:53 +08:00 |
Rueshyna
|
114ca5493a
|
replace rss format with json in announcement
|
2012-11-28 13:43:48 +08:00 |
Matthew K. Fu JuYuan
|
3d573680b2
|
Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config
Conflicts:
app/models/user/attribute_value.rb
app/views/layouts/_side_bar_content.html.erb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
|
2012-11-26 17:55:53 +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 |