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
unknown
23a3a7eff6
update archive
2012-08-20 17:14:13 +08:00
chris
3c283d1a7a
Set default picture
...
Fix tags where not in params for index fronted (news and announcement)
Change backend index for news
Home banner link for images and main title
2012-08-16 17:24:12 +08:00
Christophe Vilayphiou
96fd89cca3
Fix js for ie in list
2012-08-16 01:09:45 +08:00
Christophe Vilayphiou
53c5f6a3b9
New css and images for rss
2012-08-15 18:00:55 +08:00
Christophe Vilayphiou
0d330edfa3
New css and images for rss
2012-08-15 17:42:45 +08:00
Christophe Vilayphiou
43bc704468
Error popup only shows on flash[:error]
2012-08-15 15:55:29 +08:00
Christophe Vilayphiou
a19a5415c1
Ray's changes for list.css
2012-08-15 12:13:58 +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
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
83569fac82
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-13 18:36:04 +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
c2f3f45196
Fix for link in nccu widget
2012-08-13 11:34:14 +08:00
Christophe Vilayphiou
92fc0c8c26
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-13 11:20:23 +08:00
Christophe Vilayphiou
2ea3193879
Fix for banner link
2012-08-13 11:03:11 +08:00
Matthew K. Fu JuYuan
080974b563
Merge branch 'new_rss'
...
Conflicts:
vendor/built_in_modules/announcement/app/models/bulletin.rb
2012-08-12 23:32:28 +08:00
Matthew K. Fu JuYuan
f1b4d9e204
Add authorization for rescue interface
...
Change logic for NCCU site for status panel.
2012-08-12 23:29:13 +08:00
Christophe Vilayphiou
33fc96ac7c
Changes for NCCU after email
2012-08-11 18:19:30 +08:00
Christophe Vilayphiou
5281464af4
Fix bug for sorting when there's only one category with elements
2012-08-11 16:56:28 +08:00
Christophe Vilayphiou
bebb8a1c1e
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/archive/app/models/archive_file.rb
vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
2012-08-10 15:30:33 +08:00
Christophe Vilayphiou
53cd39f180
Delete duplicate side_bar code
2012-08-10 15:26:34 +08:00
unknown
d8b0613147
archive checkbox
2012-08-10 15:26:34 +08:00
unknown
26931a7b9c
new archive
2012-08-10 15:23:56 +08:00
unknown
81fa2a7428
archive checkbox
2012-08-10 15:19:45 +08:00
unknown
2dd2abc8d2
new archive
2012-08-10 15:17:16 +08:00
unknown
e8cea9f0ab
new archive
2012-08-10 15:14:43 +08:00
Christophe Vilayphiou
2bd132cef9
Pass category and tag to search to redirect to the right page
...
Ray's change for mouseover (take out the black background)
2012-08-09 19:16:26 +08:00
Christophe Vilayphiou
e256440678
RSS first page
2012-08-09 17:04:08 +08:00
unknown
d5c55c9697
widget & frontend field
2012-08-09 15:25:30 +08:00
Matt
1aea8d91f4
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-08 18:16:38 +08:00
Christophe Vilayphiou
0645f04240
Ray's change in css
2012-08-08 18:11:18 +08:00
Matt
62ba8c9f18
Fix bugs on 172:180
2012-08-08 17:56:00 +08:00
Matthew K. Fu JuYuan
e8317e0a4b
1.Remove category column when category is specified
...
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
2012-08-08 14:46:08 +08:00
Christophe Vilayphiou
b4c2dfe0ef
Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share
2012-08-08 11:53:47 +08:00
OrbitServer
3fdff9357c
Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share
2012-08-08 11:52:11 +08:00
OrbitServer
fbb53cca36
Ray's changes for sitemap backend
2012-08-08 11:51:20 +08:00
Christophe Vilayphiou
05e61b63bb
Fix fb share, redirect with js when the page is not requested by fb but by user
2012-08-08 11:04:19 +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
Christophe Vilayphiou
acf4446523
Add meta to head for fb share
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
c6c8187bda
Changes for design: menu, frontend news and announcement
2012-08-08 10:53:04 +08:00
Christophe Vilayphiou
9982fd880f
Update the path when name is changed in item.rb
2012-08-08 10:53:04 +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
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
Christophe Vilayphiou
e9de0e24b4
Fix fb share, redirect with js when the page is not requested by fb but by user
2012-08-08 10:12:21 +08:00
Christophe Vilayphiou
db16fdc7b5
Change for getting url from key
2012-08-08 07:46:10 +08:00
Christophe Vilayphiou
f7e6703d5f
Change the way the orig_url is passed to fb
2012-08-08 06:50:28 +08:00
Christophe Vilayphiou
fc560f4205
Try fb from override and generated page
2012-08-08 05:40:50 +08:00
Christophe Vilayphiou
3cb182ff8e
Add meta to head for fb share
2012-08-08 03:10:26 +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
Matthew K. Fu JuYuan
1c62c1a799
first version of fb_share
2012-08-06 16:12:49 +08:00
Christophe Vilayphiou
5f88408dcb
Check for 'http' or 'https' before saving a link
2012-08-04 16:29:31 +08:00
Christophe Vilayphiou
6a94d4f550
Put back impressionist where it was commented out
2012-08-04 15:42:53 +08:00
Christophe Vilayphiou
50b313976e
Fix page: take category and tag at the same time
2012-08-03 17:12:54 +08:00
Christophe Vilayphiou
2d2e01115b
Fix page: take category and tag at the same time
...
With news and announcement views
2012-08-03 01:44:06 +08:00
Christophe Vilayphiou
4127d7f2eb
Fix tags
2012-08-03 01:35:41 +08:00
Matthew K. Fu JuYuan
1b29eb5de4
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-01 18:15:28 +08:00
Matthew K. Fu JuYuan
ee5ac0227e
change the algorithm of tag cloud.
2012-08-01 18:15:10 +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
25a911b4f8
Change for page: take category and tag at the same time
2012-08-01 16:33:46 +08:00
Christophe Vilayphiou
0078c97b19
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 14:27:44 +08:00
Christophe Vilayphiou
9f859b903d
Add custom validator and fix .html_safe with rescue
2012-07-31 14:25:46 +08:00
Matthew K. Fu JuYuan
7e3b59c09a
finished tag clouds
2012-07-31 11:57:32 +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
f3ccbce5c8
Put back impressions for new and bulletin.
...
Add view_count field to tag.
2012-07-30 17:57:55 +08:00
Christophe Vilayphiou
7440727acd
Fix: "._type" to ".class"
2012-07-30 17:21:37 +08:00
Matthew K. Fu JuYuan
4e1a91ed90
Merge branch 'changing_tag'
...
Conflicts:
vendor/built_in_modules/news/app/models/news_tag.rb
2012-07-30 14:43:53 +08:00
Matthew K. Fu JuYuan
946ec9306f
first version of tag cloud.
2012-07-30 11:59:20 +08:00
Christophe Vilayphiou
a6a8fe3d64
Remove remaining 18n_variables
2012-07-27 19:37:25 +08:00
Matthew K. Fu JuYuan
a657a7d615
remove cache
2012-07-27 19:14:24 +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
804695749d
Fix bugs after removal of i18n_variable
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
53cae0a9ee
Remove i18n_variable for views
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
49dd3a1770
Remove i18n_variable for controllers, helpers and models
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
e2ebd48b22
Remove i18n_variable for announcement
2012-07-27 19:12:58 +08:00
Matthew K. Fu JuYuan
de831f1f96
disable homepage cache for english page
2012-07-27 05:08:24 +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
13ec25ed10
fix for orbit bar broken
2012-07-25 17:44:50 +08:00
Matthew K. Fu JuYuan
97b4eee798
full site search with google
2012-07-25 17:20:25 +08:00
Matthew K. Fu JuYuan
f9bdb4a327
New and Announcement search. Disabled impression.
2012-07-20 15:47:40 +08:00
OrbitServer
f223e4bb1e
Ika's changes for orbit bar
2012-07-20 15:41:27 +08:00
unknown
10731dc211
demo widget
2012-07-18 18:07:45 +08:00
Matthew K. Fu JuYuan
2ae6b54a45
fix for not working cache
2012-07-13 18:32:17 +08:00
Matthew K. Fu JuYuan
4daf36908c
working cache
2012-07-13 15:36:10 +08:00
Matthew K. Fu JuYuan
0e65e379b0
cache first commit
2012-07-12 11:47:24 +08:00
Matthew K. Fu JuYuan
773371e885
fix from messy search
2012-07-09 16:48:23 +08:00
Christophe Vilayphiou
e48735a4ac
Merge branch 'desktop_devin' of github.com:Rulingcom/orbit into desktop_devin
2012-07-09 16:39:58 +08:00
unknown
1d8e386bde
demo website widget
2012-07-09 16:28:03 +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
Matthew K. Fu JuYuan
09d46f2f75
NCCU 上傳版本 0709
...
Merge branch 'nccu0621'
Conflicts:
Gemfile
config/resque.god
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
2012-07-09 16:02:59 +08:00
devin
bfedf207c9
some changes
2012-07-09 15:37:47 +08:00
Matthew K. Fu JuYuan
49862e70f9
hide category at front end
2012-07-09 12:05:21 +08:00
devin
58d162d225
publication adjustment
2012-07-09 10:44:01 +08:00
Matthew K. Fu JuYuan
56caf4b34e
category disable for backend
2012-07-06 18:11:55 +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
Joshua Milton
bb75383ef0
Seminar Pages modified
2012-07-05 16:27:59 +08:00
Matthew K. Fu JuYuan
c5fdff764e
orbit disable object for categories
2012-07-05 16:00:45 +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
441929eb74
Latest code by joshua
2012-07-04 18:39:28 +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
Matthew K. Fu JuYuan
ae2cbb728e
archive for announcement
2012-07-04 17:36:51 +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
Matthew K. Fu JuYuan
f7107936d0
fix for checking @rulingcom.com
2012-07-03 18:21:48 +08:00
Matthew K. Fu JuYuan
9607b5bbfd
rulingcom帳號不透過LDAP認證
2012-07-03 18:12:44 +08:00
Matthew K. Fu JuYuan
d0632b2e4c
change name format
2012-07-03 16:05:19 +08:00
Matthew K. Fu JuYuan
56ecf9c69b
remove remember for nccu
2012-07-03 15:59:25 +08:00
Matthew K. Fu JuYuan
4014f8ee47
fix over queue at resque
2012-07-03 10:51:26 +08:00
Harry Bomrah
bacb1f1e63
Timeline ajax loading
2012-07-02 21:06:36 +08:00
devin
f34cb47618
font aweosme change
2012-07-02 16:23:14 +08:00
devin
08fd07b6aa
timeline and font update
2012-07-02 16:22:51 +08:00
devin
6533abf214
font awesome update
2012-07-02 11:10:01 +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
Matthew K. Fu JuYuan
818c58c1ee
fix for 新聞與公告QA
...
1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時,圖片無法正常顯示(但是可以正常被編輯調整並於前台顯示)
2.add 上傳檔案大小限制: 3MB
3.公告的發佈單位為何是顯示單位代碼:M00?應顯示發布單位
2012-06-26 17:46:02 +08:00
Harry Bomrah
555ec86403
Timeline commit
2012-06-26 15:59:28 +08:00
Matthew K. Fu JuYuan
56b1bd9eaa
add translation
2012-06-26 10:57:51 +08:00
Matthew K. Fu JuYuan
ffd95ee1fd
fix
...
新聞與公告QA-權限設定--優先處理3.一般發佈新聞&公告人,應該只能看到自己發佈的新聞&公告,但是目前可以看到全部,而且可以刪除其他人的公告.至少要不能刪除別人的公告
新聞與公告QA-編輯問題-發佈新聞時,發佈單位預設為請選擇
新聞與公告QA-編輯問題-公告模組請移除 Subtitle 欄位
put rb-readline only in Linux
make app_manager destroy after user deletion. may need to run:
AppManager.all.collect{|am| am if am.user.nil? }.delete_if {|x| x == nil}.each{|am| am.destroy}
for clean up DB.
2012-06-25 16:23:16 +08:00
Matthew K. Fu JuYuan
a36f73bafc
fix 0621 Trello:"171 頁面管理不能使用"
2012-06-22 18:19:40 +08:00
Matthew K. Fu JuYuan
3f95fe4f13
tmp commit for search. start nccu0621 first
2012-06-22 11:34:10 +08:00
Matthew K. Fu JuYuan
cb17fe0825
Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working
2012-06-20 14:50:51 +08:00
Matthew K. Fu JuYuan
8dd1ab32c1
Add this toolbar, and nccu calendar fix
2012-06-04 16:51:29 +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
4d288fb9d1
add script for cache user
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
2f500ff460
For non-login user,show no drop down menu and return to home after press orbit button.
2012-05-29 16:33:38 +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
ff620b41aa
add script for cache user
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
Harry Bomrah
7488341836
Commit for app window..
2012-05-25 15:41:07 +08:00
Matthew K. Fu JuYuan
3480fa2545
Fix login and label. Check sync jobs and update info function.
2012-05-24 17:01:00 +08:00
Christophe Vilayphiou
c062b43069
Merge branch 'design_team' into ldap
2012-05-23 12:11:38 +08:00
Christophe Vilayphiou
71d4241a2f
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-23 12:11:26 +08:00
Christophe Vilayphiou
006b84f6a1
Ray's fix for ie
2012-05-23 12:06:09 +08:00
Christophe Vilayphiou
7c44e94285
Order list by created_at desc
...
Add best image size in news new
2012-05-23 11:46:19 +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
eab82269c1
Remove seconds from date display
2012-05-22 20:19:04 +08:00
Christophe Vilayphiou
d6b92fc604
Fixed bugs for nccu
2012-05-22 20:00:07 +08:00
Christophe Vilayphiou
11a371cbb9
Fix destroy in structure
...
Fix sorting
2012-05-22 17:55:45 +08:00
Christophe Vilayphiou
541aa5831e
JS changes to load drag and drop
2012-05-22 17:37:15 +08:00
Christophe Vilayphiou
874a89d99b
Ray's fix for structure side_bar
2012-05-22 16:48:57 +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
Christophe Vilayphiou
aa114568c4
Move design to site_settings side_bar
2012-05-21 18:20:39 +08:00
Christophe Vilayphiou
c4d7079059
Fix's Matt code for not showing bulletins in index
2012-05-21 18:10:03 +08:00
devin
6fedf7232a
app update
2012-05-21 15:45:15 +08:00
Harry Bomrah
81ff0f2c1c
Merge branch 'desktop_harry' into desktop_devin
2012-05-21 15:26:38 +08:00
devin
a78b72ebfc
app update
2012-05-21 15:25:18 +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
815e6a8361
Fix matt's code and add it to filters
2012-05-19 03:19:55 +08:00
Christophe Vilayphiou
db410b9c50
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-18 19:44:18 +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
661fcafe70
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team
...
Conflicts:
vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
2012-05-18 18:50:10 +08:00
Matthew K. Fu JuYuan
6ce6577e83
fix news approve and preview
2012-05-18 18:47:18 +08:00
Matt
6a022c90da
Changes on nccu
2012-05-18 15:20:45 +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
7c6b807170
Change impression count to exclude when :referrer is nil
2012-05-18 14:13:11 +08:00
Christophe Vilayphiou
a4afd5c1d3
Merge branch 'design_team' into ldap
2012-05-18 10:36:32 +08:00
Christophe Vilayphiou
8ad7f70822
Proof i18n_variable for categories
2012-05-18 10:28:28 +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
Christophe Vilayphiou
5d5e798b1a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-17 23:35:14 +08:00
Christophe Vilayphiou
a0ad1f59b6
Comment out filename in FIleAssetUploader
2012-05-17 23:34:15 +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
1e2b146c21
Merge branch 'design_team' into ldap
2012-05-17 10:00:07 +08:00
Christophe Vilayphiou
4467bc5e48
Change Date to DateTime
...
Fix filename error
2012-05-17 09:59:49 +08:00
Christophe Vilayphiou
bfad553cc3
Merge branch 'design_team' into ldap
2012-05-17 09:31:02 +08:00
Christophe Vilayphiou
84dac1d250
Create FileAssetUploader
2012-05-17 09:30:21 +08:00
Christophe Vilayphiou
eba4671733
Merge branch 'design_team' into ldap
2012-05-17 06:46:29 +08:00
Christophe Vilayphiou
cd1640482a
Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
...
Conflicts:
app/views/layouts/_side_bar.html.erb
2012-05-17 06:45:30 +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
7f2564a81e
Fix sidebar and hide some links by roles
2012-05-17 06:43:39 +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
Christophe Vilayphiou
9129835f23
Add tags to assets
2012-05-16 18:19:41 +08:00
Matthew K. Fu JuYuan
0647698012
fix ad_image size hints. fix orbit backend controller error when changing language.
2012-05-16 17:16:48 +08:00
Matthew K. Fu JuYuan
befd3bcdec
AdBanner reopen new banner and delete. Rename title with content editable tag.
2012-05-16 16:42:43 +08:00
Harry Bomrah
617a683d00
image insertion completed..
2012-05-16 16:22:50 +08:00
Harry Bomrah
c380c4cad0
popup fixed
2012-05-16 15:34:23 +08:00
Harry Bomrah
30137b50b4
popup fix..
2012-05-16 15:33:54 +08:00
Matthew K. Fu JuYuan
a31a9c4792
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509
...
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/helpers/application_helper.rb
app/models/ad_banner.rb
2012-05-16 12:13:07 +08:00
Matthew K. Fu JuYuan
88a26cc6a1
Fix sidebar and hide some links by roles
2012-05-16 12:10:16 +08:00
Harry Bomrah
75cbae049b
few experiments…
2012-05-16 11:18:54 +08:00
Christophe Vilayphiou
0b0916179f
Change assets
2012-05-16 11:07:11 +08:00
Christophe Vilayphiou
b31846f424
Delete duplicate side_bar code
2012-05-16 04:35:19 +08:00
Christophe Vilayphiou
ad9ac5f3f7
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-05-16 01:31:16 +08:00
unknown
cc02ea511c
archive checkbox
2012-05-16 01:13:39 +08:00
unknown
cf5e6c1a96
new archive
2012-05-16 01:09:21 +08:00
unknown
4e9bb1b583
new archive
2012-05-16 01:06:26 +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
Christophe Vilayphiou
53a0fbddf0
Fix commit error
2012-05-15 21:25:51 +08:00
Matthew K. Fu JuYuan
3f744dab05
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
2012-05-15 18:55:16 +08:00
Matthew K. Fu JuYuan
b23b5e8ec5
Object auth for ad_banner
2012-05-15 16:39:23 +08:00
Matthew K. Fu JuYuan
77deffb512
Nccu calendar and daily job.
2012-05-15 14:03:54 +08:00
Matthew K. Fu JuYuan
551e1ef740
Reflect login method. LDAP,MidSite connection. The Mysql connection now is build on fly.
2012-05-15 11:28:24 +08:00
Matthew K. Fu JuYuan
0a9f0bcc45
starting ad_banner auth
2012-05-15 09:57:05 +08:00
Christophe Vilayphiou
8fcb8ef8de
Change the way links are displayed in menus in front-end
2012-05-14 21:43:10 +08:00
Christophe Vilayphiou
59b55d1574
Merge branch 'design_team' into ldap
2012-05-14 12:42:06 +08:00
Matthew K. Fu JuYuan
9ba4c2cf2f
Change to apply page to had object_auth
2012-05-14 12:40:50 +08:00
Matthew K. Fu JuYuan
2cd67356a5
Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509
...
Conflicts:
config/locales/zh_tw.yml
2012-05-14 12:36:09 +08:00
Matthew K. Fu JuYuan
e1450ec748
Change to apply page to had object_auth
2012-05-14 12:34:15 +08:00
Christophe Vilayphiou
ebc8dd33ec
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile.lock
app/controllers/admin/module_apps_controller.rb
app/controllers/application_controller.rb
vendor/built_in_modules/web_resource/web_resource.json
2012-05-14 00:57:17 +08:00
Matthew K. Fu JuYuan
dfd2d82efb
Restart job
2012-05-14 00:50:36 +08:00
Matthew K. Fu JuYuan
7a6d30ad62
Remove unless files and change routes.
2012-05-14 00:50:36 +08:00
Matthew K. Fu JuYuan
0119ab1a74
New Interface for App Auth and Object Auth
2012-05-14 00:50:12 +08:00
Matthew K. Fu JuYuan
a184f96ce7
AdBanner app_auth
2012-05-14 00:49:22 +08:00
Matthew K. Fu JuYuan
8b42c595b3
Don't display admin in any premission select. Fix not necessary header for UT data
2012-05-14 00:49:22 +08:00
Christophe Vilayphiou
cf8d20dc84
Add category and tag to pages
2012-05-14 00:33:52 +08:00
Christophe Vilayphiou
e40c76bf5f
Fix new page form
...
Redirect to home when not authorized
Get only module_apps with app_pages for new and edit page
Change web_resource.json
2012-05-13 23:48:34 +08:00
Christophe Vilayphiou
01d0c002f5
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/views/admin/pages/_edit.html.erb
app/views/admin/pages/_form.html.erb
lib/parsers/parser_back_end.rb
2012-05-13 23:14:13 +08:00
Christophe Vilayphiou
62e9a772f6
Fix titles for widgets
...
Add translations
2012-05-13 23:09:48 +08:00
Christophe Vilayphiou
4ae8299949
Add custom title to widgets
...
Fix pagination conflict with main_content and widgets
2012-05-13 22:35:00 +08:00
Christophe Vilayphiou
281cfa6518
Changes for widgets
2012-05-13 21:55:39 +08:00
Christophe Vilayphiou
4685952bd6
Changes in page_edit
2012-05-13 20:13:26 +08:00
Christophe Vilayphiou
ef2d416c70
Ray's changes for page_edit
2012-05-13 19:36:04 +08:00
Christophe Vilayphiou
82fa85def8
Clean the parsers code
2012-05-13 19:32:05 +08:00
Christophe Vilayphiou
803253ebcf
Put nestedSortable in page_edit.js.erb
2012-05-12 22:12:17 +08:00
Christophe Vilayphiou
ef49df448d
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/helpers/admin/item_helper.rb
2012-05-11 18:09:34 +08:00
Christophe Vilayphiou
17b486f9e9
Fix bugs for shift_to and change items.rake for the missing position in db
2012-05-11 17:56:26 +08:00
Christophe Vilayphiou
076f5ad6ef
Ray's changes for drag and drop in structure's side_bar
2012-05-11 17:54:33 +08:00
Matthew K. Fu JuYuan
82d1d3fed8
Restart job
2012-05-11 16:56:32 +08:00
Matthew K. Fu JuYuan
0a34f0277e
Remove unless files and change routes.
2012-05-11 16:46:36 +08:00
Matthew K. Fu JuYuan
20a1a6e30f
New Interface for App Auth and Object Auth
2012-05-11 16:44:40 +08:00
Christophe Vilayphiou
6a443f0976
Add mongoid-tree to Item
2012-05-11 16:16:09 +08:00
Harry Bomrah
1a9fa8f505
Merge branch 'desktop_harry' into desktop_devin
2012-05-11 15:28:05 +08:00
Harry Bomrah
2c3637e9b4
very important update for widgets management..
2012-05-11 15:27:16 +08:00
Christophe Vilayphiou
fd52d00187
Add drag and drop to structure side_bar
2012-05-11 10:00:45 +08:00
Christophe Vilayphiou
63f904d3b0
Fix tinymce js load
...
Change to full_name for page_context index
2012-05-10 20:36:19 +08:00
devin
97b60c48b2
update
2012-05-10 17:41:56 +08:00
Matthew K. Fu JuYuan
cb25cf60a9
AdBanner app_auth
2012-05-10 15:37:07 +08:00
Matthew K. Fu JuYuan
4f1e47bb82
Don't display admin in any premission select. Fix not necessary header for UT data
2012-05-10 14:43:05 +08:00
Christophe Vilayphiou
5eba2638ce
Merge branch 'design_team' into ldap
2012-05-10 14:17:38 +08:00
Matthew K. Fu JuYuan
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
Matthew K. Fu JuYuan
87ebcc48e7
Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.
2012-05-10 11:51:44 +08:00
devin
ada56a7a63
some update
2012-05-10 10:54:43 +08:00
Christophe Vilayphiou
87449ec6a8
Merge branch 'design_team' into ldap
2012-05-10 10:34:28 +08:00
Christophe Vilayphiou
a43877323e
Add tinymce to page_part edit for text
2012-05-10 10:34:13 +08:00
Christophe Vilayphiou
de739d7d20
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/web_resource/web_resource.json
2012-05-10 00:34:23 +08:00
Christophe Vilayphiou
bc5e975fab
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-10 00:29:22 +08:00
Christophe Vilayphiou
9161dc73b5
Translation for "or"
2012-05-10 00:27:12 +08:00
Christophe Vilayphiou
13587306bc
Add list widgets for announcement, news and links with categories and tags
2012-05-10 00:25:30 +08:00
Christophe Vilayphiou
ecd21338bc
Matt's changes for side_bar
2012-05-10 00:23:42 +08:00
Christophe Vilayphiou
dc9af65524
Merge branch 'design_team' into ldap
2012-05-09 15:25:16 +08:00
Christophe Vilayphiou
038378be9a
Ray's changes for inccu in orbit_bar
2012-05-09 15:20:09 +08:00
Christophe Vilayphiou
1785da51a2
Merge branch 'design_team' into ldap
2012-05-09 15:04:06 +08:00
Christophe Vilayphiou
50edfdd02f
Changes for tag key in side_bar announcement and news, fix ad_banner css for dot
2012-05-09 14:59:06 +08:00
Christophe Vilayphiou
9d01f624da
Merge branches 'nccu_0509' and 'design_team' into ldap
2012-05-09 14:21:24 +08:00
Matthew K. Fu JuYuan
6c9944918a
Fix i18 variable
2012-05-09 14:18:52 +08:00
Matthew K. Fu JuYuan
47bca643af
hidding new ad_banner
2012-05-09 14:17:20 +08:00
Christophe Vilayphiou
d88d4e58dc
Merge branch 'design_team' into ldap
...
Conflicts:
config/environments/development.rb
2012-05-09 13:51:00 +08:00
Christophe Vilayphiou
f9f7ddc8ee
Hide some links in side_bar for site_settings
2012-05-09 12:53:42 +08:00
Christophe Vilayphiou
44a485611a
Site_info and site_setting i18n
2012-05-09 12:29:46 +08:00
Christophe Vilayphiou
9216f29bc9
Ray's changes for mail settings
2012-05-09 12:19:32 +08:00
Christophe Vilayphiou
41c0c26330
Add mail_settings
2012-05-09 11:38:29 +08:00
Christophe Vilayphiou
b3be210ff7
Small adjustment for dashboard
2012-05-09 05:55:47 +08:00
Christophe Vilayphiou
2b03263fb7
Dashboard partial implementation
2012-05-09 05:53:07 +08:00
Christophe Vilayphiou
909ca19456
Fix bugs in sub_menu
2012-05-09 04:31:04 +08:00
Christophe Vilayphiou
9ead6cafda
Ray's changes
2012-05-09 04:15:02 +08:00
Christophe Vilayphiou
8d70d87120
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-09 04:13:14 +08:00
Christophe Vilayphiou
26a50cc862
Add sub_menu to children
2012-05-09 04:15:45 +08:00
Christophe Vilayphiou
a186ae08d8
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 21:47:03 +08:00
Christophe Vilayphiou
0cc94c65a8
Patch from ldap: Test version for DB sync schedule job
2012-05-08 21:14:57 +08:00
Christophe Vilayphiou
ffcfda912e
Patch from ldap: Calendar sync done,need Ray's JS change
2012-05-08 20:44:17 +08:00
Matthew K. Fu JuYuan
7af17f19ac
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
2012-05-08 20:26:36 +08:00
Matthew K. Fu JuYuan
dbac219c18
now jobs is working
2012-05-08 20:25:11 +08:00
Matthew K. Fu JuYuan
f3b58ea36d
starting Resque
2012-05-08 20:24:37 +08:00
Matthew K. Fu JuYuan
f949523bbb
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
2012-05-08 20:21:28 +08:00
Matthew K. Fu JuYuan
69f2f6a716
now jobs is working
2012-05-08 20:21:28 +08:00
Matthew K. Fu JuYuan
c28d7d59b6
starting Resque
2012-05-08 20:21:28 +08:00
Christophe Vilayphiou
18c42a80a6
Put site_settings in the orbit_button
2012-05-08 20:06:56 +08:00
Matthew K. Fu JuYuan
083963af65
Test version for DB sync schedule job
2012-05-08 19:20:53 +08:00
Christophe Vilayphiou
55bfaea43e
Can show announcement and news list by tag's key
2012-05-08 17:27:42 +08:00
Christophe Vilayphiou
5c7cf1aef2
Add sub_menu to site_info
2012-05-08 17:27:02 +08:00
Christophe Vilayphiou
d2e07f537a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 17:24:40 +08:00
Christophe Vilayphiou
a3868cb785
Ray's changes for front-end banner
2012-05-08 17:21:26 +08:00
Matthew K. Fu JuYuan
f827e8429e
Calendar sync done,need Ray's JS change
2012-05-08 16:08:41 +08:00
Christophe Vilayphiou
caba8ce7a4
Add nccu icon
...
Change news list in front-end
Hide links and files in news and announcement front-end show when nothing
2012-05-08 15:27:43 +08:00
Matthew K. Fu JuYuan
b22a275360
Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap
2012-05-08 11:55:21 +08:00
Christophe Vilayphiou
65a0998080
Merge branch 'jobs_and_mail' into ldap
...
Conflicts:
config/environments/development.rb
config/routes.rb
2012-05-08 11:45:34 +08:00
Matthew K. Fu JuYuan
d7194dc805
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
2012-05-08 11:41:58 +08:00
Matthew K. Fu JuYuan
5b604037f8
now jobs is working
2012-05-08 11:41:58 +08:00
Matthew K. Fu JuYuan
7339d1ee4a
starting Resque
2012-05-08 11:41:58 +08:00
Christophe Vilayphiou
2b9190a49e
Merge branch 'design_team' into ldap
...
Conflicts:
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-05-08 11:40:38 +08:00
Christophe Vilayphiou
ba4385e3fd
Add module authorization for news
...
Add files and links to announcement and news
Change page.children into page.ordered_and_visible_children in parser_commom
2012-05-08 10:50:09 +08:00
Harry Bomrah
2083e0bf4f
widget structure improvised…
2012-05-07 19:00:50 +08:00
Christophe Vilayphiou
469f5c8267
Add always_display checkbox for title in site_info independent of i18n
2012-05-07 16:29:32 +08:00
Christophe Vilayphiou
9a5e7cc8fa
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/views/admin/sites/site_info.html.erb
2012-05-07 16:08:05 +08:00
Christophe Vilayphiou
f534e6ca7b
Ray's changes for site_info
2012-05-07 15:55:45 +08:00
Christophe Vilayphiou
8a3f0b9bdc
Add menu_enabled_for: the page can be shown even if there's no link in the menu
2012-05-07 15:47:14 +08:00
Christophe Vilayphiou
8b61314cc4
Add i18n for site_info.
...
Add always display site title.
Changes for menu in front-end
2012-05-07 15:11:43 +08:00
Christophe Vilayphiou
0246341aef
Add footer to site_info
2012-05-07 11:25:33 +08:00
Christophe Vilayphiou
1fb6c20b86
Add site_info
2012-05-07 00:54:18 +08:00
Christophe Vilayphiou
48f8fbde7f
Fix site_locale_default_head and active for current locale
2012-05-07 00:53:52 +08:00
Christophe Vilayphiou
51f87e7212
Add missing translation for enabled_for
2012-05-06 03:36:01 +08:00
Christophe Vilayphiou
ce1fecaf93
Add position ordering and hiding page for i18n
2012-05-06 00:35:13 +08:00
Christophe Vilayphiou
f190ce18ee
Put sorting in web_link, page_context and design
2012-05-05 21:20:20 +08:00
Christophe Vilayphiou
b48099d752
Fix bug in is_admin?
...
Fix bug in helpers for news and announcement
2012-05-05 17:40:07 +08:00
Harry Bomrah
fcc875bb5d
app store page added… and few other changes..
2012-05-04 20:28:12 +08:00
Christophe Vilayphiou
555aa088d9
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-04 19:23:45 +08:00
Christophe Vilayphiou
3ef81c520e
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-04 19:16:57 +08:00
Christophe Vilayphiou
e0a191162d
Ray's changes
2012-05-04 19:11:28 +08:00
Christophe Vilayphiou
15bc4d4268
Fix merge error
2012-05-04 16:12:28 +08:00
Christophe Vilayphiou
8f1ce78ab4
Fix bug when homepage
2012-05-04 15:51:51 +08:00
Matthew K. Fu JuYuan
453cb21066
Announcement preivew
2012-05-04 15:50:45 +08:00
Matthew K. Fu JuYuan
f6307abfbf
fix broken ad_banner
2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan
bff3cefbc7
Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager.
2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan
f427c3803f
clean up useless flash msgs. add i18n vars for app auth and object auth
2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan
05ded8de03
Fix for NCCU 0430 all functions ok with two submanagers but different behavors
2012-05-04 15:38:18 +08:00
Harry Bomrah
3ad11f2098
View functionality, changed controller, journal and pages collections
2012-05-03 21:38:03 +08:00
Harry Bomrah
a3a1e4b92e
controller change, views working and db for paper and journals
2012-05-03 21:30:12 +08:00
devin
aeaf2f05d1
Start Add Page - no function
2012-05-03 17:59:07 +08:00
Harry Bomrah
1fce99c96f
Merge branch 'desktop_harry' into desktop_devin
2012-05-03 14:42:07 +08:00
Harry Bomrah
d6cbbff9de
connection page working now..
2012-05-03 14:40:54 +08:00
devin
b87cf0e2ff
list page
2012-05-03 14:39:22 +08:00
Christophe Vilayphiou
45e21f9569
Fix filter category in news
2012-05-02 17:55:02 +08:00
Harry Bomrah
6b8c79a9a8
Merge branch 'desktop_devin' into desktop_harry
2012-05-02 17:06:56 +08:00
Harry Bomrah
5b7c422446
position update fixed..
2012-05-02 17:05:40 +08:00
devin
887bda1491
lots of change
2012-05-02 17:04:16 +08:00
Christophe Vilayphiou
b8cd7097b0
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-02 16:27:09 +08:00
Christophe Vilayphiou
2762c24593
Fix wrong variable names in translations
2012-05-02 16:22:06 +08:00
Christophe Vilayphiou
92a53c1b27
Ray's fix
2012-05-02 16:20:59 +08:00
devin
bfc4507696
Connection page design
2012-05-01 18:05:17 +08:00
Harry Bomrah
769a67f026
the group more structured and also demo connecting with gmail account..
2012-04-30 21:17:20 +08:00
Harry Bomrah
1b7fb106f8
lot of updates
2012-04-30 14:33:12 +08:00
Harry Bomrah
aacd9da9fb
auto login encryption done…
2012-04-30 14:29:42 +08:00
Christophe Vilayphiou
fe54c6ae71
Fix bug when id or single object
2012-04-30 14:23:41 +08:00
Christophe Vilayphiou
a9ab016d52
Merge branch 'design_team' into ldap
2012-04-30 08:33:21 +08:00
Christophe Vilayphiou
bda21baed2
Add missing js
2012-04-30 08:32:54 +08:00
Christophe Vilayphiou
767e4a3fe9
Merge branch 'design_team' into ldap
2012-04-30 08:16:17 +08:00
Christophe Vilayphiou
496b8de58a
Side bar translation
2012-04-30 08:15:45 +08:00
Christophe Vilayphiou
20504b2205
Merge branch 'design_team' into ldap
...
Conflicts:
app/controllers/admin/page_parts_controller.rb
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/_sort_headers.html.erb
2012-04-30 07:57:20 +08:00
devin
b6fceadff4
column group experiment
2012-04-30 06:41:05 +08:00
Christophe Vilayphiou
b8f52fa1ec
Separate announcement and news
2012-04-30 06:31:46 +08:00
Christophe Vilayphiou
63ee8eaca9
Remove url from sorting
...
Add sorting_options to params in filters
2012-04-30 06:30:52 +08:00
Christophe Vilayphiou
32faef0c70
DRY code for sorting
2012-04-30 06:30:52 +08:00
Matthew K. Fu JuYuan
a46a8898d7
Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
2012-04-30 00:24:11 +08:00
Matthew K. Fu JuYuan
6b151b1fb6
403 for unauth apps
2012-04-30 00:24:11 +08:00
Matthew K. Fu JuYuan
c4db7e2157
Fix approval setting ajax problem
2012-04-30 00:24:11 +08:00
Matthew K. Fu JuYuan
94d61abf83
A modal view for approval user
2012-04-30 00:24:10 +08:00
Matthew K. Fu JuYuan
9d97b7c008
Change for the notice msg at login page
2012-04-30 00:24:10 +08:00
Christophe Vilayphiou
851dc72f42
Ray's changes in css and html
2012-04-30 00:17:18 +08:00
devin
a99d685bce
conflict solved
2012-04-28 01:56:00 +08:00
devin
03f19b80b4
small change
2012-04-28 01:49:48 +08:00
Harry Bomrah
a23f290831
changes for login …
2012-04-27 22:14:44 +08:00
Christophe Vilayphiou
2362e1cfdd
Merge branch 'design_team' into ldap
2012-04-27 15:28:32 +08:00
Christophe Vilayphiou
799fd1e3ac
Fix css bugs (opacity=) and changes in sign_in page
2012-04-27 15:27:59 +08:00
Christophe Vilayphiou
feb2156fd3
Fix error in side_bar for web_links
2012-04-27 14:15:36 +08:00
devin
2ebba577eb
journal start
2012-04-27 14:04:11 +08:00
Christophe Vilayphiou
3beb035101
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-27 11:11:56 +08:00
Christophe Vilayphiou
5aca3db95f
Ray's changes for structure and web_links
2012-04-27 11:02:56 +08:00
devin
682880c5bf
skip it
2012-04-26 23:18:52 +08:00
Harry Bomrah
c158375d02
with connection and some save settings…
2012-04-26 21:30:13 +08:00
Harry Bomrah
c2ac682787
updates for connections
2012-04-26 17:23:47 +08:00
Christophe Vilayphiou
7d6b82d9dd
Merge branch 'ad_banner' into ldap
2012-04-26 17:15:44 +08:00
Matthew K. Fu JuYuan
4af2068c1f
Fix ad_banner sec and msec
2012-04-26 17:11:06 +08:00
Matthew K. Fu JuYuan
faace9893a
dehumanize ad banner
2012-04-26 17:11:05 +08:00
Matthew K. Fu JuYuan
9a5ce5f512
Remove unless sidebar links.
2012-04-26 17:11:05 +08:00
Christophe Vilayphiou
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
Harry Bomrah
64be61d61b
with gmail widget..
2012-04-26 14:47:49 +08:00
Christophe Vilayphiou
6bf4c60d45
Changes for js and ccs load for site's pages
2012-04-26 01:49:02 +08:00
Christophe Vilayphiou
6f1eb97ace
Fix for structure js and css
2012-04-25 18:41:38 +08:00
Christophe Vilayphiou
58d52c60d3
Fix for structure: restore js and change manifests
2012-04-25 18:17:58 +08:00
Christophe Vilayphiou
1f4fe65430
Merge branch 'design_team' into ldap
...
Conflicts:
app/views/devise/sessions/new.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
2012-04-25 16:45:04 +08:00
Christophe Vilayphiou
876036dd20
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/views/admin/ad_banners/_ad_banner_tab.html.erb
2012-04-25 16:39:26 +08:00
Christophe Vilayphiou
44ded537b3
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-25 16:28:34 +08:00
Christophe Vilayphiou
65a6f9c416
Ray's css fix for quick edit
2012-04-25 16:26:27 +08:00
Matthew K. Fu JuYuan
a3a109fb8b
Remove JS debug msg.
2012-04-25 16:10:11 +08:00
Matthew K. Fu JuYuan
7f285f4719
Change ad_banner preview from using title to id
2012-04-25 16:10:11 +08:00
Matthew K. Fu JuYuan
72921d6dfd
fix useless notice at login
2012-04-25 16:10:11 +08:00
Christophe Vilayphiou
abf75ffedd
Merge branch 'design_team' into ldap
2012-04-25 15:45:16 +08:00
Christophe Vilayphiou
573c19ff4b
Remove .erb when including css
2012-04-25 15:44:44 +08:00
Christophe Vilayphiou
8adb9c6878
Merge branch 'design_team' into ldap
2012-04-25 15:10:50 +08:00
Christophe Vilayphiou
3ec8bb7be6
Fix assets bug: when having a '.' in the name, the extension must be specified
2012-04-25 15:10:28 +08:00
Christophe Vilayphiou
8f242e2d39
Merge branch 'design_team' into ldap
2012-04-24 17:00:51 +08:00
Christophe Vilayphiou
3308744396
Fix side_bar after Matt's changes in translation
2012-04-24 17:00:33 +08:00
Christophe Vilayphiou
0c4f1d91f7
Merge branch 'ad_banner' into ldap
2012-04-24 16:46:04 +08:00
Harry Bomrah
a298cbd5f6
Publication started
2012-04-24 16:45:26 +08:00
Matthew K. Fu JuYuan
db46803cda
R4-Billingual
2012-04-24 16:43:45 +08:00
Christophe Vilayphiou
d1f687e43e
Merge branch 'design_team' into ldap
2012-04-24 16:32:30 +08:00
Christophe Vilayphiou
c7d8e0b27b
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
2012-04-24 16:32:00 +08:00
Christophe Vilayphiou
291d5e3a03
Ray's changes in css
2012-04-24 16:24:50 +08:00
Christophe Vilayphiou
70f6c7b540
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
2012-04-24 15:28:52 +08:00
Christophe Vilayphiou
c0abaa643c
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-24 15:21:12 +08:00
Christophe Vilayphiou
45c194e870
Ray's changes in css
2012-04-24 15:15:36 +08:00
Christophe Vilayphiou
51ee9a4bfa
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
...
Conflicts:
app/views/admin/ad_banners/_ad_banner_tab.html.erb
2012-04-24 14:43:30 +08:00
Matthew K. Fu JuYuan
33640de184
Changes for Billingual
2012-04-24 14:37:06 +08:00
Matthew K. Fu JuYuan
bbcdaf00e7
Disable ad_banner_preview. Just show window
2012-04-24 14:37:06 +08:00
Matthew K. Fu JuYuan
e7bb9ea86b
Fix ad image date selector
2012-04-24 14:37:06 +08:00
Matthew K. Fu JuYuan
c57ba305e9
Fix ad_banner
2012-04-24 14:37:06 +08:00
Matthew K. Fu JuYuan
04688608f7
Changes for Billingual
2012-04-24 14:30:30 +08:00
Christophe Vilayphiou
c856b4cdce
Fix for upload image component in announcement
2012-04-24 12:41:28 +08:00
Christophe Vilayphiou
42aeaead93
Ray's changes, put the js for upload image component in a separate file
2012-04-24 12:15:32 +08:00
Christophe Vilayphiou
b80339d704
Ray's changes for image upload component and sign-in page
2012-04-24 11:35:50 +08:00
Matthew K. Fu JuYuan
6e431b6137
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
2012-04-24 11:26:13 +08:00
Christophe Vilayphiou
308cfc7cf2
Merge branch 'design_team' into ldap
...
Conflicts:
app/views/devise/sessions/new.html.erb
2012-04-24 02:46:06 +08:00
Christophe Vilayphiou
6831a3dbbb
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-24 02:44:39 +08:00
Christophe Vilayphiou
0c4328987a
Ray's changes for css files, sort headers in announcement and pagination
2012-04-24 02:37:51 +08:00
Christophe Vilayphiou
d4aea664e2
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
2012-04-24 02:37:03 +08:00
Christophe Vilayphiou
a5b13e680f
Add sub_menu in r_tags
2012-04-24 02:30:40 +08:00
Harry Bomrah
670ec2a40e
Themes from db fixed..
2012-04-23 21:04:02 +08:00
Matthew K. Fu JuYuan
0836583694
Disable ad_banner_preview. Just show window
2012-04-23 18:29:23 +08:00
Matthew K. Fu JuYuan
a5db2382e7
Fix ad image date selector
2012-04-23 18:20:12 +08:00
Matthew K. Fu JuYuan
35452c039d
Fix ad_banner
2012-04-23 17:03:55 +08:00
Christophe Vilayphiou
834cbe3a11
Fix side_bar for tags
...
Modules needs to use the fullpath for active or visible in tags
2012-04-23 16:12:07 +08:00
unknown
3280ff8311
archive checkbox
2012-04-23 15:53:58 +08:00
Christophe Vilayphiou
5a423178e3
Merge branch 'design_team' into ldap
...
Conflicts:
app/assets/stylesheets/new_admin.css.erb
app/assets/stylesheets/widget.css
2012-04-23 15:16:50 +08:00
Christophe Vilayphiou
499930a680
Pull from github
2012-04-23 14:29:55 +08:00
Christophe Vilayphiou
2eeb530422
Merge branch 'master' into ldap
...
Conflicts:
app/assets/stylesheets/new_admin.css.erb
2012-04-23 14:13:37 +08:00
Matthew K. Fu JuYuan
67ba2389a2
fix js
2012-04-23 14:07:14 +08:00
Matthew K. Fu JuYuan
8eedbc951e
add i18n vars
2012-04-23 14:07:14 +08:00
Matthew K. Fu JuYuan
0c46b4da23
AdImage and AnBanner JS fixed
2012-04-23 14:07:13 +08:00
Matthew K. Fu JuYuan
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
Matthew K. Fu JuYuan
e353afb5ac
fix i18n vars in ad_banner
2012-04-23 14:07:13 +08:00
Matthew K. Fu JuYuan
1b70852ff7
realtime preview is working. but save to object when preview
2012-04-23 14:06:37 +08:00
Matthew K. Fu JuYuan
8cc0611c4a
Ray's fix for ad_banner
2012-04-23 14:06:36 +08:00
Matthew K. Fu JuYuan
30edc317b2
text area for ad_image
2012-04-23 14:06:36 +08:00
Matthew K. Fu JuYuan
ff472714de
AdBanner i18n vars patch
2012-04-23 14:05:18 +08:00
Christophe Vilayphiou
2f279c53ff
Apply patch from ldap
2012-04-23 14:04:55 +08:00
Matthew K. Fu JuYuan
868118116b
Merge commit 'b6f64cd8a5b48ad84703e3824ef4d968ed71779d' into ldap
2012-04-23 13:58:56 +08:00
Matthew K. Fu JuYuan
6a4203b850
Ray's css fix with widget css
2012-04-23 11:53:36 +08:00
Matt
b6f64cd8a5
Announcement i18n vars
2012-04-23 11:29:00 +08:00
nccu
fe9032787c
NCCU ldap debug
2012-04-23 10:13:44 +08:00
Harry Bomrah
8c42f6bb7c
Merge branch 'desktop_harry' into desktop_devin
2012-04-20 14:44:57 +08:00
devin
2ebed9e44a
javascript update
2012-04-20 09:45:40 +08:00
devin
1f077cf2b3
javascript update
2012-04-20 07:31:48 +08:00
devin
19750d69e0
some update
2012-04-20 05:38:53 +08:00
Harry Bomrah
3eaf97babe
title and heading and welcome msg…
2012-04-19 20:26:21 +08:00
Harry Bomrah
3c5b7a5de3
Modified confirm box…
2012-04-19 15:36:03 +08:00
Matthew K. Fu JuYuan
7e355b77c2
Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap
...
Conflicts:
Gemfile
Gemfile.lock
app/views/admin/attributes/_app_selector.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/pages/_app_selector.html.erb
config/application.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-04-19 14:31:05 +08:00
Matthew K. Fu JuYuan
ba0677a001
Merge commit '72efdbd742d4f3ac8a910bd5c817cf5c74570ba5' into ldap
2012-04-19 14:09:37 +08:00
Matthew K. Fu JuYuan
f55b3a4374
Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap
...
Conflicts:
Gemfile
Gemfile.lock
app/views/admin/attributes/_app_selector.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/pages/_app_selector.html.erb
config/application.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-04-19 14:06:00 +08:00
Christophe Vilayphiou
72efdbd742
changes before Chirs and Ray's trip
2012-04-19 11:50:54 +08:00
Harry Bomrah
4bad25e682
Msg box added and background image saving complete
2012-04-18 22:01:12 +08:00
Harry Bomrah
b4bf81d40a
background image…
2012-04-18 18:20:39 +08:00
Harry Bomrah
6b35cf821e
some updates
2012-04-18 18:15:02 +08:00
Harry Bomrah
30a6dc6a95
Merge branch 'desktop_harry' into desktop_devin
2012-04-18 17:58:49 +08:00
Harry Bomrah
11a0875c44
color changes in custom color…
2012-04-18 17:57:47 +08:00
Matthew K. Fu JuYuan
170c12bcdd
fix js
2012-04-18 16:24:17 +08:00
Matthew K. Fu JuYuan
0ddb66a3c9
add i18n vars
2012-04-18 15:33:11 +08:00
Matthew K. Fu JuYuan
8d776fd30d
AdImage and AnBanner JS fixed
2012-04-18 15:26:59 +08:00
Harry Bomrah
d14630769a
Bg color fixed…
2012-04-18 14:57:00 +08:00