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
47bca643af
hidding new ad_banner
2012-05-09 14:17:20 +08:00
d88d4e58dc
Merge branch 'design_team' into ldap
...
Conflicts:
config/environments/development.rb
2012-05-09 13:51:00 +08:00
f9f7ddc8ee
Hide some links in side_bar for site_settings
2012-05-09 12:53:42 +08:00
44a485611a
Site_info and site_setting i18n
2012-05-09 12:29:46 +08:00
9216f29bc9
Ray's changes for mail settings
2012-05-09 12:19:32 +08:00
41c0c26330
Add mail_settings
2012-05-09 11:38:29 +08:00
b3be210ff7
Small adjustment for dashboard
2012-05-09 05:55:47 +08:00
2b03263fb7
Dashboard partial implementation
2012-05-09 05:53:07 +08:00
909ca19456
Fix bugs in sub_menu
2012-05-09 04:31:04 +08:00
9ead6cafda
Ray's changes
2012-05-09 04:15:02 +08:00
8d70d87120
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-09 04:13:14 +08:00
26a50cc862
Add sub_menu to children
2012-05-09 04:15:45 +08:00
a186ae08d8
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 21:47:03 +08:00
0cc94c65a8
Patch from ldap: Test version for DB sync schedule job
2012-05-08 21:14:57 +08:00
ffcfda912e
Patch from ldap: Calendar sync done,need Ray's JS change
2012-05-08 20:44:17 +08:00
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
dbac219c18
now jobs is working
2012-05-08 20:25:11 +08:00
f3b58ea36d
starting Resque
2012-05-08 20:24:37 +08:00
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
69f2f6a716
now jobs is working
2012-05-08 20:21:28 +08:00
c28d7d59b6
starting Resque
2012-05-08 20:21:28 +08:00
18c42a80a6
Put site_settings in the orbit_button
2012-05-08 20:06:56 +08:00
083963af65
Test version for DB sync schedule job
2012-05-08 19:20:53 +08:00
55bfaea43e
Can show announcement and news list by tag's key
2012-05-08 17:27:42 +08:00
5c7cf1aef2
Add sub_menu to site_info
2012-05-08 17:27:02 +08:00
d2e07f537a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 17:24:40 +08:00
a3868cb785
Ray's changes for front-end banner
2012-05-08 17:21:26 +08:00
f827e8429e
Calendar sync done,need Ray's JS change
2012-05-08 16:08:41 +08:00
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
b22a275360
Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap
2012-05-08 11:55:21 +08:00
65a0998080
Merge branch 'jobs_and_mail' into ldap
...
Conflicts:
config/environments/development.rb
config/routes.rb
2012-05-08 11:45:34 +08:00
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
5b604037f8
now jobs is working
2012-05-08 11:41:58 +08:00
7339d1ee4a
starting Resque
2012-05-08 11:41:58 +08:00
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
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
2083e0bf4f
widget structure improvised…
2012-05-07 19:00:50 +08:00
469f5c8267
Add always_display checkbox for title in site_info independent of i18n
2012-05-07 16:29:32 +08:00
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
f534e6ca7b
Ray's changes for site_info
2012-05-07 15:55:45 +08:00
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
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
0246341aef
Add footer to site_info
2012-05-07 11:25:33 +08:00
1fb6c20b86
Add site_info
2012-05-07 00:54:18 +08:00
48f8fbde7f
Fix site_locale_default_head and active for current locale
2012-05-07 00:53:52 +08:00
51f87e7212
Add missing translation for enabled_for
2012-05-06 03:36:01 +08:00
ce1fecaf93
Add position ordering and hiding page for i18n
2012-05-06 00:35:13 +08:00
f190ce18ee
Put sorting in web_link, page_context and design
2012-05-05 21:20:20 +08:00
b48099d752
Fix bug in is_admin?
...
Fix bug in helpers for news and announcement
2012-05-05 17:40:07 +08:00
fcc875bb5d
app store page added… and few other changes..
2012-05-04 20:28:12 +08:00
555aa088d9
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-04 19:23:45 +08:00
3ef81c520e
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-04 19:16:57 +08:00
e0a191162d
Ray's changes
2012-05-04 19:11:28 +08:00
15bc4d4268
Fix merge error
2012-05-04 16:12:28 +08:00
8f1ce78ab4
Fix bug when homepage
2012-05-04 15:51:51 +08:00
453cb21066
Announcement preivew
2012-05-04 15:50:45 +08:00
f6307abfbf
fix broken ad_banner
2012-05-04 15:40:43 +08:00
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
f427c3803f
clean up useless flash msgs. add i18n vars for app auth and object auth
2012-05-04 15:40:43 +08:00
05ded8de03
Fix for NCCU 0430 all functions ok with two submanagers but different behavors
2012-05-04 15:38:18 +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
45e21f9569
Fix filter category in news
2012-05-02 17:55:02 +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
b8cd7097b0
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-02 16:27:09 +08:00
2762c24593
Fix wrong variable names in translations
2012-05-02 16:22:06 +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
fe54c6ae71
Fix bug when id or single object
2012-04-30 14:23:41 +08:00
a9ab016d52
Merge branch 'design_team' into ldap
2012-04-30 08:33:21 +08:00
bda21baed2
Add missing js
2012-04-30 08:32:54 +08:00
767e4a3fe9
Merge branch 'design_team' into ldap
2012-04-30 08:16:17 +08:00
496b8de58a
Side bar translation
2012-04-30 08:15:45 +08:00
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
b6fceadff4
column group experiment
2012-04-30 06:41:05 +08:00
b8f52fa1ec
Separate announcement and news
2012-04-30 06:31:46 +08:00
63ee8eaca9
Remove url from sorting
...
Add sorting_options to params in filters
2012-04-30 06:30:52 +08:00
32faef0c70
DRY code for sorting
2012-04-30 06:30:52 +08:00
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
6b151b1fb6
403 for unauth apps
2012-04-30 00:24:11 +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
9d97b7c008
Change for the notice msg at login page
2012-04-30 00:24:10 +08:00
851dc72f42
Ray's changes in css and html
2012-04-30 00:17:18 +08:00
a99d685bce
conflict solved
2012-04-28 01:56:00 +08:00
03f19b80b4
small change
2012-04-28 01:49:48 +08:00
a23f290831
changes for login …
2012-04-27 22:14:44 +08:00
2362e1cfdd
Merge branch 'design_team' into ldap
2012-04-27 15:28:32 +08:00
799fd1e3ac
Fix css bugs (opacity=) and changes in sign_in page
2012-04-27 15:27:59 +08:00
feb2156fd3
Fix error in side_bar for web_links
2012-04-27 14:15:36 +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
c2ac682787
updates for connections
2012-04-26 17:23:47 +08:00
7d6b82d9dd
Merge branch 'ad_banner' into ldap
2012-04-26 17:15:44 +08:00
4af2068c1f
Fix ad_banner sec and msec
2012-04-26 17:11:06 +08:00
faace9893a
dehumanize ad banner
2012-04-26 17:11:05 +08:00
9a5ce5f512
Remove unless sidebar links.
2012-04-26 17:11:05 +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
64be61d61b
with gmail widget..
2012-04-26 14:47:49 +08:00
6bf4c60d45
Changes for js and ccs load for site's pages
2012-04-26 01:49:02 +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
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
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
44ded537b3
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-25 16:28:34 +08:00
65a6f9c416
Ray's css fix for quick edit
2012-04-25 16:26:27 +08:00
a3a109fb8b
Remove JS debug msg.
2012-04-25 16:10:11 +08:00
7f285f4719
Change ad_banner preview from using title to id
2012-04-25 16:10:11 +08:00
72921d6dfd
fix useless notice at login
2012-04-25 16:10:11 +08:00
abf75ffedd
Merge branch 'design_team' into ldap
2012-04-25 15:45:16 +08:00
573c19ff4b
Remove .erb when including css
2012-04-25 15:44:44 +08:00
8adb9c6878
Merge branch 'design_team' into ldap
2012-04-25 15:10:50 +08:00
3ec8bb7be6
Fix assets bug: when having a '.' in the name, the extension must be specified
2012-04-25 15:10:28 +08:00
8f242e2d39
Merge branch 'design_team' into ldap
2012-04-24 17:00:51 +08:00
3308744396
Fix side_bar after Matt's changes in translation
2012-04-24 17:00:33 +08:00
0c4f1d91f7
Merge branch 'ad_banner' into ldap
2012-04-24 16:46:04 +08:00
a298cbd5f6
Publication started
2012-04-24 16:45:26 +08:00
db46803cda
R4-Billingual
2012-04-24 16:43:45 +08:00
d1f687e43e
Merge branch 'design_team' into ldap
2012-04-24 16:32:30 +08:00
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
291d5e3a03
Ray's changes in css
2012-04-24 16:24:50 +08:00
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
c0abaa643c
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-24 15:21:12 +08:00
45c194e870
Ray's changes in css
2012-04-24 15:15:36 +08:00
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
33640de184
Changes for Billingual
2012-04-24 14:37:06 +08:00
bbcdaf00e7
Disable ad_banner_preview. Just show window
2012-04-24 14:37:06 +08:00
e7bb9ea86b
Fix ad image date selector
2012-04-24 14:37:06 +08:00
c57ba305e9
Fix ad_banner
2012-04-24 14:37:06 +08:00
04688608f7
Changes for Billingual
2012-04-24 14:30:30 +08:00
c856b4cdce
Fix for upload image component in announcement
2012-04-24 12:41:28 +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
6e431b6137
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
2012-04-24 11:26:13 +08:00
308cfc7cf2
Merge branch 'design_team' into ldap
...
Conflicts:
app/views/devise/sessions/new.html.erb
2012-04-24 02:46:06 +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
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
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
0836583694
Disable ad_banner_preview. Just show window
2012-04-23 18:29:23 +08:00
a5db2382e7
Fix ad image date selector
2012-04-23 18:20:12 +08:00
35452c039d
Fix ad_banner
2012-04-23 17:03:55 +08:00
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
3280ff8311
archive checkbox
2012-04-23 15:53:58 +08:00
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
499930a680
Pull from github
2012-04-23 14:29:55 +08:00
2eeb530422
Merge branch 'master' into ldap
...
Conflicts:
app/assets/stylesheets/new_admin.css.erb
2012-04-23 14:13:37 +08:00
67ba2389a2
fix js
2012-04-23 14:07:14 +08:00
8eedbc951e
add i18n vars
2012-04-23 14:07:14 +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
e353afb5ac
fix i18n vars in ad_banner
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
8cc0611c4a
Ray's fix for ad_banner
2012-04-23 14:06:36 +08:00
30edc317b2
text area for ad_image
2012-04-23 14:06:36 +08:00
ff472714de
AdBanner i18n vars patch
2012-04-23 14:05:18 +08:00
2f279c53ff
Apply patch from ldap
2012-04-23 14:04:55 +08:00
868118116b
Merge commit 'b6f64cd8a5b48ad84703e3824ef4d968ed71779d' into ldap
2012-04-23 13:58:56 +08:00
6a4203b850
Ray's css fix with widget css
2012-04-23 11:53:36 +08:00
b6f64cd8a5
Announcement i18n vars
2012-04-23 11:29:00 +08:00
fe9032787c
NCCU ldap debug
2012-04-23 10:13:44 +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
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
ba0677a001
Merge commit '72efdbd742d4f3ac8a910bd5c817cf5c74570ba5' into ldap
2012-04-19 14:09:37 +08:00
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
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
170c12bcdd
fix js
2012-04-18 16:24:17 +08:00
0ddb66a3c9
add i18n vars
2012-04-18 15:33:11 +08:00
8d776fd30d
AdImage and AnBanner JS fixed
2012-04-18 15:26:59 +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
7b391904f7
Merge branch 'desktop_devin' of https://github.com/Rulingcom/orbit into desktop_devin
2012-04-17 21:20:36 +08:00
95a1e266ae
Custom thème done and theme id done…
2012-04-17 21:15:40 +08:00
1f44a10206
wallpaper added
2012-04-17 18:06:07 +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
8cd4844689
html change
2012-04-17 16:32:11 +08:00
51190a79cb
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-17 16:03:48 +08:00
a9a4ca6ede
fix i18n vars in ad_banner
2012-04-17 15:21:43 +08:00
06a3128be5
realtime preview is working. but save to object when preview
2012-04-17 11:34:25 +08:00
4f18257733
try
2012-04-17 01:32:53 +08:00
6cdebb440d
Ray's fix for ad_banner
2012-04-13 18:02:36 +08:00
92e898a656
Merge branch 'master' into ldap
2012-04-13 17:52:15 +08:00
7cf00d1d93
text area for ad_image
2012-04-13 17:51:19 +08:00
d81ca40f90
AdBanner i18n vars patch
2012-04-13 17:24:30 +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
430b0fd9ae
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
...
Conflicts:
app/views/admin/ad_banners/_ad_image_update.html.erb
2012-04-13 16:52:14 +08:00
4af73ecf6f
fix preview window size.
2012-04-13 16:46:16 +08:00
0fe5baf93f
fix for letting ad_banner display even when file in not uploaded
2012-04-13 16:14:43 +08:00
a2e35f3626
Merge branch 'master' into ldap
2012-04-13 16:03:57 +08:00
957d4eaebb
Merge branch 'master' into desktop_harry
2012-04-13 16:03:43 +08:00
ebf9a896aa
Merge branches 'dashboard' and 'dashboard' of github.com:Rulingcom/orbit into dashboard
2012-04-13 15:57:42 +08:00
31baa2cb63
new archive
2012-04-13 15:57:15 +08:00
ca0fc4c767
Comment out code that bugged upload image in ad_banner
2012-04-13 15:53:25 +08:00
d1feb102d0
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
2012-04-13 15:27:10 +08:00
d646a9dff1
fix new ad_image data selector bug
2012-04-13 15:24:59 +08:00
0bcb74d793
new archive
2012-04-13 15:24:19 +08:00
8167172ca9
Merge branch 'master' into desktop_harry
2012-04-13 14:05:08 +08:00
de035cb89a
fix date selector value fill back problem
2012-04-13 13:52:01 +08:00
f54dba8b0b
Merge branch 'master' into desktop_harry
2012-04-13 13:39:00 +08:00
1e43349eb8
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
2012-04-13 12:48:57 +08:00
fe59446c16
fix date selector value fill back problem
2012-04-13 12:47:57 +08:00
64a9579b92
final on 13 april 00:00
2012-04-13 00:00:24 +08:00
6b43e70f53
Merge branch 'desktop_harry' into desktop_devin
2012-04-12 22:21:05 +08:00
193cee2df7
new icons and widgets
2012-04-12 22:18:58 +08:00
198825a309
Merge branch 'master' 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
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-04-12 18:50:48 +08:00
f8873267a2
Ray's fix for announcement list
2012-04-12 18:41:14 +08:00
eabbba76fc
css change
2012-04-12 18:14:26 +08:00
6728c35023
Fix side_bar.
...
In the case of tags, take the uri instead of controller name
2012-04-12 18:14:00 +08:00
015c0cb452
Delete useless code in items
2012-04-12 18:13:10 +08:00
93ac99d235
Add missing css in "inc"
2012-04-12 18:12:46 +08:00
01af32aa60
added divs with id
2012-04-12 16:52:32 +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
b54578ce1e
ad banner preview
2012-04-12 07:14:06 +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
5417c6fec0
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
2012-04-12 07:13:13 +08:00
7bca339a5b
Ray's fix for columns width in bulletins
2012-04-12 07:01:34 +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
1fabe3d8f7
theme setting update
2012-04-11 15:22:05 +08:00
0219c3df28
various update
2012-04-11 15:04:00 +08:00
42f45aa137
theme setting update
2012-04-11 13:46:32 +08:00
ee85380ab2
little update
2012-04-10 18:09:29 +08:00
360e5228b7
custom theme settings
2012-04-10 17:44:36 +08:00
6006f1b3c6
start editing setting page
...
some relevant stuff updated
2012-04-10 01:06:29 +08:00
695c1dee58
Merge branch 'desktop_devin' of https://github.com/Rulingcom/orbit into desktop_devin
2012-04-09 17:55:17 +08:00
32a1be624b
Fully updated..
2012-04-09 17:55:03 +08:00
eb219c14b7
Merge branch 'desktop_harry' of https://github.com/Rulingcom/orbit into desktop_harry
2012-04-09 17:40:13 +08:00
f807cd026d
app section modified…
2012-04-09 17:40:03 +08:00
9dde708c01
app manager page update
2012-04-09 17:13:24 +08:00
d2e77d6bf8
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
2012-04-09 12:45:27 +08:00
d2a3a4d26e
ad banner preview
2012-04-09 12:44:08 +08:00
0eab9ca8fa
add pic and js for permission checkbox and filter
2012-04-09 12:43:51 +08:00
c7c3af91dd
add permission-checkbox js
2012-04-09 12:43:10 +08:00
e1ef109b8b
Fix bug: Snake -> snake
2012-04-07 01:33:36 +08:00
963a0cb604
Change filter to js with history for bulletins
2012-04-07 00:20:52 +08:00
35567c2139
Widgets Loading dynamically and semi structured
2012-04-06 23:48:03 +08:00
bb2375b15e
Temp Commit
2012-04-06 19:05:11 +08:00
f65bb9b323
Merge branch 'master' into desktop_harry
...
Conflicts:
app/assets/stylesheets/style.css.erb
2012-04-06 19:02:39 +08:00
253f4bcb54
Ray's changes for orbit bar
2012-04-06 18:06:57 +08:00
e1ef2b28e7
theme changes
2012-04-06 17:49:22 +08:00
7309d9c446
Dock change and getting values from db
2012-04-06 17:49:22 +08:00
b2c9229099
route fixed.
2012-04-06 17:47:04 +08:00
3acd8a86c7
commit temp
2012-04-06 17:47:04 +08:00
cd3e04c55c
add tinyscrollbar
2012-04-06 17:47:04 +08:00
293e084bea
dock effect
2012-04-06 17:47:04 +08:00
f5c080efd4
Model commit
2012-04-06 17:47:04 +08:00
79f005c88e
new icons
2012-04-06 17:47:03 +08:00
58b51f0d17
Themes fixed…
2012-04-06 17:47:03 +08:00
ddf6a606a2
with notifications and other changes
2012-04-06 17:47:03 +08:00
6158799a47
Stupid theme
2012-04-06 17:47:03 +08:00
77b2919d8c
Desktop Commit
2012-04-06 17:47:02 +08:00
da7b415ad8
Desktop commit
2012-04-06 17:47:01 +08:00
fa441814f3
A filter UI for permission select. with Harry's JS
2012-04-06 17:46:50 +08:00
6f9363ef54
Fix bugs in upload design and missing menu
2012-04-06 17:37:45 +08:00
94816ce224
js change
2012-04-06 15:18:39 +08:00
74f083b226
details changed
...
orbitdesktop.js, orbitdesktopAPI.js update!
2012-04-06 04:42:20 +08:00
39e1bc8948
new setting page
2012-04-05 20:09:11 +08:00
ad740b0daf
Missing end tag in side_bar
2012-04-05 18:13:52 +08:00
894f8764d8
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
...
Conflicts:
app/views/layouts/_side_bar.html.erb
2012-04-05 17:42:55 +08:00
01bda515a6
fact_check with Ray's permission check.
...
needs Ray's new css
2012-04-05 17:41:43 +08:00
ef8eb0450b
Changes in tinymce bar
2012-04-05 17:28:21 +08:00
f7997bbd85
layout adjustment
2012-04-05 15:52:15 +08:00
d45725cf3b
fix announcement & add lang tab
2012-04-05 15:23:20 +08:00
ef88c2dbc2
fact_check with Ray's permission check.
...
needs Ray's new css
2012-04-05 15:06:01 +08:00
1259d62249
Fix mainTablePosition in js -> remove the notable class
2012-04-05 14:55:41 +08:00
e0f5583f43
route fixed.
2012-04-05 13:58:58 +08:00
cedd782e7f
Sidebar fix for ad_banner
2012-04-05 13:55:03 +08:00
07dadbef70
commit temp
2012-04-05 13:54:49 +08:00
d8b20ae993
fix ad_banner sidebar
2012-04-05 11:11:48 +08:00
a7d84e8583
add tinyscrollbar
2012-04-05 02:31:32 +08:00
c4b9a9e275
dock effect
2012-04-04 05:53:49 +08:00
11d3906951
new icons
2012-04-03 18:06:16 +08:00
a9988a0d5c
Change for interface,form.
2012-04-02 11:00:51 +08:00
8f28d45379
The new AdBanner.
2012-04-02 03:04:38 +08:00
b17cd7570f
changing to new admin_layout
2012-04-02 02:58:02 +08:00
928c642840
change layout from old admin to new_admin. not complete code
2012-04-02 02:58:01 +08:00
503f71e554
Ray's changes in tags, css and js
2012-04-02 02:55:36 +08:00
6c50aa5243
Add pagination to bulletin index and remove ajax to make it simple
2012-04-02 02:55:36 +08:00
32519f308f
Fix several bus when there is no design
2012-04-02 02:41:42 +08:00
bbd2c23b3d
Themes fixed…
2012-03-30 18:06:06 +08:00
32b7d95669
Fix parser_back_end & side_bar & meta
2012-03-30 15:51:29 +08:00
aa3997f7cf
with notifications and other changes
2012-03-29 19:50:23 +08:00
176597f5af
Stupid theme
2012-03-29 15:23:48 +08:00
2e283a039d
Desktop Commit
2012-03-28 18:53:30 +08:00
4798cd43c1
Desktop commit
2012-03-28 18:53:06 +08:00
d6e4da6dad
Ray's fix for margin-top
2012-03-28 11:31:07 +08:00
cf297fc424
Changed inherited controller in module_apps to OrbitBackendController
2012-03-27 18:58:04 +08:00
d02bbdbaa5
Nokogiri in parsers
2012-03-27 18:58:04 +08:00
55d12e50f2
Ray's changes in announcenment back-end
2012-03-27 18:58:03 +08:00
3ba89ecbcf
Fact check program completed,Lin checked
2012-03-27 18:54:03 +08:00
f5fd3dec7a
Trying nokogiri
2012-03-27 18:42:22 +08:00
f9c5ee5d18
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/assets/javascripts/bulletin_form.js.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
vendor/built_in_modules/announcement/config/routes.rb
2012-03-27 18:37:14 +08:00
e8d1352890
fix announcement
2012-03-27 14:29:11 +08:00
a30bc499c7
fix announcement & links
2012-03-27 14:19:58 +08:00
42519d9f78
fix announcement & links
2012-03-23 18:04:11 +08:00
61698f3f2c
Remove quick_edit on bulletin index load
2012-03-23 17:32:59 +08:00
a126935d2c
Clean the parsers and introduce the metas
2012-03-21 18:30:12 +08:00
472744fc87
Changes for IE9 with html5
2012-03-21 15:51:55 +08:00
2c6208db3c
Merge branch 'master' into ldap
2012-03-21 12:44:22 +08:00
3aa7c5120d
Put tinymce in its own js file.
...
To use on a text area just add the class "tinymce_textarea".
2012-03-21 12:41:32 +08:00
a1034f90ba
close alpha on nccu
2012-03-20 14:38:01 +08:00
5fcd3cd783
Merge branch 'master' into ldap
2012-03-20 14:27:04 +08:00
e953344965
Fix before_filter order for object_auth
2012-03-20 14:17:28 +08:00
49ece7be6a
Merge branch 'master' into ldap
2012-03-19 15:50:53 +08:00
7cc075e124
Change the monkey picture
2012-03-19 15:49:40 +08:00
47215693c4
Merge branch 'master' into ldap
...
Conflicts:
Gemfile
Gemfile.lock
config/application.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-03-19 14:27:15 +08:00
a755eb184b
fix announcement links & files
2012-03-16 16:49:25 +08:00
7d553acaec
fix announcement link & files
2012-03-16 15:53:57 +08:00
07edf44643
Merge branches 'design_team' and 'design_team' of github.com:Rulingcom/orbit into design_team
2012-03-16 15:13:06 +08:00
29ec36130e
css and js changes
2012-03-16 15:06:45 +08:00
f4fda08e86
Replace PrototypeR4 by Orbit.
...
Move session into mongoid_store.
Reset session when sing_in.
2012-03-16 14:58:32 +08:00
785ead5209
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
2012-03-16 14:55:21 +08:00
6f6e84b015
fix dashboard & announcement
2012-03-16 14:44:57 +08:00
b6d49df145
Change Obit to Orbit
2012-03-16 11:54:31 +08:00
13b6892f87
code for new fact check
2012-03-16 11:09:44 +08:00
00ab773942
fix dashboard & announcement
2012-03-14 20:05:03 +08:00
4dd9b7ffa4
Fix announcement pagination in front-end
2012-03-07 18:16:59 +08:00
0b1f83c042
Fix extra loaded js: the widgets only need to render layout when they need js.
2012-03-07 18:16:59 +08:00
d5a2de5476
LDAP with sync rake task
2012-03-06 16:41:06 +08:00
7f05f21930
Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
...
Conflicts:
config/environments/development.rb
2012-03-01 10:13:49 +08:00
cceb785a8d
change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.
2012-02-29 18:58:33 +08:00
8932615f05
add "all_user" for app&object auth
2012-02-29 18:56:42 +08:00
2e58c63ff7
fix bugs with token
2012-02-29 18:56:42 +08:00
cc550c5745
First version for App and Object auth.Taking Announcement as experiment
2012-02-29 18:55:55 +08:00
3bcd7ea349
Exp with object_auth
2012-02-29 18:50:23 +08:00
6b2aeadde6
Changes for nccu
2012-02-29 16:01:50 +08:00
9a40ecd1d9
Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine
...
Conflicts:
app/views/devise/passwords/new.html.erb
app/views/devise/sessions/new.html.erb
2012-02-29 13:07:21 +08:00
5223a7a3e9
Css and js changes
2012-02-29 12:45:47 +08:00
b84b7bad63
ldap config for 0229 nccu demo
2012-02-29 12:35:54 +08:00
ccb61fc2dd
change Search bar
2012-02-29 11:29:13 +08:00
0fa5c3ba9d
Fix bug in orbit-bar
2012-02-29 04:56:52 +08:00
344ec86c57
Remove class 'error' in devise forms
2012-02-29 04:56:32 +08:00
4b7b57bb3d
Add some missing translations
2012-02-29 04:48:21 +08:00
9aa4173933
Change orbit-bar for language but bug when user name is too long
2012-02-29 04:21:56 +08:00
18617850e5
Add categories for all the widgets
2012-02-28 22:00:05 +08:00
6a30b0a1e4
Add RSS event
2012-02-28 18:29:13 +08:00
fdf4cfad2d
Add category for announcement widget
2012-02-28 14:08:57 +08:00
7f9a7edc98
Changes in bulletins widget and front-end, add categories to link
2012-02-28 04:24:09 +08:00
f13ebc6c46
Fix bugs and changes for nccu
2012-02-27 18:50:56 +08:00
3209f9aa27
Complete for 229 check.
2012-02-24 19:07:47 +08:00
dcc64a20d2
Finish sorting for announcements
2012-02-24 15:30:49 +08:00
8f531a6fe5
Fix bus for pages and page content
2012-02-24 15:14:23 +08:00
f8d1d7242d
Merge branch 'design_team' into dashboard
2012-02-23 16:05:33 +08:00
1a6e497b3d
Ika's changes
2012-02-23 15:53:15 +08:00
63d7810b35
Add isotope, categories for announcement page, sort for announcement
2012-02-23 15:52:58 +08:00
53ed4b0404
Initial changes in announcement for sorting and filtering
2012-02-23 15:51:33 +08:00
22d9741ac8
Fix for orbit_bar
2012-02-23 15:51:33 +08:00
ba4d71a026
Changes in orbit_bar and js in announcements
2012-02-23 15:51:33 +08:00
678f1eabef
LDAP connection and modified Devise
2012-02-22 14:43:24 +08:00
9b001aa6c3
new page_content app
2012-02-21 19:22:42 +08:00
1146506063
Fix bug when no bulletins or web_links
2012-02-20 15:56:17 +08:00
devin
Christophe Vilayphiou
Harry Bomrah
Matthew K. Fu JuYuan
Christophe Vilayphiou
Matt
unknown
nccu
unknown
Matthew Kaito Juyuan Fu