43bc704468
Error popup only shows on flash[:error]
2012-08-15 15:55:29 +08:00
a19a5415c1
Ray's changes for list.css
2012-08-15 12:13:58 +08:00
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
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
83569fac82
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-13 18:36:04 +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
c2f3f45196
Fix for link in nccu widget
2012-08-13 11:34:14 +08:00
92fc0c8c26
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-13 11:20:23 +08:00
2ea3193879
Fix for banner link
2012-08-13 11:03:11 +08:00
080974b563
Merge branch 'new_rss'
...
Conflicts:
vendor/built_in_modules/announcement/app/models/bulletin.rb
2012-08-12 23:32:28 +08:00
f1b4d9e204
Add authorization for rescue interface
...
Change logic for NCCU site for status panel.
2012-08-12 23:29:13 +08:00
33fc96ac7c
Changes for NCCU after email
2012-08-11 18:19:30 +08:00
5281464af4
Fix bug for sorting when there's only one category with elements
2012-08-11 16:56:28 +08:00
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
53cd39f180
Delete duplicate side_bar code
2012-08-10 15:26:34 +08:00
d8b0613147
archive checkbox
2012-08-10 15:26:34 +08:00
26931a7b9c
new archive
2012-08-10 15:23:56 +08:00
81fa2a7428
archive checkbox
2012-08-10 15:19:45 +08:00
2dd2abc8d2
new archive
2012-08-10 15:17:16 +08:00
e8cea9f0ab
new archive
2012-08-10 15:14:43 +08:00
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
e256440678
RSS first page
2012-08-09 17:04:08 +08:00
d5c55c9697
widget & frontend field
2012-08-09 15:25:30 +08:00
1aea8d91f4
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-08 18:16:38 +08:00
0645f04240
Ray's change in css
2012-08-08 18:11:18 +08:00
62ba8c9f18
Fix bugs on 172:180
2012-08-08 17:56:00 +08:00
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
b4c2dfe0ef
Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share
2012-08-08 11:53:47 +08:00
3fdff9357c
Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share
2012-08-08 11:52:11 +08:00
fbb53cca36
Ray's changes for sitemap backend
2012-08-08 11:51:20 +08:00
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
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
acf4446523
Add meta to head for fb share
2012-08-08 11:04:19 +08:00
85a556a4a2
first version of fb_share
2012-08-08 11:04:19 +08:00
c6c8187bda
Changes for design: menu, frontend news and announcement
2012-08-08 10:53:04 +08:00
9982fd880f
Update the path when name is changed in item.rb
2012-08-08 10:53:04 +08:00
c8dcc9734d
Change width for site map frontend, add link for more in announcement widget
2012-08-08 10:53:04 +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
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
db16fdc7b5
Change for getting url from key
2012-08-08 07:46:10 +08:00
f7e6703d5f
Change the way the orig_url is passed to fb
2012-08-08 06:50:28 +08:00
fc560f4205
Try fb from override and generated page
2012-08-08 05:40:50 +08:00
3cb182ff8e
Add meta to head for fb share
2012-08-08 03:10:26 +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
1c62c1a799
first version of fb_share
2012-08-06 16:12:49 +08:00
5f88408dcb
Check for 'http' or 'https' before saving a link
2012-08-04 16:29:31 +08:00
6a94d4f550
Put back impressionist where it was commented out
2012-08-04 15:42:53 +08:00
50b313976e
Fix page: take category and tag at the same time
2012-08-03 17:12:54 +08:00
2d2e01115b
Fix page: take category and tag at the same time
...
With news and announcement views
2012-08-03 01:44:06 +08:00
4127d7f2eb
Fix tags
2012-08-03 01:35:41 +08:00
1b29eb5de4
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-01 18:15:28 +08:00
ee5ac0227e
change the algorithm of tag cloud.
2012-08-01 18:15:10 +08:00
df9a1e8057
Fix typo
2012-08-01 17:11:37 +08:00
f917adcdf3
Fix typo
2012-08-01 17:09:00 +08:00
0d048de33f
Fix link in sitemap
2012-08-01 17:08:07 +08:00
83acb78966
path instead of url
2012-08-01 17:05:34 +08:00
410dfe62e8
Fix typo
2012-08-01 17:03:39 +08:00
02ade108d0
Fix typo
2012-08-01 16:59:11 +08:00
4df4274629
Add links to frontend_sitemap
2012-08-01 16:38:07 +08:00
25a911b4f8
Change for page: take category and tag at the same time
2012-08-01 16:33:46 +08:00
0078c97b19
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 14:27:44 +08:00
9f859b903d
Add custom validator and fix .html_safe with rescue
2012-07-31 14:25:46 +08:00
7e3b59c09a
finished tag clouds
2012-07-31 11:57:32 +08:00
ecb75fd085
Fix typo
2012-07-30 18:37:20 +08:00
39b63a970c
Fix .class to .class.to_s
2012-07-30 18:34:54 +08:00
f3ccbce5c8
Put back impressions for new and bulletin.
...
Add view_count field to tag.
2012-07-30 17:57:55 +08:00
7440727acd
Fix: "._type" to ".class"
2012-07-30 17:21:37 +08:00
4e1a91ed90
Merge branch 'changing_tag'
...
Conflicts:
vendor/built_in_modules/news/app/models/news_tag.rb
2012-07-30 14:43:53 +08:00
946ec9306f
first version of tag cloud.
2012-07-30 11:59:20 +08:00
a6a8fe3d64
Remove remaining 18n_variables
2012-07-27 19:37:25 +08:00
a657a7d615
remove cache
2012-07-27 19:14:24 +08:00
a8cc581279
Sitemap done for backend and fronted
2012-07-27 19:13:40 +08:00
934b515914
Sitemap with main
2012-07-27 19:13:39 +08:00
38804bd118
Add disable for main title
2012-07-27 19:13:39 +08:00
db9c4c0e10
Partial sitemap
2012-07-27 19:13:39 +08:00
12f9f666eb
Fix bugs after i18n_variable removal
2012-07-27 19:13:39 +08:00
804695749d
Fix bugs after removal of i18n_variable
2012-07-27 19:13:39 +08:00
53cae0a9ee
Remove i18n_variable for views
2012-07-27 19:13:39 +08:00
49dd3a1770
Remove i18n_variable for controllers, helpers and models
2012-07-27 19:13:39 +08:00
e2ebd48b22
Remove i18n_variable for announcement
2012-07-27 19:12:58 +08:00
de831f1f96
disable homepage cache for english page
2012-07-27 05:08:24 +08:00
c0cac812c5
demo site widget
2012-07-26 16:39:29 +08:00
87549d4e1f
fix for nil value
2012-07-25 17:49:16 +08:00
13ec25ed10
fix for orbit bar broken
2012-07-25 17:44:50 +08:00
97b4eee798
full site search with google
2012-07-25 17:20:25 +08:00
f9bdb4a327
New and Announcement search. Disabled impression.
2012-07-20 15:47:40 +08:00
f223e4bb1e
Ika's changes for orbit bar
2012-07-20 15:41:27 +08:00
10731dc211
demo widget
2012-07-18 18:07:45 +08:00
2ae6b54a45
fix for not working cache
2012-07-13 18:32:17 +08:00
4daf36908c
working cache
2012-07-13 15:36:10 +08:00
0e65e379b0
cache first commit
2012-07-12 11:47:24 +08:00
773371e885
fix from messy search
2012-07-09 16:48:23 +08:00
e48735a4ac
Merge branch 'desktop_devin' of github.com:Rulingcom/orbit into desktop_devin
2012-07-09 16:39:58 +08:00
1d8e386bde
demo website widget
2012-07-09 16:28:03 +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
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
bfedf207c9
some changes
2012-07-09 15:37:47 +08:00
49862e70f9
hide category at front end
2012-07-09 12:05:21 +08:00
58d162d225
publication adjustment
2012-07-09 10:44:01 +08:00
56caf4b34e
category disable for backend
2012-07-06 18:11:55 +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
bb75383ef0
Seminar Pages modified
2012-07-05 16:27:59 +08:00
c5fdff764e
orbit disable object for categories
2012-07-05 16:00:45 +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
441929eb74
Latest code by joshua
2012-07-04 18:39:28 +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
ae2cbb728e
archive for announcement
2012-07-04 17:36:51 +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
f7107936d0
fix for checking @rulingcom.com
2012-07-03 18:21:48 +08:00
9607b5bbfd
rulingcom帳號不透過LDAP認證
2012-07-03 18:12:44 +08:00
d0632b2e4c
change name format
2012-07-03 16:05:19 +08:00
56ecf9c69b
remove remember for nccu
2012-07-03 15:59:25 +08:00
4014f8ee47
fix over queue at resque
2012-07-03 10:51:26 +08:00
bacb1f1e63
Timeline ajax loading
2012-07-02 21:06:36 +08:00
f34cb47618
font aweosme change
2012-07-02 16:23:14 +08:00
08fd07b6aa
timeline and font update
2012-07-02 16:22:51 +08:00
6533abf214
font awesome update
2012-07-02 11:10:01 +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
818c58c1ee
fix for 新聞與公告QA
...
1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時，圖片無法正常顯示（但是可以正常被編輯調整並於前台顯示）
2.add 上傳檔案大小限制: 3MB
3.公告的發佈單位為何是顯示單位代碼：M00？應顯示發布單位
2012-06-26 17:46:02 +08:00
555ec86403
Timeline commit
2012-06-26 15:59:28 +08:00
56b1bd9eaa
add translation
2012-06-26 10:57:51 +08:00
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
a36f73bafc
fix 0621 Trello:"171 頁面管理不能使用"
2012-06-22 18:19:40 +08:00
3f95fe4f13
tmp commit for search. start nccu0621 first
2012-06-22 11:34:10 +08:00
cb17fe0825
Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working
2012-06-20 14:50:51 +08:00
8dd1ab32c1
Add this toolbar, and nccu calendar fix
2012-06-04 16:51:29 +08:00
11247ce84c
Clean up code , cache other auths. Fix sidebar
2012-05-29 17:17:26 +08:00
4d288fb9d1
add script for cache user
2012-05-29 17:17:26 +08:00
1f1868a75f
cache privilege user list.
2012-05-29 17:17:26 +08:00
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
4f484599b7
Clean up code , cache other auths. Fix sidebar
2012-05-29 15:23:50 +08:00
ff620b41aa
add script for cache user
2012-05-29 15:23:50 +08:00
6f0cf0e92e
cache privilege user list.
2012-05-29 15:23:50 +08:00
7488341836
Commit for app window..
2012-05-25 15:41:07 +08:00
3480fa2545
Fix login and label. Check sync jobs and update info function.
2012-05-24 17:01:00 +08:00
c062b43069
Merge branch 'design_team' into ldap
2012-05-23 12:11:38 +08:00
71d4241a2f
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-23 12:11:26 +08:00
006b84f6a1
Ray's fix for ie
2012-05-23 12:06:09 +08:00
7c44e94285
Order list by created_at desc
...
Add best image size in news new
2012-05-23 11:46:19 +08:00
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
eab82269c1
Remove seconds from date display
2012-05-22 20:19:04 +08:00
d6b92fc604
Fixed bugs for nccu
2012-05-22 20:00:07 +08:00
11a371cbb9
Fix destroy in structure
...
Fix sorting
2012-05-22 17:55:45 +08:00
541aa5831e
JS changes to load drag and drop
2012-05-22 17:37:15 +08:00
874a89d99b
Ray's fix for structure side_bar
2012-05-22 16:48:57 +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
aa114568c4
Move design to site_settings side_bar
2012-05-21 18:20:39 +08:00
c4d7079059
Fix's Matt code for not showing bulletins in index
2012-05-21 18:10:03 +08:00
6fedf7232a
app update
2012-05-21 15:45:15 +08:00
81ff0f2c1c
Merge branch 'desktop_harry' into desktop_devin
2012-05-21 15:26:38 +08:00
a78b72ebfc
app update
2012-05-21 15:25:18 +08:00
dfe7ccf166
general commit
2012-05-21 15:24:47 +08:00
ab7ae6dcee
app
2012-05-21 14:55:51 +08:00
815e6a8361
Fix matt's code and add it to filters
2012-05-19 03:19:55 +08:00
db410b9c50
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-18 19:44:18 +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
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
6ce6577e83
fix news approve and preview
2012-05-18 18:47:18 +08:00
6a022c90da
Changes on nccu
2012-05-18 15:20:45 +08:00
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
7c6b807170
Change impression count to exclude when :referrer is nil
2012-05-18 14:13:11 +08:00
a4afd5c1d3
Merge branch 'design_team' into ldap
2012-05-18 10:36:32 +08:00
8ad7f70822
Proof i18n_variable for categories
2012-05-18 10:28:28 +08:00
17b6a70506
Merge branch 'design_team' into ldap
2012-05-17 23:36:24 +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
5d5e798b1a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-17 23:35:14 +08:00
a0ad1f59b6
Comment out filename in FIleAssetUploader
2012-05-17 23:34:15 +08:00
1b1c2c0032
image title and description callback fixed…
2012-05-17 20:19:31 +08:00
60988f97fb
Merge branch 'design_team' into ldap
2012-05-17 19:41:24 +08:00
2f7d561310
Put back I18n for file_upload
2012-05-17 19:40:30 +08:00
25de941df7
Merge branch 'design_team' into ldap
2012-05-17 19:10:22 +08:00
606050627e
Remove I18n for file_upload html
2012-05-17 19:09:52 +08:00
698c750cd7
Merge branch 'design_team' into ldap
2012-05-17 18:37:56 +08:00
27fd2d0714
Hide assets links from side_bar
2012-05-17 18:37:46 +08:00
79f484300e
Merge branch 'design_team' into ldap
2012-05-17 18:32:06 +08:00
c9cbec4239
Asset changes, add description
2012-05-17 18:31:40 +08:00
5e93fe51a9
Merge branch 'design_team' into ldap
2012-05-17 16:41:11 +08:00
29c54e6480
Add mandatory fields to assets
2012-05-17 16:40:09 +08:00
1e2b146c21
Merge branch 'design_team' into ldap
2012-05-17 10:00:07 +08:00
4467bc5e48
Change Date to DateTime
...
Fix filename error
2012-05-17 09:59:49 +08:00
bfad553cc3
Merge branch 'design_team' into ldap
2012-05-17 09:31:02 +08:00
84dac1d250
Create FileAssetUploader
2012-05-17 09:30:21 +08:00
eba4671733
Merge branch 'design_team' into ldap
2012-05-17 06:46:29 +08:00
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
0f354b8ccc
fix ad_image size hints. fix orbit backend controller error when changing language.
2012-05-17 06:44:14 +08:00
a3acd865d7
AdBanner reopen new banner and delete. Rename title with content editable tag.
2012-05-17 06:44:14 +08:00
7f2564a81e
Fix sidebar and hide some links by roles
2012-05-17 06:43:39 +08:00
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
03387d3c07
Object auth for ad_banner
2012-05-17 06:42:33 +08:00
f663985a40
starting ad_banner auth
2012-05-17 06:42:33 +08:00
6b9c8eb15d
Merge branch 'design_team' into ldap
2012-05-17 06:31:57 +08:00
b05836835a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-17 06:28:49 +08:00
26292f0dcc
Asset upload
2012-05-17 06:28:29 +08:00
27a0984da1
tinymce loading fixed…
2012-05-16 18:51:37 +08:00
9129835f23
Add tags to assets
2012-05-16 18:19:41 +08:00
0647698012
fix ad_image size hints. fix orbit backend controller error when changing language.
2012-05-16 17:16:48 +08:00
befd3bcdec
AdBanner reopen new banner and delete. Rename title with content editable tag.
2012-05-16 16:42:43 +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
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
88a26cc6a1
Fix sidebar and hide some links by roles
2012-05-16 12:10:16 +08:00
75cbae049b
few experiments…
2012-05-16 11:18:54 +08:00
0b0916179f
Change assets
2012-05-16 11:07:11 +08:00
b31846f424
Delete duplicate side_bar code
2012-05-16 04:35:19 +08:00
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
cc02ea511c
archive checkbox
2012-05-16 01:13:39 +08:00
cf5e6c1a96
new archive
2012-05-16 01:09:21 +08:00
4e9bb1b583
new archive
2012-05-16 01:06:26 +08:00
f950f77f36
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile
app/models/ad_banner.rb
2012-05-15 23:02:22 +08:00
80e84c10ba
Remove link from dashboard
2012-05-15 23:01:00 +08:00
e54f4409fb
Add impressionist
2012-05-15 21:26:09 +08:00
53a0fbddf0
Fix commit error
2012-05-15 21:25:51 +08:00
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
b23b5e8ec5
Object auth for ad_banner
2012-05-15 16:39:23 +08:00
77deffb512
Nccu calendar and daily job.
2012-05-15 14:03:54 +08:00
551e1ef740
Reflect login method. LDAP,MidSite connection. The Mysql connection now is build on fly.
2012-05-15 11:28:24 +08:00
0a9f0bcc45
starting ad_banner auth
2012-05-15 09:57:05 +08:00
8fcb8ef8de
Change the way links are displayed in menus in front-end
2012-05-14 21:43:10 +08:00
59b55d1574
Merge branch 'design_team' into ldap
2012-05-14 12:42:06 +08:00
9ba4c2cf2f
Change to apply page to had object_auth
2012-05-14 12:40:50 +08:00
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
e1450ec748
Change to apply page to had object_auth
2012-05-14 12:34:15 +08:00
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
dfd2d82efb
Restart job
2012-05-14 00:50:36 +08:00
7a6d30ad62
Remove unless files and change routes.
2012-05-14 00:50:36 +08:00
0119ab1a74
New Interface for App Auth and Object Auth
2012-05-14 00:50:12 +08:00
a184f96ce7
AdBanner app_auth
2012-05-14 00:49:22 +08:00
8b42c595b3
Don't display admin in any premission select. Fix not necessary header for UT data
2012-05-14 00:49:22 +08:00
cf8d20dc84
Add category and tag to pages
2012-05-14 00:33:52 +08:00
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
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
62e9a772f6
Fix titles for widgets
...
Add translations
2012-05-13 23:09:48 +08:00
4ae8299949
Add custom title to widgets
...
Fix pagination conflict with main_content and widgets
2012-05-13 22:35:00 +08:00
281cfa6518
Changes for widgets
2012-05-13 21:55:39 +08:00
4685952bd6
Changes in page_edit
2012-05-13 20:13:26 +08:00
ef2d416c70
Ray's changes for page_edit
2012-05-13 19:36:04 +08:00
82fa85def8
Clean the parsers code
2012-05-13 19:32:05 +08:00
803253ebcf
Put nestedSortable in page_edit.js.erb
2012-05-12 22:12:17 +08:00
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
17b486f9e9
Fix bugs for shift_to and change items.rake for the missing position in db
2012-05-11 17:56:26 +08:00
076f5ad6ef
Ray's changes for drag and drop in structure's side_bar
2012-05-11 17:54:33 +08:00
82d1d3fed8
Restart job
2012-05-11 16:56:32 +08:00
0a34f0277e
Remove unless files and change routes.
2012-05-11 16:46:36 +08:00
20a1a6e30f
New Interface for App Auth and Object Auth
2012-05-11 16:44:40 +08:00
6a443f0976
Add mongoid-tree to Item
2012-05-11 16:16:09 +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
cb25cf60a9
AdBanner app_auth
2012-05-10 15:37:07 +08:00
4f1e47bb82
Don't display admin in any premission select. Fix not necessary header for UT data
2012-05-10 14:43:05 +08:00
5eba2638ce
Merge branch 'design_team' into ldap
2012-05-10 14:17:38 +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
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
ada56a7a63
some update
2012-05-10 10:54:43 +08:00
87449ec6a8
Merge branch 'design_team' into ldap
2012-05-10 10:34:28 +08:00
a43877323e
Add tinymce to page_part edit for text
2012-05-10 10:34:13 +08:00
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
bc5e975fab
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-10 00:29:22 +08:00
9161dc73b5
Translation for "or"
2012-05-10 00:27:12 +08:00
13587306bc
Add list widgets for announcement, news and links with categories and tags
2012-05-10 00:25:30 +08:00
ecd21338bc
Matt's changes for side_bar
2012-05-10 00:23:42 +08:00
dc9af65524
Merge branch 'design_team' into ldap
2012-05-09 15:25:16 +08:00
038378be9a
Ray's changes for inccu in orbit_bar
2012-05-09 15:20:09 +08:00
1785da51a2
Merge branch 'design_team' into ldap
2012-05-09 15:04:06 +08:00
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
9d01f624da
Merge branches 'nccu_0509' and 'design_team' into ldap
2012-05-09 14:21:24 +08:00
6c9944918a
Fix i18 variable
2012-05-09 14:18:52 +08:00
Christophe Vilayphiou
Harry Bomrah
Matthew K. Fu JuYuan
unknown
Matt
OrbitServer
devin
Joshua Milton
Christophe Vilayphiou