Harry Bomrah
9f362d9ae6
gridster, url code fixed, views removed.
2013-02-25 11:08:56 +08:00
chris
caac9191ce
Fix public_r_tag selection
2013-02-23 16:52:37 +08:00
Fu Matthew
a6f6dc271c
fix i18n,reload problems
2013-02-18 15:13:31 +08:00
chris
6eb5061237
Changes for mobile map
2013-02-04 18:02:11 +08:00
chris
b1a11b4dad
Remove isotope
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
b2bc62dadd
fixed orbit bar that like nccu bar now, and add rails version in Gemfile
2013-02-04 18:01:03 +08:00
unknown
18a51f070e
member roles edit
2013-02-04 18:01:03 +08:00
Fu Matthew
0cc616f988
page can use default widget
2013-01-21 16:56:37 +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
758cab5ecd
move journal code to persional_journal modulaar
2013-01-14 17:53:59 +08:00
chris
141eb7e723
Add mobile but remove news in it
2013-01-14 17:38:44 +08:00
chris
91d1487a04
Fix mobile banner, icons, announcement css
2013-01-11 18:34:20 +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
fac4faad6c
Change date picker
2013-01-09 05:18:16 +08:00
chris
423e2ac54e
Update bootstrap version 2.2.2
2013-01-07 17:25:32 +08:00
Rueshyna
a34da20e48
Merge branch 'master' into desktop
...
* master: (57 commits)
Add translations
Add mobile version in site settings
Add mobile but remove news in it
Remove mysql
Fix album widget options
Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end
Add link to default widget (temporary)
Ika's fix for width
Ika's fix for width
Gallery i18n
Ika's changes for css default widgets
Ika's changes for css default widgets
change bulletin object to bulletin title
fixing default widget error when needs image
make default widget works without init
Fix order in structure
Fix old tags
correct pic file format
complete page error handler logic
change sub_menu to header in site setting
...
2013-01-07 16:44:05 +08:00
Rueshyna
35e0011111
Merge remote-tracking branch 'remotes/origin/publication' into desktop
...
* remotes/origin/publication:
new desktop framework updates
2013-01-07 12:44:30 +08:00
chris
37740adb24
Add mobile but remove news in it
2013-01-07 03:03:38 +08:00
Fu Matthew
2c632551e5
fix preview filed after ad_banner created.
2013-01-02 17:51:53 +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
4d965d754b
Fix urls in tinymce source editor
2012-12-28 15:03:02 +08:00
Harry Bomrah
37f8c1637a
new desktop framework updates
2012-12-27 18:25:54 +08:00
chris
acaf707900
Merge branch 'publication' of github.com:Rulingcom/orbit into publication
2012-12-07 11:22:06 +08:00
Harry Bomrah
ad8273d638
fixed fileview in english mode
2012-12-07 11:19:40 +08:00
chris
4d07b0753c
Merge branch 'publication' of github.com:Rulingcom/orbit into publication
2012-12-07 10:13:41 +08:00
Harry Bomrah
08b99011d0
all sections and sections megerd
2012-12-07 10:10:38 +08:00
Harry Bomrah
59c4080f0c
stupid fix
2012-12-07 04:21:26 +08:00
Harry Bomrah
da3f0b58f5
section fixed and some other fixes
2012-12-07 04:21:26 +08:00
Rueshyna
e87526d7bb
try to fix problem
2012-12-07 04:21:26 +08:00
Harry Bomrah
3d382fec6b
scroll fixed...
2012-12-07 04:21:26 +08:00
devin
89e25fe7a2
view update
2012-12-07 04:21:26 +08:00
OrbitServer
b1f2749000
Devin's changes to integrate the store
2012-12-06 23:11:23 +08:00
Harry Bomrah
c2285a34f6
stupid fix
2012-12-06 18:50:24 +08:00
Harry Bomrah
8094ddc967
section fixed and some other fixes
2012-12-06 17:43:19 +08:00
Rueshyna
7430a05782
try to fix problem
2012-12-06 16:24:40 +08:00
Harry Bomrah
df4a9a5dff
scroll fixed...
2012-12-06 15:44:16 +08:00
devin
6a47fc8d62
view update
2012-12-06 11:43:40 +08:00
devin
5d76600154
view update
2012-12-06 07:59:44 +08:00
devin
756bfa563b
view update
2012-12-06 07:59:44 +08:00
Harry Bomrah
3d1fb48489
edit coauthor relation done
2012-12-06 07:59:44 +08:00
devin
a0cce2ae0d
view update
2012-12-06 07:59:43 +08:00
Harry Bomrah
79dc99d431
br fixed
2012-12-06 07:59:43 +08:00
devin
d03f5dc1ff
view update
2012-12-06 07:59:43 +08:00
Harry Bomrah
c6e0b56012
stupid bug fixed
2012-12-04 00:31:46 +08:00
Harry Bomrah
49d1ca6997
new type fixed
2012-12-04 00:31:46 +08:00
Harry Bomrah
0e6c75e677
form for coauthor - fixed
2012-12-04 00:31:07 +08:00
Harry Bomrah
a6a50227eb
new type fixed
2012-12-04 00:31:07 +08:00
Harry Bomrah
f7f55850fe
coauthor edit and destroy fixed
2012-12-04 00:31:07 +08:00
Rueshyna
5986817e16
add journal_list. now, those pair, (journal_title, journal_levels), is uniq
2012-12-04 00:31:06 +08:00
Harry Bomrah
ee830f148e
jumping menus updated..
2012-12-04 00:30:10 +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
Harry Bomrah
2f67a96532
url fixed and edit form fixed for tinyscrollbar
2012-11-28 18:12:00 +08:00
Harry Bomrah
9cc518b456
autocomplete done
2012-11-27 15:55:32 +08:00
chris
1e89c30150
Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP
2012-11-26 05:02:58 +08:00
Harry Bomrah
3933c048b0
delete fixed
2012-11-23 13:22:01 +08:00
Harry Bomrah
f38f32ac8b
delete update
2012-11-23 10:46:42 +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
Rueshyna
f6d3b4a9e9
correct 'edit' button of journal list
2012-11-22 21:06:31 +08:00
Harry Bomrah
868d1c2201
fix for json and some other bugs
2012-11-22 21:06:30 +08:00
Rueshyna
78500e0661
fixed add journal and co-author curd problem, but have redirect problem...
2012-11-22 21:06:30 +08:00
Rueshyna
c281ae9447
hidden file field, and fixed updated function
2012-11-22 21:06:30 +08:00
Rueshyna
9189ebffee
correct 'edit' button of journal list
2012-11-22 18:15:07 +08:00
Harry Bomrah
90fd9de5a8
fix for json and some other bugs
2012-11-22 16:31:52 +08:00
Rueshyna
9e400e6e6a
fixed add journal and co-author curd problem, but have redirect problem...
2012-11-22 10:49:54 +08:00
chris
475642d375
Remove news and fix default_url in ImageUploader
2012-11-22 09:30:25 +08:00
Rueshyna
bb69a059e8
hidden file field, and fixed updated function
2012-11-22 02:37:56 +08:00
Harry Bomrah
73e76f2477
routes fixed
2012-11-21 18:36:56 +08:00
Harry Bomrah
c53581c999
small fix for journal_pages desktop
2012-11-21 18:36:56 +08:00
Harry Bomrah
0b9af044ba
new file created for journal pages
2012-11-21 18:36:56 +08:00
Rueshyna
b47be52309
tmp
2012-11-21 18:36:56 +08:00
Rueshyna
6a9426c9c8
add co-author page and new it, but can't destory it...
2012-11-21 18:36:32 +08:00
Harry Bomrah
91005bb00a
routes fixed
2012-11-21 17:39:01 +08:00
Harry Bomrah
c94940214c
small fix for journal_pages desktop
2012-11-21 17:11:18 +08:00
Harry Bomrah
b571373c8f
new file created for journal pages
2012-11-21 15:35:23 +08:00
Rueshyna
5c0b137c6d
tmp
2012-11-21 14:52:26 +08:00
Rueshyna
da1b871481
merge
2012-11-21 10:46:33 +08:00
Harry Bomrah
8f65284932
Desktop updates various
2012-11-21 07:37:44 +08:00
Rueshyna
703324063e
change journal list json link
2012-11-21 07:37:44 +08:00
Rueshyna
5eb8cc4063
finished some method of list and journal
2012-11-21 07:37:43 +08:00
Rueshyna
1c6badfb10
add more fake data
2012-11-21 07:37:43 +08:00
Rueshyna
f93d019ba0
check file type
2012-11-21 07:37:42 +08:00
Rueshyna
61c0c4b542
modified file of view bug
2012-11-21 07:37:42 +08:00
Harry Bomrah
97ffb5ff18
file view update
2012-11-21 07:37:42 +08:00
Rueshyna
ccfecb8243
add co-author page and new it, but can't destory it...
2012-11-21 01:54:06 +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
Rueshyna
db3797694b
change journal list json link
2012-11-19 12:13:05 +08:00
Rueshyna
26436395f5
finished some method of list and journal
2012-11-18 03:07:50 +08:00
Rueshyna
34f0eea1ff
add more fake data
2012-11-16 09:13:51 +08:00
Rueshyna
3144b84d10
check file type
2012-11-15 22:39:01 +08:00
Rueshyna
c627376fbe
modified file of view bug
2012-11-15 11:18:55 +08:00
Harry Bomrah
351767cd98
file view update
2012-11-14 21:12:10 +08:00
Harry Bomrah
e498be9753
desktopAPI update.
2012-11-12 15:11:36 +08:00
Harry Bomrah
a56d80698f
desktop api update..
2012-11-12 15:11:36 +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
da5e7f670e
Desktop Widgtes updates..
2012-11-06 10:36:34 +08:00
Harry Bomrah
2e809c5c19
Calander view updated...
2012-11-05 11:40:11 +08:00
chris
451d73897b
Fix bugs:
...
Page content: after edit and redirect to index, there's a gap between the headers and the first row
TinyMCE: the size of the textarea change depending on the language
2012-11-01 09:30:12 +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
chris
d7fd61ce55
Edit uploaded package
2012-10-26 11:19:57 +08:00
OrbitServer
9e2bc7e1c1
Ray's changes in css and js
2012-10-09 07:48:05 +08:00
Matthew K. Fu JuYuan
67bd68d492
harry's js fix
2012-10-08 10:11:45 +08:00
Matthew K. Fu JuYuan
7919750d4f
171 doesn't have bug with javascript remove log script
2012-10-01 19:05:23 +08:00
Matthew K. Fu JuYuan
3dc4dc2316
debug commit
2012-10-01 17:56:55 +08:00
Matthew K. Fu JuYuan
506fa179a1
fix announcement
2012-10-01 17:48:51 +08:00
Matt
b65d785834
harry's fix, announcement still broken
2012-10-01 17:21:23 +08:00
Matthew K. Fu JuYuan
aa5d0bb1ad
Merge branch 'master' of github.com:Rulingcom/NCCU
...
Conflicts:
config/locales/zh_tw.yml
2012-09-28 09:49:22 +08:00
Matthew K. Fu JuYuan
cfc80340b8
add setting for tinymce config
2012-09-28 09:45:50 +08:00
Harry Bomrah
9a4c8137fe
Fix for images
2012-09-27 15:33:37 +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
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
803f83b239
fix for no login window for backend
2012-09-12 16:20:15 +08:00
Harry Bomrah
04877b9945
design update
2012-09-12 01:58:23 +08:00
Matt
71021b8c69
Changes for empty file and link in create and edit for news and announcement + partially fix tinymce
2012-09-11 00:41:52 +08:00
Matthew K. Fu JuYuan
a20db344f1
preview for update
2012-09-10 11:53:59 +08:00
Fu Matthew
6044857fea
complete preview for both new and announcement
2012-09-07 17:55:59 +08:00
Matthew K. Fu JuYuan
ae1595a008
view for preview
2012-09-04 09:24:12 +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
2c0058e8c9
authorization
2012-08-20 23:18:50 +08:00
Harry Bomrah
faf2d914b6
Page added for desktop
2012-08-20 23:17:31 +08:00
Harry Bomrah
69304fda43
UI modifications
2012-08-20 23:16:06 +08:00
Harry Bomrah
587595f815
gallery translation supported
2012-08-20 23:14:11 +08:00
Harry Bomrah
797c9e57b8
Gallery update
2012-08-20 23:14:10 +08:00
Harry Bomrah
1daf405b3d
Gallery started.
2012-08-20 23:14:10 +08:00
devin
801c7cab0c
tinyscroll bar update
2012-08-20 23:11:32 +08:00
Harry Bomrah
1efb807246
tinyscrollbar extension
2012-08-20 23:11:32 +08:00
Christophe Vilayphiou
96fd89cca3
Fix js for ie in list
2012-08-16 01:09:45 +08:00
Christophe Vilayphiou
ab1c457a51
Add i18n for message in editor pop-up
2012-08-14 01:20:45 +08:00
Harry Bomrah
9ff60d2ba4
form validation again
2012-08-14 01:02:45 +08:00
Harry Bomrah
ffa49fd092
form validation
2012-08-14 01:02:45 +08:00
Christophe Vilayphiou
9196deb997
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-14 01:00:25 +08:00
Christophe Vilayphiou
c32b0dd4b4
Move delete checkboxes to js
2012-08-14 00:59:01 +08:00
Matthew K. Fu JuYuan
6cc470ede9
nccu fix
2012-08-13 18:35:47 +08:00
Christophe Vilayphiou
18e18a4add
Fix for banner on ie
2012-08-13 15:10:53 +08:00
Christophe Vilayphiou
a03d1ad10b
Change for getting url from key
2012-08-08 11:04:19 +08:00
Christophe Vilayphiou
6cfdf0f25a
Change the way the orig_url is passed to fb
2012-08-08 11:04:19 +08:00
Christophe Vilayphiou
4bed925e0f
Try fb from override and generated page
2012-08-08 11:04:19 +08:00
Matthew K. Fu JuYuan
85a556a4a2
first version of fb_share
2012-08-08 11:04:19 +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
86a3d4a4b1
Remove console.log
2012-08-08 10:52:22 +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
db9c4c0e10
Partial sitemap
2012-07-27 19:13:39 +08:00
unknown
c0cac812c5
demo site widget
2012-07-26 16:39:29 +08:00
devin
68fd726ce1
little
2012-07-09 16:25:41 +08:00
devin
b6266284b4
dump
2012-07-09 16:21:02 +08:00
Harry Bomrah
222c0b9564
Merge branch 'desktop_harry' into desktop_devin
2012-07-09 16:12:45 +08:00
Harry Bomrah
4796de882f
Scroll down fixes
2012-07-09 16:11:31 +08:00
devin
bfedf207c9
some changes
2012-07-09 15:37:47 +08:00
devin
58d162d225
publication adjustment
2012-07-09 10:44:01 +08:00
Harry Bomrah
2e94c19019
Merge branch 'desktop_devin' into desktop_harry
2012-07-06 16:12:01 +08:00
Harry Bomrah
830eb8eb62
Timeline design and timescale update
2012-07-06 16:11:03 +08:00
devin
8948ccca25
little changes
2012-07-06 16:09:26 +08:00
devin
bfaed4deb4
timeline change
2012-07-05 16:49:03 +08:00
Harry Bomrah
312e63f242
New Timeline with books and seminar pages
2012-07-05 16:42:00 +08:00
Harry Bomrah
6923b82284
Added seminar section
2012-07-04 19:12:02 +08:00
Harry Bomrah
f635f642fc
Merge for new timeline updates and font updates
2012-07-04 18:49:10 +08:00
Joshua Milton
6b9926539d
Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua
...
Conflicts:
app/assets/javascripts/orbitdesktop.js
app/controllers/desktop_publications_controller.rb
config/routes.rb
2012-07-04 18:31:00 +08:00
Joshua Milton
3f42a22094
Books section added
2012-07-04 17:55:30 +08:00
devin
e133673736
some change
2012-07-04 13:38:18 +08:00
Harry Bomrah
a0c09046a8
Timeline merge plus font update
2012-07-03 19:53:34 +08:00
Harry Bomrah
f20f36383e
Timeline ajax load fixed… a bit change in structure..
2012-07-03 19:45:47 +08:00
Harry Bomrah
bacb1f1e63
Timeline ajax loading
2012-07-02 21:06:36 +08:00
devin
08fd07b6aa
timeline and font update
2012-07-02 16:22:51 +08:00
Christophe Vilayphiou
a1e74987dc
Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry
...
Conflicts:
Gemfile.lock
app/assets/javascripts/.DS_Store
app/assets/stylesheets/style.css.erb
app/views/layouts/_orbit_bar.html.erb
2012-06-29 16:10:29 +08:00
Harry Bomrah
7151102a86
new page add and timeline changes
2012-06-28 17:31:48 +08:00
Matthew K. Fu JuYuan
04a23db745
fix invalid invalid byte sequence in US-ASCII for js files
2012-06-27 14:27:27 +08:00
Matthew K. Fu JuYuan
55449efb35
fix 新聞與公告QA
...
1.優先處理-快速編輯中的檔案上傳無法新增,但可刪除
2.優先處理-編輯中的檔案列表,無法刪除
3.優先處理-刪除時應彈出警告視窗,請user確認一次,再將檔案刪除
2012-06-27 14:21:06 +08:00
Christophe Vilayphiou
4c4929c20a
Fix js for news quick_edit and edit for files
2012-06-27 11:36:18 +08:00
Matthew K. Fu JuYuan
6a4abc6c43
fix news error
2012-06-27 09:59:32 +08:00
Harry Bomrah
4aa155a44d
timeline updates major ones..
2012-06-26 21:09:33 +08:00
Harry Bomrah
555ec86403
Timeline commit
2012-06-26 15:59:28 +08:00
Harry Bomrah
7488341836
Commit for app window..
2012-05-25 15:41:07 +08:00
Christophe Vilayphiou
541aa5831e
JS changes to load drag and drop
2012-05-22 17:37:15 +08:00
Christophe Vilayphiou
d0b030c47d
Put inc/ajax_setting in new_admin
...
Fix callback for link on save
2012-05-22 16:11:00 +08:00
Matthew K. Fu JuYuan
99bcdf6e1e
clean up unless code
2012-05-22 14:59:54 +08:00
Matthew K. Fu JuYuan
79f67208fa
js for preventing user do stupid things durning ajax
2012-05-22 14:59:54 +08:00
Christophe Vilayphiou
5e9836f371
Changes for structure
2012-05-22 14:45:49 +08:00
Harry Bomrah
81ff0f2c1c
Merge branch 'desktop_harry' into desktop_devin
2012-05-21 15:26:38 +08:00
Harry Bomrah
dfe7ccf166
general commit
2012-05-21 15:24:47 +08:00
devin
ab7ae6dcee
app
2012-05-21 14:55:51 +08:00
Christophe Vilayphiou
4d33c7a56d
Changes for dat and time format
...
Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title
2012-05-18 19:42:36 +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
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
Christophe Vilayphiou
26292f0dcc
Asset upload
2012-05-17 06:28:29 +08:00
Harry Bomrah
617a683d00
image insertion completed..
2012-05-16 16:22:50 +08:00