e498be9753
desktopAPI update.
2012-11-12 15:11:36 +08:00
a56d80698f
desktop api update..
2012-11-12 15:11:36 +08:00
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
da5e7f670e
Desktop Widgtes updates..
2012-11-06 10:36:34 +08:00
2e809c5c19
Calander view updated...
2012-11-05 11:40:11 +08:00
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
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
d7fd61ce55
Edit uploaded package
2012-10-26 11:19:57 +08:00
9e2bc7e1c1
Ray's changes in css and js
2012-10-09 07:48:05 +08:00
67bd68d492
harry's js fix
2012-10-08 10:11:45 +08:00
7919750d4f
171 doesn't have bug with javascript remove log script
2012-10-01 19:05:23 +08:00
3dc4dc2316
debug commit
2012-10-01 17:56:55 +08:00
506fa179a1
fix announcement
2012-10-01 17:48:51 +08:00
b65d785834
harry's fix, announcement still broken
2012-10-01 17:21:23 +08:00
aa5d0bb1ad
Merge branch 'master' of github.com:Rulingcom/NCCU
...
Conflicts:
config/locales/zh_tw.yml
2012-09-28 09:49:22 +08:00
cfc80340b8
add setting for tinymce config
2012-09-28 09:45:50 +08:00
9a4c8137fe
Fix for images
2012-09-27 15:33:37 +08:00
bdd5a1a047
Changes for i18n yml
2012-09-24 09:02:45 +08:00
b6c06c6d4f
tiny mce fix
2012-09-19 17:59:17 +08:00
ee51240102
Ray's changes for new backend
2012-09-14 02:38:56 +08:00
42d50ae534
Plugins
2012-09-14 00:05:31 +08:00
803f83b239
fix for no login window for backend
2012-09-12 16:20:15 +08:00
04877b9945
design update
2012-09-12 01:58:23 +08:00
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
a20db344f1
preview for update
2012-09-10 11:53:59 +08:00
6044857fea
complete preview for both new and announcement
2012-09-07 17:55:59 +08:00
ae1595a008
view for preview
2012-09-04 09:24:12 +08:00
a1560ebcf5
update archive
2012-08-30 15:17:39 +08:00
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
2c0058e8c9
authorization
2012-08-20 23:18:50 +08:00
faf2d914b6
Page added for desktop
2012-08-20 23:17:31 +08:00
69304fda43
UI modifications
2012-08-20 23:16:06 +08:00
587595f815
gallery translation supported
2012-08-20 23:14:11 +08:00
797c9e57b8
Gallery update
2012-08-20 23:14:10 +08:00
1daf405b3d
Gallery started.
2012-08-20 23:14:10 +08:00
801c7cab0c
tinyscroll bar update
2012-08-20 23:11:32 +08:00
1efb807246
tinyscrollbar extension
2012-08-20 23:11:32 +08:00
96fd89cca3
Fix js for ie in list
2012-08-16 01:09:45 +08:00
ab1c457a51
Add i18n for message in editor pop-up
2012-08-14 01:20:45 +08:00
9ff60d2ba4
form validation again
2012-08-14 01:02:45 +08:00
ffa49fd092
form validation
2012-08-14 01:02:45 +08:00
9196deb997
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-14 01:00:25 +08:00
c32b0dd4b4
Move delete checkboxes to js
2012-08-14 00:59:01 +08:00
6cc470ede9
nccu fix
2012-08-13 18:35:47 +08:00
18e18a4add
Fix for banner on ie
2012-08-13 15:10:53 +08:00
a03d1ad10b
Change for getting url from key
2012-08-08 11:04:19 +08:00
6cfdf0f25a
Change the way the orig_url is passed to fb
2012-08-08 11:04:19 +08:00
4bed925e0f
Try fb from override and generated page
2012-08-08 11:04:19 +08:00
85a556a4a2
first version of fb_share
2012-08-08 11:04:19 +08:00
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
86a3d4a4b1
Remove console.log
2012-08-08 10:52:22 +08:00
ecc5c39840
Fix remote upload file for tinymce
2012-08-08 10:51:54 +08:00
4660c26b7a
fix for ie8,9 for tinymce
2012-08-07 20:55:18 +08:00
8ea7bf75cd
Fix uploader, ie9 ok, not ie8
2012-08-07 17:32:15 +08:00
db9c4c0e10
Partial sitemap
2012-07-27 19:13:39 +08:00
c0cac812c5
demo site widget
2012-07-26 16:39:29 +08:00
68fd726ce1
little
2012-07-09 16:25:41 +08:00
b6266284b4
dump
2012-07-09 16:21:02 +08:00
222c0b9564
Merge branch 'desktop_harry' into desktop_devin
2012-07-09 16:12:45 +08:00
4796de882f
Scroll down fixes
2012-07-09 16:11:31 +08:00
bfedf207c9
some changes
2012-07-09 15:37:47 +08:00
58d162d225
publication adjustment
2012-07-09 10:44:01 +08:00
2e94c19019
Merge branch 'desktop_devin' into desktop_harry
2012-07-06 16:12:01 +08:00
830eb8eb62
Timeline design and timescale update
2012-07-06 16:11:03 +08:00
8948ccca25
little changes
2012-07-06 16:09:26 +08:00
bfaed4deb4
timeline change
2012-07-05 16:49:03 +08:00
312e63f242
New Timeline with books and seminar pages
2012-07-05 16:42:00 +08:00
6923b82284
Added seminar section
2012-07-04 19:12:02 +08:00
f635f642fc
Merge for new timeline updates and font updates
2012-07-04 18:49:10 +08:00
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
3f42a22094
Books section added
2012-07-04 17:55:30 +08:00
e133673736
some change
2012-07-04 13:38:18 +08:00
a0c09046a8
Timeline merge plus font update
2012-07-03 19:53:34 +08:00
f20f36383e
Timeline ajax load fixed… a bit change in structure..
2012-07-03 19:45:47 +08:00
bacb1f1e63
Timeline ajax loading
2012-07-02 21:06:36 +08:00
08fd07b6aa
timeline and font update
2012-07-02 16:22:51 +08:00
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
7151102a86
new page add and timeline changes
2012-06-28 17:31:48 +08:00
04a23db745
fix invalid invalid byte sequence in US-ASCII for js files
2012-06-27 14:27:27 +08:00
55449efb35
fix 新聞與公告QA
...
1.優先處理-快速編輯中的檔案上傳無法新增，但可刪除
2.優先處理-編輯中的檔案列表，無法刪除
3.優先處理-刪除時應彈出警告視窗，請user確認一次，再將檔案刪除
2012-06-27 14:21:06 +08:00
4c4929c20a
Fix js for news quick_edit and edit for files
2012-06-27 11:36:18 +08:00
6a4abc6c43
fix news error
2012-06-27 09:59:32 +08:00
4aa155a44d
timeline updates major ones..
2012-06-26 21:09:33 +08:00
555ec86403
Timeline commit
2012-06-26 15:59:28 +08:00
7488341836
Commit for app window..
2012-05-25 15:41:07 +08:00
541aa5831e
JS changes to load drag and drop
2012-05-22 17:37:15 +08:00
d0b030c47d
Put inc/ajax_setting in new_admin
...
Fix callback for link on save
2012-05-22 16:11:00 +08:00
99bcdf6e1e
clean up unless code
2012-05-22 14:59:54 +08:00
79f67208fa
js for preventing user do stupid things durning ajax
2012-05-22 14:59:54 +08:00
5e9836f371
Changes for structure
2012-05-22 14:45:49 +08:00
81ff0f2c1c
Merge branch 'desktop_harry' into desktop_devin
2012-05-21 15:26:38 +08:00
dfe7ccf166
general commit
2012-05-21 15:24:47 +08:00
ab7ae6dcee
app
2012-05-21 14:55:51 +08:00
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
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
1b1c2c0032
image title and description callback fixed…
2012-05-17 20:19:31 +08:00
a3acd865d7
AdBanner reopen new banner and delete. Rename title with content editable tag.
2012-05-17 06:44:14 +08:00
26292f0dcc
Asset upload
2012-05-17 06:28:29 +08:00
617a683d00
image insertion completed..
2012-05-16 16:22:50 +08:00
c380c4cad0
popup fixed
2012-05-16 15:34:23 +08:00
30137b50b4
popup fix..
2012-05-16 15:33:54 +08:00
75cbae049b
few experiments…
2012-05-16 11:18:54 +08:00
0b0916179f
Change assets
2012-05-16 11:07:11 +08:00
53a0fbddf0
Fix commit error
2012-05-15 21:25:51 +08:00
281cfa6518
Changes for widgets
2012-05-13 21:55:39 +08:00
803253ebcf
Put nestedSortable in page_edit.js.erb
2012-05-12 22:12:17 +08:00
1a9fa8f505
Merge branch 'desktop_harry' into desktop_devin
2012-05-11 15:28:05 +08:00
2c3637e9b4
very important update for widgets management..
2012-05-11 15:27:16 +08:00
fd52d00187
Add drag and drop to structure side_bar
2012-05-11 10:00:45 +08:00
63f904d3b0
Fix tinymce js load
...
Change to full_name for page_context index
2012-05-10 20:36:19 +08:00
97b60c48b2
update
2012-05-10 17:41:56 +08:00
b6aad17681
Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.
2012-05-10 14:16:37 +08:00
ada56a7a63
some update
2012-05-10 10:54:43 +08:00
a43877323e
Add tinymce to page_part edit for text
2012-05-10 10:34:13 +08:00
9ead6cafda
Ray's changes
2012-05-09 04:15:02 +08:00
2083e0bf4f
widget structure improvised…
2012-05-07 19:00:50 +08:00
fcc875bb5d
app store page added… and few other changes..
2012-05-04 20:28:12 +08:00
e0a191162d
Ray's changes
2012-05-04 19:11:28 +08:00
3ad11f2098
View functionality, changed controller, journal and pages collections
2012-05-03 21:38:03 +08:00
a3a1e4b92e
controller change, views working and db for paper and journals
2012-05-03 21:30:12 +08:00
aeaf2f05d1
Start Add Page - no function
2012-05-03 17:59:07 +08:00
1fce99c96f
Merge branch 'desktop_harry' into desktop_devin
2012-05-03 14:42:07 +08:00
d6cbbff9de
connection page working now..
2012-05-03 14:40:54 +08:00
b87cf0e2ff
list page
2012-05-03 14:39:22 +08:00
6b8c79a9a8
Merge branch 'desktop_devin' into desktop_harry
2012-05-02 17:06:56 +08:00
5b7c422446
position update fixed..
2012-05-02 17:05:40 +08:00
887bda1491
lots of change
2012-05-02 17:04:16 +08:00
92a53c1b27
Ray's fix
2012-05-02 16:20:59 +08:00
bfc4507696
Connection page design
2012-05-01 18:05:17 +08:00
769a67f026
the group more structured and also demo connecting with gmail account..
2012-04-30 21:17:20 +08:00
1b7fb106f8
lot of updates
2012-04-30 14:33:12 +08:00
aacd9da9fb
auto login encryption done…
2012-04-30 14:29:42 +08:00
bda21baed2
Add missing js
2012-04-30 08:32:54 +08:00
b6fceadff4
column group experiment
2012-04-30 06:41:05 +08:00
32faef0c70
DRY code for sorting
2012-04-30 06:30:52 +08:00
c4db7e2157
Fix approval setting ajax problem
2012-04-30 00:24:11 +08:00
94d61abf83
A modal view for approval user
2012-04-30 00:24:10 +08:00
851dc72f42
Ray's changes in css and html
2012-04-30 00:17:18 +08:00
2ebba577eb
journal start
2012-04-27 14:04:11 +08:00
3beb035101
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-27 11:11:56 +08:00
5aca3db95f
Ray's changes for structure and web_links
2012-04-27 11:02:56 +08:00
682880c5bf
skip it
2012-04-26 23:18:52 +08:00
c158375d02
with connection and some save settings…
2012-04-26 21:30:13 +08:00
3d293f6419
Fix for quick edit file and link in announcement
...
Change submit_button into ajax_for_submit
2012-04-26 16:42:28 +08:00
6f1eb97ace
Fix for structure js and css
2012-04-25 18:41:38 +08:00
58d52c60d3
Fix for structure: restore js and change manifests
2012-04-25 18:17:58 +08:00
7f285f4719
Change ad_banner preview from using title to id
2012-04-25 16:10:11 +08:00
a298cbd5f6
Publication started
2012-04-24 16:45:26 +08:00
c57ba305e9
Fix ad_banner
2012-04-24 14:37:06 +08:00
42aeaead93
Ray's changes, put the js for upload image component in a separate file
2012-04-24 12:15:32 +08:00
b80339d704
Ray's changes for image upload component and sign-in page
2012-04-24 11:35:50 +08:00
6831a3dbbb
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-24 02:44:39 +08:00
0c4328987a
Ray's changes for css files, sort headers in announcement and pagination
2012-04-24 02:37:51 +08:00
a5b13e680f
Add sub_menu in r_tags
2012-04-24 02:30:40 +08:00
670ec2a40e
Themes from db fixed..
2012-04-23 21:04:02 +08:00
0c46b4da23
AdImage and AnBanner JS fixed
2012-04-23 14:07:13 +08:00
81b0046f42
Preview now can be use at both ad_banner and ad_image,however it won't run correctly if user change its ad_banner at ad_image.
2012-04-23 14:07:13 +08:00
1b70852ff7
realtime preview is working. but save to object when preview
2012-04-23 14:06:37 +08:00
2f279c53ff
Apply patch from ldap
2012-04-23 14:04:55 +08:00
8c42f6bb7c
Merge branch 'desktop_harry' into desktop_devin
2012-04-20 14:44:57 +08:00
2ebed9e44a
javascript update
2012-04-20 09:45:40 +08:00
1f077cf2b3
javascript update
2012-04-20 07:31:48 +08:00
19750d69e0
some update
2012-04-20 05:38:53 +08:00
3eaf97babe
title and heading and welcome msg…
2012-04-19 20:26:21 +08:00
3c5b7a5de3
Modified confirm box…
2012-04-19 15:36:03 +08:00
72efdbd742
changes before Chirs and Ray's trip
2012-04-19 11:50:54 +08:00
4bad25e682
Msg box added and background image saving complete
2012-04-18 22:01:12 +08:00
b4bf81d40a
background image…
2012-04-18 18:20:39 +08:00
6b35cf821e
some updates
2012-04-18 18:15:02 +08:00
30a6dc6a95
Merge branch 'desktop_harry' into desktop_devin
2012-04-18 17:58:49 +08:00
11a0875c44
color changes in custom color…
2012-04-18 17:57:47 +08:00
d14630769a
Bg color fixed…
2012-04-18 14:57:00 +08:00
b743413be9
function update
2012-04-18 13:17:12 +08:00
95a1e266ae
Custom thème done and theme id done…
2012-04-17 21:15:40 +08:00
b2d72902c3
Merge branch 'desktop_harry' into desktop_devin
2012-04-17 16:35:58 +08:00
02c6933d0b
Tiles position saved in db and also change them from section manager
2012-04-17 16:33:41 +08:00
4f18257733
try
2012-04-17 01:32:53 +08:00
8d2e5210a1
alert removes
2012-04-13 17:06:27 +08:00
d92451d079
alert removed
2012-04-13 17:05:47 +08:00
7479a64c95
width changes in section page
2012-04-13 17:01:11 +08:00
957d4eaebb
Merge branch 'master' into desktop_harry
2012-04-13 16:03:43 +08:00
ca0fc4c767
Comment out code that bugged upload image in ad_banner
2012-04-13 15:53:25 +08:00
f54dba8b0b
Merge branch 'master' into desktop_harry
2012-04-13 13:39:00 +08:00
64a9579b92
final on 13 april 00:00
2012-04-13 00:00:24 +08:00
193cee2df7
new icons and widgets
2012-04-12 22:18:58 +08:00
f8873267a2
Ray's fix for announcement list
2012-04-12 18:41:14 +08:00
92427e8831
section page done…
2012-04-12 16:25:06 +08:00
7b423877bf
new updates
2012-04-12 14:50:45 +08:00
48323ac1af
lot of changes in fetching
2012-04-12 14:44:08 +08:00
67d1f7ad08
lots of change
2012-04-12 14:19:53 +08:00
83b4443910
add pic and js for permission checkbox and filter
2012-04-12 07:14:06 +08:00
57402b8602
add permission-checkbox js
2012-04-12 07:14:06 +08:00
e4c41ab54c
A filter UI for permission select. with Harry's JS
2012-04-12 07:14:06 +08:00
486845460c
Filter and delete for bulletins
2012-04-12 06:50:36 +08:00
25ca29403c
section page added
2012-04-11 17:58:52 +08:00
5a6541a592
Setting page update
2012-04-11 17:26:25 +08:00
c55cd5c9bb
Last commit
2012-04-11 15:50:27 +08:00
68803c0c97
Lets see
2012-04-11 15:36:32 +08:00
edf6089e0c
Devin complete
2012-04-11 15:34:19 +08:00
4875b339f8
Fetching desktop from db
2012-04-11 15:31:10 +08:00
Harry Bomrah
chris
OrbitServer
Matthew K. Fu JuYuan
Matt
unknown
Fu Matthew
devin
Joshua Milton
Christophe Vilayphiou