Matt K. Fu
|
3e567223e3
|
fix for Spen's translation and Chris's tag error
|
2013-04-26 15:37:27 +08:00 |
Matthew K. Fu JuYuan
|
d047a3d62a
|
chris tags update
|
2013-04-26 11:26:10 +08:00 |
Spen
|
697944a029
|
user id set & user fields set & role set & member frontend list & user translation & create new member bug fix
|
2013-04-25 19:59:59 +08:00 |
Matt K. Fu
|
b198b1a17b
|
system preference
|
2013-04-24 19:21:11 +08:00 |
Matt K. Fu
|
62fa589e8a
|
add msg when user session expired at page admin
|
2013-04-24 11:58:48 +08:00 |
Matt K. Fu
|
5ff7dfbac6
|
fronted open switch and backend openness
|
2013-04-23 18:48:18 +08:00 |
Matt K. Fu
|
3de4591413
|
fix frontend ajax respond 404 due to javascript overwritten after assets precompile
|
2013-04-17 14:19:32 +08:00 |
Matt K. Fu
|
425a320c02
|
fix widget and fronted setting interface. checked with Spen
|
2013-04-17 14:16:24 +08:00 |
Matt K. Fu
|
0781779ac0
|
solved conflicts
|
2013-04-17 14:14:24 +08:00 |
Matt K. Fu
|
0f6f5aafce
|
fix for both part and page part settings
Conflicts:
app/helpers/admin/page_parts_helper.rb
app/views/admin/pages/reload_front_end_setting.js.erb
app/views/admin/pages/reload_frontend_pages.js.erb
|
2013-04-17 14:12:52 +08:00 |
Fu Matthew
|
f6b600df59
|
deliver API
|
2013-04-17 14:09:01 +08:00 |
Fu Matthew
|
9815950083
|
now default options can be chosen by developer at init
|
2013-04-17 11:07:45 +08:00 |
Fu Matthew
|
69a49a69aa
|
style for front end
|
2013-04-17 11:05:57 +08:00 |
Fu Matthew
|
8e98cb3ec9
|
put add admin pages using orbit back end controller
|
2013-04-17 10:54:38 +08:00 |
chris
|
b864cc0268
|
Changes in I18n (except personal_conference and personal_journal)
|
2013-03-12 18:13:48 +08:00 |
Spen
|
d7d480ac12
|
archive edit & plugins edit
|
2013-03-07 21:12:31 +08:00 |
Fu Matthew
|
15b9839b76
|
fix archive category
fix page adding failed
|
2013-03-04 14:40:29 +08:00 |
Fu Matthew
|
0dabd5b95f
|
fix widget field reload
|
2013-02-27 10:51:41 +08:00 |
Fu Matthew
|
071e8a349c
|
link to more
|
2013-02-27 10:50:50 +08:00 |
Fu Matthew
|
8a8bfcb8fb
|
fix default widget link
|
2013-02-27 10:50:47 +08:00 |
Fu Matthew
|
d7699e1a46
|
fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
|
2013-02-27 10:49:51 +08:00 |
Fu Matthew
|
0e6599e9b9
|
fix javascript disable checkbox failed after cate and tags being reloaded.
|
2013-02-27 10:49:51 +08:00 |
Fu Matthew
|
99e67c8719
|
first version of multi categories and tags
|
2013-02-27 10:49:48 +08:00 |
chris
|
3572856486
|
Fix selection of sub_menu for widget (the value wasn't set)
|
2013-02-25 10:35:59 +08:00 |
chris
|
caac9191ce
|
Fix public_r_tag selection
|
2013-02-23 16:52:37 +08:00 |
unknown
|
d46abd7caf
|
member list edit
|
2013-02-21 14:13:46 +08:00 |
chris
|
1f11293fbe
|
Fix sitemap in page edit
|
2013-02-19 17:39:43 +08:00 |
Rueshyna
|
2a61470f8b
|
back_end widget breadcrumb finish
|
2013-02-19 17:24:19 +08:00 |
Fu Matthew
|
0a115906f1
|
fix i18n,reload problems
|
2013-02-19 14:21:54 +08:00 |
chris
|
9771d42587
|
migrate for app config. fix panel style intro misplace
|
2013-02-04 18:10:39 +08:00 |
chris
|
b1a11b4dad
|
Remove isotope
|
2013-02-04 18:01:42 +08:00 |
unknown
|
0b18cf48e3
|
member roles edit
|
2013-02-04 18:01:03 +08:00 |
unknown
|
18a51f070e
|
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 |
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
|
91afad23ba
|
Merge branch 'new_widget_setting_interface'
|
2013-01-15 12:03:56 +08:00 |
Fu Matthew
|
ba75c02622
|
fix wrong behavior of new interface when a new page is newed
|
2013-01-15 12:02:13 +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 |
unknown
|
504f5027cc
|
member role edit
|
2013-01-14 19:00:08 +08:00 |
Fu Matthew
|
46b1d55ff6
|
Complete new interface
|
2013-01-14 18:49:23 +08:00 |
unknown
|
84e4a558be
|
member roles edit
|
2013-01-14 17:02:51 +08:00 |
chris
|
de39bce4ce
|
Fix the tooltips
|
2013-01-11 12:13:16 +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
|
b49251afee
|
Date picker separated: reset time when reset date
|
2013-01-09 21:17:50 +08:00 |
chris
|
41dff814fb
|
Change icons
|
2013-01-09 21:17:50 +08:00 |
Fu Matthew
|
d0f474c2ab
|
fix wrong i18n
|
2013-01-09 17:13:25 +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
|
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
|
6c6bda988d
|
Add mobile version in site settings
|
2013-01-07 03:57:36 +08:00 |
chris
|
c6111460f5
|
Fix album widget options
|
2013-01-07 00:40:43 +08:00 |
Rueshyna
|
cb3a9ea98b
|
change sub_menu to header in site setting
|
2013-01-03 14:46:02 +08:00 |
Fu Matthew
|
2c632551e5
|
fix preview filed after ad_banner created.
|
2013-01-02 17:51:53 +08:00 |
Fu Matthew
|
ded1d9f44c
|
Add lost file for widget option
|
2012-12-28 17:58:35 +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 |
chris
|
ec96a2e0e7
|
Add page counter
|
2012-12-28 10:36:18 +08:00 |
Rueshyna
|
1c07224694
|
fixed page_parts submit button
|
2012-12-28 10:12:17 +08:00 |
Rueshyna
|
9e07794cbc
|
soft structure order
|
2012-12-27 14:37:29 +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
|
fcbba6660b
|
Only one parser for front end
Separate site map for i18n
|
2012-12-19 17:15:31 +08:00 |
chris
|
a1b1fc9d34
|
Remove test
|
2012-12-07 12:32:43 +08:00 |
chris
|
ff435a4af4
|
Change the design for the whole site form designs index
|
2012-12-07 12:14:31 +08:00 |
chris
|
c74ead8318
|
Redirect to designs after buying template
Randomise buy counts
|
2012-12-07 09:07:49 +08:00 |
chris
|
af381e75de
|
Add images to store
|
2012-12-07 02:37:05 +08:00 |
chris
|
6f1748d2b3
|
- template list/show is loaded from central server
- buy a template downloads and creates it in DB
- changes in designs index
|
2012-12-06 23:20:27 +08:00 |
OrbitServer
|
b1f2749000
|
Devin's changes to integrate the store
|
2012-12-06 23:11:23 +08:00 |
unknown
|
7d3c535e01
|
add info field
|
2012-12-06 07:58:39 +08:00 |
chris
|
e68c52bc00
|
Changes for store back-end
|
2012-12-05 13:46:10 +08:00 |
chris
|
2983b181e6
|
Fix some translations
|
2012-12-04 01:03:28 +08:00 |
chris
|
dc3be3c9a1
|
Translation changes
|
2012-12-03 23:00:04 +08:00 |
chris
|
036d7bbb0e
|
Module store
|
2012-11-29 02:02:37 +08:00 |
chris
|
06335f9bd1
|
Joshua's html
|
2012-11-29 00:59:46 +08:00 |
chris
|
390da0e49a
|
Change icons
|
2012-11-29 00:49:53 +08:00 |
unknown
|
8a79d7ff2e
|
member selects
|
2012-11-26 10:25:34 +08:00 |
Matthew K. Fu JuYuan
|
9a684f54b4
|
fix for showing subroles
|
2012-11-26 10:22:36 +08:00 |
Matthew K. Fu JuYuan
|
5b39d10ac6
|
user roles starts
|
2012-11-22 21:10:35 +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 |
Matthew K. Fu JuYuan
|
1279af0c11
|
fix and hide for visitors,except for album
|
2012-11-21 18:31:57 +08:00 |
chris
|
6789d44431
|
Fix design edit
|
2012-11-20 10:04:50 +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 |
Matthew K. Fu JuYuan
|
be448d42c9
|
add_more ok
|
2012-11-20 09:52:50 +08:00 |
chris
|
69bf552fa7
|
Fix: remove i18n_variable from reload_frontend_pages.js.erb
|
2012-11-15 18:11:01 +08:00 |
chris
|
9b1ada0af9
|
Fix these bugs:
1.結構部份
a.原選單,點選編輯,無動作反應
b.新增選單後,左邊灰色架構部份不會更新
2.檔案室
a.無法編輯分類
|
2012-11-15 15:51:44 +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 |
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
|
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
|
bd0d975014
|
for user new interface, member role is working.
|
2012-10-26 11:27:37 +08:00 |
chris
|
d7fd61ce55
|
Edit uploaded package
|
2012-10-26 11:19:57 +08:00 |
Matthew K. Fu JuYuan
|
0a1a9d2c2e
|
member for THU
|
2012-10-26 11:19:56 +08:00 |
chris
|
cbfa659928
|
Changes for side_bar
|
2012-10-26 11:19:56 +08:00 |
Matthew K. Fu JuYuan
|
f4f07c7206
|
fix sub role attribute fields
run: Role.any_in(:key=>['department_admin','administrator']).destroy_all
for deleting old role data to complete this code.
|
2012-10-26 11:19:56 +08:00 |
Matthew K. Fu JuYuan
|
9c16da4f46
|
fixed html for add link. form html
|
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
|
0a56c555bb
|
new code for attribute fields and values for new member interface
|
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 |
Matthew K. Fu JuYuan
|
9f825de288
|
user new interface 70%
|
2012-10-09 06:40:18 +08:00 |
Matthew K. Fu JuYuan
|
e67ca84282
|
object_auth change to reload
|
2012-10-04 18:20:21 +08:00 |
Fu Matthew
|
dc8ca7e575
|
fix i18n.file upload failed
|
2012-09-27 13:34:40 +08:00 |
Fu Matthew
|
87904f8b8d
|
fix i18n
|
2012-09-27 11:03:08 +08:00 |
Matthew K. Fu JuYuan
|
fb3364b28e
|
Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config
|
2012-09-24 14:14:13 +08:00 |
unknown
|
975523c8b2
|
demo site plugin
|
2012-09-24 14:10:44 +08:00 |
Matthew K. Fu JuYuan
|
3a65f599e6
|
first version app config for Spen durning Chris's leave.
|
2012-09-24 11:43:48 +08:00 |
Christophe Vilayphiou
|
c846a102ff
|
Page by page changes for i18n yml
|
2012-09-24 09:06:44 +08:00 |
Christophe Vilayphiou
|
4fb35b00f2
|
Add missing translations
|
2012-09-24 09:02:46 +08:00 |
Christophe Vilayphiou
|
2ca7e1b548
|
Fix typos after i18n yml
|
2012-09-24 09:02:45 +08:00 |
Christophe Vilayphiou
|
bdd5a1a047
|
Changes for i18n yml
|
2012-09-24 09:02:45 +08:00 |
Harry Bomrah
|
b6c06c6d4f
|
tiny mce fix
|
2012-09-19 17:59:17 +08:00 |
Matt
|
79006201cd
|
ad_image date picker fixed
|
2012-09-19 12:23:05 +08:00 |
Matthew K. Fu JuYuan
|
6fd2dac4d5
|
fix ad_banner data picker not working when on 180
|
2012-09-19 12:15:03 +08:00 |
Matthew K. Fu JuYuan
|
d480a10661
|
fix for object_auth update
|
2012-09-19 11:12:22 +08:00 |
Matthew K. Fu JuYuan
|
959b6aee12
|
fix for listing object error
|
2012-09-19 10:45:03 +08:00 |
Matthew K. Fu JuYuan
|
19db9d0037
|
basic function
|
2012-09-17 13:32:52 +08:00 |
OrbitServer
|
ee51240102
|
Ray's changes for new backend
|
2012-09-14 02:38:56 +08:00 |
unknown
|
42d50ae534
|
Plugins
|
2012-09-14 00:05:31 +08:00 |
Matthew K. Fu JuYuan
|
5fb94f644d
|
break down Ray's HTML
|
2012-09-14 00:02:22 +08:00 |
Matthew K. Fu JuYuan
|
4818e3f444
|
first version for new member html
|
2012-09-14 00:02:21 +08:00 |
Christophe Vilayphiou
|
2e9af5d1a8
|
fix commit bugs
|
2012-09-13 15:53:36 +08:00 |
unknown
|
a1560ebcf5
|
update archive
|
2012-08-30 15:17:39 +08:00 |
chris
|
7d5531bf01
|
Merge branch 'nccu_master' into demo_site
Conflicts:
Gemfile
app/assets/javascripts/tinymce_orbit.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/admin/assets_controller.rb
app/controllers/admin/module_apps_new_interface_controller.rb
app/controllers/admin/page_parts_controller.rb
app/jobs/sync_db.rb
app/models/page.rb
app/models/page_part.rb
app/models/user/user.rb
app/uploaders/image_uploader.rb
app/views/admin/assets/create.js.erb
app/views/admin/module_apps/reload_frontend_pages.js.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
app/views/layouts/_users_checkbox_ary.html.erb
app/views/shared/_privilege_user.html.erb
config/mongoid.yml
lib/parsers/parser_common.rb
vendor/built_in_modules/announcement/announcement.json
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
|
2012-08-22 18:07:49 +08:00 |
Harry Bomrah
|
263cf130e2
|
tp
|
2012-08-20 23:16:54 +08:00 |
Christophe Vilayphiou
|
96fd89cca3
|
Fix js for ie in list
|
2012-08-16 01:09:45 +08:00 |
Christophe Vilayphiou
|
fb53ad524a
|
Add time to announcement quick edit
Fix picture for news quick edit
Fix tags not saving when empty
Hide role in quick edit
|
2012-08-14 14:38:21 +08:00 |
Harry Bomrah
|
9ff60d2ba4
|
form validation again
|
2012-08-14 01:02:45 +08:00 |
Christophe Vilayphiou
|
c32b0dd4b4
|
Move delete checkboxes to js
|
2012-08-14 00:59:01 +08:00 |
Christophe Vilayphiou
|
33fc96ac7c
|
Changes for NCCU after email
|
2012-08-11 18:19:30 +08:00 |
unknown
|
d5c55c9697
|
widget & frontend field
|
2012-08-09 15:25:30 +08:00 |
Christophe Vilayphiou
|
c8dcc9734d
|
Change width for site map frontend, add link for more in announcement widget
|
2012-08-08 10:53:04 +08:00 |
Christophe Vilayphiou
|
292105bdf1
|
Remove remotipart (not working with ie9) the upload is working except that the pop-up does not disappear in ie
|
2012-08-08 10:53:04 +08:00 |
Christophe Vilayphiou
|
ecc5c39840
|
Fix remote upload file for tinymce
|
2012-08-08 10:51:54 +08:00 |
Harry Bomrah
|
4660c26b7a
|
fix for ie8,9 for tinymce
|
2012-08-07 20:55:18 +08:00 |
Christophe Vilayphiou
|
8ea7bf75cd
|
Fix uploader, ie9 ok, not ie8
|
2012-08-07 17:32:15 +08:00 |
Christophe Vilayphiou
|
df9a1e8057
|
Fix typo
|
2012-08-01 17:11:37 +08:00 |
Christophe Vilayphiou
|
f917adcdf3
|
Fix typo
|
2012-08-01 17:09:00 +08:00 |
Christophe Vilayphiou
|
0d048de33f
|
Fix link in sitemap
|
2012-08-01 17:08:07 +08:00 |
Christophe Vilayphiou
|
83acb78966
|
path instead of url
|
2012-08-01 17:05:34 +08:00 |
Christophe Vilayphiou
|
410dfe62e8
|
Fix typo
|
2012-08-01 17:03:39 +08:00 |
Christophe Vilayphiou
|
02ade108d0
|
Fix typo
|
2012-08-01 16:59:11 +08:00 |
Christophe Vilayphiou
|
4df4274629
|
Add links to frontend_sitemap
|
2012-08-01 16:38:07 +08:00 |
Christophe Vilayphiou
|
ecb75fd085
|
Fix typo
|
2012-07-30 18:37:20 +08:00 |
Christophe Vilayphiou
|
39b63a970c
|
Fix .class to .class.to_s
|
2012-07-30 18:34:54 +08:00 |
Christophe Vilayphiou
|
7440727acd
|
Fix: "._type" to ".class"
|
2012-07-30 17:21:37 +08:00 |
Christophe Vilayphiou
|
a8cc581279
|
Sitemap done for backend and fronted
|
2012-07-27 19:13:40 +08:00 |
Christophe Vilayphiou
|
934b515914
|
Sitemap with main
|
2012-07-27 19:13:39 +08:00 |
Christophe Vilayphiou
|
38804bd118
|
Add disable for main title
|
2012-07-27 19:13:39 +08:00 |
Christophe Vilayphiou
|
db9c4c0e10
|
Partial sitemap
|
2012-07-27 19:13:39 +08:00 |
Christophe Vilayphiou
|
12f9f666eb
|
Fix bugs after i18n_variable removal
|
2012-07-27 19:13:39 +08:00 |
Christophe Vilayphiou
|
53cae0a9ee
|
Remove i18n_variable for views
|
2012-07-27 19:13:39 +08:00 |
unknown
|
c0cac812c5
|
demo site widget
|
2012-07-26 16:39:29 +08:00 |
Matthew K. Fu JuYuan
|
87549d4e1f
|
fix for nil value
|
2012-07-25 17:49:16 +08:00 |
Matthew K. Fu JuYuan
|
97b4eee798
|
full site search with google
|
2012-07-25 17:20:25 +08:00 |
unknown
|
10731dc211
|
demo widget
|
2012-07-18 18:07:45 +08:00 |
Matthew K. Fu JuYuan
|
11247ce84c
|
Clean up code , cache other auths. Fix sidebar
|
2012-05-29 17:17:26 +08:00 |
Matthew K. Fu JuYuan
|
1f1868a75f
|
cache privilege user list.
|
2012-05-29 17:17:26 +08:00 |
Matthew K. Fu JuYuan
|
4f484599b7
|
Clean up code , cache other auths. Fix sidebar
|
2012-05-29 15:23:50 +08:00 |
Matthew K. Fu JuYuan
|
6f0cf0e92e
|
cache privilege user list.
|
2012-05-29 15:23:50 +08:00 |
Christophe Vilayphiou
|
f1c8bed29d
|
Merge branch 'design_team' into ldap
Conflicts:
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
|
2012-05-22 20:33:07 +08:00 |
Christophe Vilayphiou
|
541aa5831e
|
JS changes to load drag and drop
|
2012-05-22 17:37:15 +08:00 |
Christophe Vilayphiou
|
5e9836f371
|
Changes for structure
|
2012-05-22 14:45:49 +08:00 |
Christophe Vilayphiou
|
aa114568c4
|
Move design to site_settings side_bar
|
2012-05-21 18:20:39 +08:00 |
Matthew K. Fu JuYuan
|
5f6696a358
|
fix view for different_user for ad_banner. add field 'best size' for ad_banner within form
|
2012-05-18 14:19:13 +08:00 |
Christophe Vilayphiou
|
17b6a70506
|
Merge branch 'design_team' into ldap
|
2012-05-17 23:36:24 +08:00 |
Matthew K. Fu JuYuan
|
16ada34585
|
fix ad_banner. new ad_image with best size from ad_banner. content editable at tab
|
2012-05-17 23:35:46 +08:00 |
Harry Bomrah
|
1b1c2c0032
|
image title and description callback fixed…
|
2012-05-17 20:19:31 +08:00 |
Christophe Vilayphiou
|
60988f97fb
|
Merge branch 'design_team' into ldap
|
2012-05-17 19:41:24 +08:00 |
Christophe Vilayphiou
|
2f7d561310
|
Put back I18n for file_upload
|
2012-05-17 19:40:30 +08:00 |
Christophe Vilayphiou
|
25de941df7
|
Merge branch 'design_team' into ldap
|
2012-05-17 19:10:22 +08:00 |
Christophe Vilayphiou
|
606050627e
|
Remove I18n for file_upload html
|
2012-05-17 19:09:52 +08:00 |
Christophe Vilayphiou
|
698c750cd7
|
Merge branch 'design_team' into ldap
|
2012-05-17 18:37:56 +08:00 |
Christophe Vilayphiou
|
27fd2d0714
|
Hide assets links from side_bar
|
2012-05-17 18:37:46 +08:00 |
Christophe Vilayphiou
|
79f484300e
|
Merge branch 'design_team' into ldap
|
2012-05-17 18:32:06 +08:00 |
Christophe Vilayphiou
|
c9cbec4239
|
Asset changes, add description
|
2012-05-17 18:31:40 +08:00 |
Christophe Vilayphiou
|
5e93fe51a9
|
Merge branch 'design_team' into ldap
|
2012-05-17 16:41:11 +08:00 |
Christophe Vilayphiou
|
29c54e6480
|
Add mandatory fields to assets
|
2012-05-17 16:40:09 +08:00 |
Christophe Vilayphiou
|
eba4671733
|
Merge branch 'design_team' into ldap
|
2012-05-17 06:46:29 +08:00 |
Matthew K. Fu JuYuan
|
0f354b8ccc
|
fix ad_image size hints. fix orbit backend controller error when changing language.
|
2012-05-17 06:44:14 +08:00 |
Matthew K. Fu JuYuan
|
a3acd865d7
|
AdBanner reopen new banner and delete. Rename title with content editable tag.
|
2012-05-17 06:44:14 +08:00 |
Matthew K. Fu JuYuan
|
82d78acbad
|
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
|
2012-05-17 06:43:39 +08:00 |
Matthew K. Fu JuYuan
|
03387d3c07
|
Object auth for ad_banner
|
2012-05-17 06:42:33 +08:00 |
Matthew K. Fu JuYuan
|
f663985a40
|
starting ad_banner auth
|
2012-05-17 06:42:33 +08:00 |
Christophe Vilayphiou
|
6b9c8eb15d
|
Merge branch 'design_team' into ldap
|
2012-05-17 06:31:57 +08:00 |
Christophe Vilayphiou
|
b05836835a
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-17 06:28:49 +08:00 |
Christophe Vilayphiou
|
26292f0dcc
|
Asset upload
|
2012-05-17 06:28:29 +08:00 |
Harry Bomrah
|
27a0984da1
|
tinymce loading fixed…
|
2012-05-16 18:51:37 +08:00 |
Harry Bomrah
|
617a683d00
|
image insertion completed..
|
2012-05-16 16:22:50 +08:00 |
Harry Bomrah
|
30137b50b4
|
popup fix..
|
2012-05-16 15:33:54 +08:00 |
Christophe Vilayphiou
|
0b0916179f
|
Change assets
|
2012-05-16 11:07:11 +08:00 |
Christophe Vilayphiou
|
f950f77f36
|
Merge branch 'design_team' into ldap
Conflicts:
Gemfile
app/models/ad_banner.rb
|
2012-05-15 23:02:22 +08:00 |
Christophe Vilayphiou
|
80e84c10ba
|
Remove link from dashboard
|
2012-05-15 23:01:00 +08:00 |
Christophe Vilayphiou
|
e54f4409fb
|
Add impressionist
|
2012-05-15 21:26:09 +08:00 |