59ab1e6d17
Got gallery update
2012-07-19 15:51:41 +08:00
37f6037333
Gallery started.
2012-07-19 15:44:44 +08:00
10731dc211
demo widget
2012-07-18 18:07:45 +08:00
033667f99b
fix for missing disable category at frontend and widget
2012-07-17 11:26:50 +08:00
a4b1681d39
fix rejection for announcement and news.
2012-07-17 10:21:46 +08:00
87be934aa3
gallery module update
2012-07-16 20:26:04 +08:00
4daf36908c
working cache
2012-07-13 15:36:10 +08:00
85d6bbe1c9
add i18n variable. fix web_links for disable category
2012-07-11 17:56:31 +08:00
ca2c056a07
fix for not displaying bulletin at fronted when it's parent category is disable
2012-07-11 17:17:44 +08:00
ba3d13790c
gallery module update
2012-07-10 17:43:21 +08:00
773371e885
fix from messy search
2012-07-09 16:48:23 +08:00
89446ba796
demo
2012-07-09 16:28:04 +08:00
fce2762ec3
demo
2012-07-09 16:28:04 +08:00
1d8e386bde
demo website widget
2012-07-09 16:28:03 +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
49862e70f9
hide category at front end
2012-07-09 12:05:21 +08:00
56caf4b34e
category disable for backend
2012-07-06 18:11:55 +08:00
c5fdff764e
orbit disable object for categories
2012-07-05 16:00:45 +08:00
32480e10ed
en translation
2012-07-04 17:43:52 +08:00
ae2cbb728e
archive for announcement
2012-07-04 17:36:51 +08:00
4fe92b844e
Add sorting order for NCCU request
2012-07-03 15:47:28 +08:00
c0b3798bad
fix for date for qu menu
2012-06-29 11:41:06 +08:00
f66c3d9c0c
fix bugs.
2012-06-29 11:17:35 +08:00
6c4c1046bc
fix date select cause error back to the time of Jesus
2012-06-28 15:19:51 +08:00
58a11ff569
fix javascript for new and anc link removing
2012-06-28 13:50:11 +08:00
243c9e2946
fix relation between bulletin and category (news also)
2012-06-27 15:16:16 +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
83a72bdf6e
fix for announcement
2012-06-26 18:23:44 +08:00
818c58c1ee
fix for 新聞與公告QA
...
1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時，圖片無法正常顯示（但是可以正常被編輯調整並於前台顯示）
2.add 上傳檔案大小限制: 3MB
3.公告的發佈單位為何是顯示單位代碼：M00？應顯示發布單位
2012-06-26 17:46:02 +08:00
df722ba90f
change display of user dept for showing announcement
2012-06-26 16:21:18 +08:00
2b54067ecb
change order of display menu of categories of news_bulletin and bulletin.
2012-06-26 14:28:21 +08:00
56b1bd9eaa
add translation
2012-06-26 10:57:51 +08:00
73fbed8837
fix 1.page_content user empty problem
...
2.add i18n variable for news and announcement
2012-06-26 10:04:40 +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
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
4f484599b7
Clean up code , cache other auths. Fix sidebar
2012-05-29 15:23:50 +08:00
a663231c8c
Merge branch 'design_team' into ldap
2012-05-25 10:01:41 +08:00
75b67dddf5
Fix date bugs
2012-05-25 09:59:39 +08:00
c062b43069
Merge branch 'design_team' into ldap
2012-05-23 12:11:38 +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
d6b92fc604
Fixed bugs for nccu
2012-05-22 20:00:07 +08:00
e0260542d3
fix code
2012-05-22 16:11:52 +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
27cf99462e
Fix bug in page and news
2012-05-22 14:42:19 +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
f72d0bc7e0
Merge branch 'design_team' into ldap
2012-05-18 10:51:20 +08:00
d9c12ea5a4
Proof authed_users for case when no category
2012-05-18 10:50:51 +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
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
eba4671733
Merge branch 'design_team' into ldap
2012-05-17 06:46:29 +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
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
be7ce0bf45
Redmine change's
2012-05-17 06:25:38 +08:00
0b0916179f
Change assets
2012-05-16 11:07:11 +08:00
ab616fc3b5
announcement edit to view file
2012-05-16 01:15:00 +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
42881553a8
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-15 22:48:40 +08:00
5e9b55e08e
Ray took out 'default' tags
2012-05-15 22:47:28 +08:00
3462c0e319
Add each page name to page_context index
2012-05-15 21:31:54 +08:00
e54f4409fb
Add impressionist
2012-05-15 21:26:09 +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
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
039e837fff
Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
...
Conflicts:
app/views/admin/object_auths_new_interface/_privilege_user.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_category_setting/_modal_list.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_category_setting/setting.html.erb
2012-05-14 00:51:53 +08:00
b804ba4d96
Fix for manager and admin can see all post in announcement. Haven't applied to news
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
8b42c595b3
Don't display admin in any premission select. Fix not necessary header for UT data
2012-05-14 00:49:22 +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
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
e696516aae
Fix for manager and admin can see all post in announcement. Haven't applied to news
2012-05-11 17:07:21 +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
63f904d3b0
Fix tinymce js load
...
Change to full_name for page_context index
2012-05-10 20:36:19 +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
87449ec6a8
Merge branch 'design_team' into ldap
2012-05-10 10:34:28 +08:00
07815eee8f
fix display for announcement and remove ut field
2012-05-10 10:29:18 +08:00
99c4e94729
Fix for home_list widget
2012-05-10 10:28:29 +08:00
f13e006e4d
fix display for announcement and remove ut field
2012-05-10 10:27:01 +08:00
64effbd83c
Remove extra widgets declaration
2012-05-10 00:41:32 +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
13587306bc
Add list widgets for announcement, news and links with categories and tags
2012-05-10 00:25:30 +08:00
6727f27181
Change for 0509 Nccu check
2012-05-09 16:58:12 +08:00
9a6b66c57d
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509
2012-05-09 15:54:59 +08:00
93946c37f4
fix wrong link
2012-05-09 15:54:00 +08:00
a9c241658a
Repeat code for news module
2012-05-09 15:28:02 +08:00
c82d701b55
Permission setting for announcement for bulletin cate
2012-05-09 15:28:02 +08:00
618e4f4047
Repeat code for news module
2012-05-09 15:22:15 +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
71a5731fe8
Permission setting for announcement for bulletin cate
2012-05-09 14:54:20 +08:00
d88d4e58dc
Merge branch 'design_team' into ldap
...
Conflicts:
config/environments/development.rb
2012-05-09 13:51:00 +08:00
9ead6cafda
Ray's changes
2012-05-09 04:15:02 +08:00
23d2d9a81e
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 17:36:35 +08:00
41424d2829
Fix error in front-end announcement index
2012-05-08 17:40:14 +08:00
ef9afca19f
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 17:28:05 +08:00
55bfaea43e
Can show announcement and news list by tag's key
2012-05-08 17:27:42 +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
7603cb91ad
Change subrole's context from code to text at approval setting.
2012-05-08 16:21:10 +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
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
2aaff21000
Add missing class in widget news_bulletin/index
2012-05-07 23:23:17 +08:00
ca88d0e01b
Fix bug that was never displaying preview
2012-05-07 17:29:56 +08:00
4c7a3842d6
Add drop_down to news_bulletin widget index for categories
2012-05-07 15:58:52 +08:00
48f8fbde7f
Fix site_locale_default_head and active for current locale
2012-05-07 00:53:52 +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
8e6fd277c2
Fix bug: preview was always true
2012-05-04 19:02:40 +08:00
e9b337a385
Copy changes into news after merge
2012-05-04 18:49:07 +08:00
119d8ff13a
add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data.
2012-05-04 15:50:45 +08:00
048ce4c97e
disable input
2012-05-04 15:50:45 +08:00
453cb21066
Announcement preivew
2012-05-04 15:50:45 +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
92a53c1b27
Ray's fix
2012-05-02 16:20:59 +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
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
382932036d
Hide Approval button when bulletin is checked.
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
851dc72f42
Ray's changes in css and html
2012-04-30 00:17:18 +08:00
2362e1cfdd
Merge branch 'design_team' into ldap
2012-04-27 15:28:32 +08:00
bf2c89da54
Add sorting to web_links
2012-04-27 14:20:09 +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
7d6b82d9dd
Merge branch 'ad_banner' into ldap
2012-04-26 17:15:44 +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
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
a704a054cc
Remove useless files
2012-04-25 16:10:11 +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
c65213c4f1
Merge branch 'design_team' into ldap
2012-04-24 17:10:34 +08:00
dc07964bc3
Fix js bug after Matt's changes in 'approval'
2012-04-24 17:10:23 +08:00
0c4f1d91f7
Merge branch 'ad_banner' into ldap
2012-04-24 16:46:04 +08:00
a47ef5cfe8
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
2012-04-24 16:45:13 +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
17e55b9805
Merge branch 'design_team' into ldap
2012-04-24 16:25:58 +08:00
9f6c9156c6
Spen patch for nccu
2012-04-24 16:25:30 +08:00
291d5e3a03
Ray's changes in css
2012-04-24 16:24:50 +08:00
d0ced39c74
R4-Billingual
2012-04-24 16:06:42 +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
d247f05d2e
Add missing translations in announcement and change announcement behavior for passed and rejected
2012-04-24 15:27:46 +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
e7bb9ea86b
Fix ad image date selector
2012-04-24 14:37:06 +08:00
c856b4cdce
Fix for upload image component in announcement
2012-04-24 12:41:28 +08:00
8041452be5
Fix for translation in sort headers for announcement
2012-04-24 11:05:01 +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
a748ccaac7
Patch from ldap for announcement translation
2012-04-24 02:33:35 +08:00
db1b84e962
Fix bug where an rejected announcement could still be edited by url
2012-04-24 00:58:56 +08:00
6130f8b1e4
Fix errors in status filter in announcement
2012-04-24 00:53:05 +08:00
b502bedd0f
Fix filter and sort for status in announcement
2012-04-24 00:46:34 +08:00
4f87165039
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
2012-04-23 18:10:16 +08:00
a8eeaf235f
Add Announcement translation
2012-04-23 15:28:56 +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
1ebf460f7e
Fix 'loading fail' in front-end for announcement
...
The show action was returning an array instead of a bulletin
2012-04-23 14:47:33 +08:00
fe9032787c
NCCU ldap debug
2012-04-23 10:13:44 +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
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
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
167f6d07a0
Remove extra "]"
2012-04-12 18:13:26 +08:00
e4c41ab54c
A filter UI for permission select. with Harry's JS
2012-04-12 07:14:06 +08:00
0909156eb4
fix i18n var for fact check pending
2012-04-12 07:14:06 +08:00
1fd38c8135
factcheck status for and
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
963a0cb604
Change filter to js with history for bulletins
2012-04-07 00:20:52 +08:00
01bda515a6
fact_check with Ray's permission check.
...
needs Ray's new css
2012-04-05 17:41:43 +08:00
4da03026a4
Fix pagination bug in bulletins
2012-04-05 15:28:43 +08:00
5f5871d1c2
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/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
2012-04-05 15:24:39 +08:00
d45725cf3b
fix announcement & add lang tab
2012-04-05 15:23:20 +08:00
9382ef6ae8
Merge branch 'dashboard' of https://github.com/Rulingcom/orbit into dashboard
...
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
2012-04-05 15:16:33 +08:00
1259d62249
Fix mainTablePosition in js -> remove the notable class
2012-04-05 14:55:41 +08:00
ccb0110b77
fix announcement & add lang tab
2012-04-05 14:48:31 +08:00
7bf50d6c52
Move the audit block to the bottom
2012-04-05 14:08:03 +08:00
9c1c70b598
Fix sorting in annoucement
2012-04-02 02:55:36 +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
c645c1b5df
Remove extra code in bulletin form
2012-03-28 10:51:14 +08:00
172d3d7847
Remove bad references to NewBlog
2012-03-27 19:42:07 +08:00
212730fd8a
Add missing end tag in bulletin _form
2012-03-27 19:37:47 +08:00
b587b7ca6b
Remove limit(1) to bulletins index action
2012-03-27 19:22:50 +08:00
50be40f7b3
Ray's changes in announcenment back-end
2012-03-27 19:10:35 +08:00
1e60acaa11
Fact check program completed,Lin checked
2012-03-27 19:06:28 +08:00
cf297fc424
Changed inherited controller in module_apps to OrbitBackendController
2012-03-27 18:58:04 +08:00
b134e690e9
Delete new_blog
2012-03-27 18:58:04 +08:00
07ba457dd7
admin now can post without fact check
2012-03-27 18:58:03 +08:00
55d12e50f2
Ray's changes in announcenment back-end
2012-03-27 18:58:03 +08:00
97adf94e15
fix with what ray needs for the fact_check form
2012-03-27 18:56:18 +08:00
3ba89ecbcf
Fact check program completed,Lin checked
2012-03-27 18:54:03 +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
33955b4554
Delete files with Chinese characters in name
2012-03-27 14:21:32 +08:00
c4299245de
Delete files with Chinese characters in name
2012-03-27 14:19:58 +08:00
a30bc499c7
fix announcement & links
2012-03-27 14:19:58 +08:00
7765f0d2e1
Delete files with Chinese characters in name
2012-03-27 14:17:48 +08:00
74636fb16d
Delete file with Chinese character in the name
2012-03-27 14:16:04 +08:00
f37eb5bf43
Add missing file
2012-03-23 18:27:41 +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
9f9d0f5bff
Merge branch 'design_team' into ldap
2012-03-21 13:13:01 +08:00
0e8f8b3424
Add missing category when redirect to front-end for bulletin back-end index
2012-03-21 12:58:13 +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
5d7202af8b
Modify bulletin back-end index to show announcement in front-end
2012-03-21 12:37:52 +08:00
c4d541d3b9
Remove code from back_end/bulletins/show
2012-03-21 12:36:52 +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
6700114955
after merge
2012-03-19 10:55:58 +08:00
9c8b0235b0
add new files
2012-03-19 10:55:58 +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
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
79c8b3861b
Fix link in widget
2012-03-07 18:16:59 +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
7c55f6fb88
Merge branch 'announcement_dev_view_and_auth' of github.com:Rulingcom/orbit into announcement_dev_view_and_auth
...
Conflicts:
config/environments/development.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/announcements_controller.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/announcement/app/models/bulletin.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb
vendor/built_in_modules/announcement/config/routes.rb
vendor/built_in_modules/web_resource/lib/tasks/web_resource_tasks.rake
2012-02-29 19:03:29 +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
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
0a23ce7b24
Add missing i18n for announcement
2012-02-29 12:00:16 +08:00
438dc0ad3d
i18n vars for announcement
2012-02-29 11:54:48 +08:00
b83a783a26
Add translation files for Announcement
2012-02-29 11:12:34 +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
fe4c0986e7
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
Gemfile.lock
app/controllers/admin/pages_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
2012-02-27 18:56:15 +08:00
0029ef2b5a
Fix bug due to image_filename -> image_identifier
2012-02-27 18:50:56 +08:00
f13ebc6c46
Fix bugs and changes for nccu
2012-02-27 18:50:56 +08:00
70b4c83cf5
Fix bugs and changes for nccu
2012-02-24 19:11:51 +08:00
3209f9aa27
Complete for 229 check.
2012-02-24 19:07:47 +08:00
f4d663c67d
Temporary changes for announcement form
2012-02-24 15:35:21 +08:00
dcc64a20d2
Finish sorting for announcements
2012-02-24 15:30:49 +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
ba4d71a026
Changes in orbit_bar and js in announcements
2012-02-23 15:51:33 +08:00
48d94d5e15
Fix bug widget when no bulletins or web_links, put link in bulletins
2012-02-23 15:50:30 +08:00
ad27537cf7
Change pagination in bulletins
2012-02-23 15:50:30 +08:00
20c320961f
edit page_content
2012-02-23 15:13:36 +08:00
9b001aa6c3
new page_content app
2012-02-21 19:22:42 +08:00
b0834c0c62
Merge branch 'new_announcement_dev' of https://github.com/Rulingcom/orbit into new_announcement_dev
...
Conflicts:
app/views/layouts/module_widget.html.erb
2012-02-20 16:25:29 +08:00
e82fd405c9
remove bulletins_list
2012-02-20 16:23:54 +08:00
1146506063
Fix bug when no bulletins or web_links
2012-02-20 15:56:17 +08:00
cf038183b9
Ika's changes in modules
2012-02-20 08:48:27 +08:00
7d57b50e46
Widget for announcement and web_link with ajax reload and pagination
2012-02-20 08:34:36 +08:00
78a139ff38
update announcement & web_resource widget
2012-02-20 03:24:47 +08:00
a3f152b200
Changes for jquery 1.7 (.live -> .on), create module_layout
2012-02-20 03:24:05 +08:00
26cd6951db
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-17 17:50:23 +08:00
5da75161c4
announcemenet & web_resource widget
2012-02-16 17:52:49 +08:00
d2689bc59c
fix bugs with token
2012-02-16 13:57:28 +08:00
e0accbecaa
Changes into page_part edition.
...
Can choose between 'text', 'public_r_tag' and 'widget'
2012-02-16 13:09:09 +08:00
7ea1745f73
items error
2012-02-16 11:30:54 +08:00
5640e07733
First version for App and Object auth.Taking Announcement as experiment
2012-02-15 18:20:44 +08:00
4d361857cb
Fix tags in web_resource
2012-02-15 15:47:05 +08:00
edf236c1c7
edit tags
2012-02-15 15:38:27 +08:00
af3a2547e1
Change ModuleAppTag into "Module name"Tag.
2012-02-15 15:18:11 +08:00
d0c2856a3a
Fix relations error in tags
2012-02-15 11:42:19 +08:00
778a85ca2b
add tags
2012-02-15 10:37:07 +08:00
1913f0aca8
Add tinymce
2012-02-15 10:02:05 +08:00
3e70634add
Announcement modifications and tags
2012-02-15 00:34:22 +08:00
f57e9f19f7
Changes for multiple i18n_variable in bulletin
2012-02-15 00:34:22 +08:00
1f7dae9bee
Gemfile and bugs in js for orbit-bar
2012-02-15 00:34:22 +08:00
55ae7de01c
Orbit-bar in front-end and back-end, side-bar and drop-down menu
2012-02-15 00:34:22 +08:00
436f039c1b
build interface to work with object auth. Go to panel/new_blog/back_end/posts/ ,click New Auth link
2012-02-15 00:34:21 +08:00
e20739e32b
Object Auth. Now object can be included with "include OrbitCoreLib::ObjectAuthable" to use kernel method,such as
...
1.Object.authed_for_user(user,title_of_object_auth). title_of_object_auth is optional
2.object.authed_users(user,title_of_object_auth) . title_of_object_auth is optional
if title_of_object_auth is not given,then it will return calculation across all possiblity.
2012-02-15 00:34:21 +08:00
3ed9b81df9
first commit for object auth,will take new_blog for experiment
2012-02-15 00:34:21 +08:00
17caa7cb1b
Exp with object_auth
2012-02-13 17:33:48 +08:00
70c97bc065
edit announcement widget
2012-02-13 17:09:38 +08:00
088bbe1853
Change announcement route
2012-02-13 17:09:37 +08:00
964d7b6054
announcement path error
2012-02-13 17:09:37 +08:00
c88e1c8419
Merge branch 'obj_auth' into announcement_dev_view_and_auth
2012-02-12 23:24:50 +08:00
32159564cd
build interface to work with object auth. Go to panel/new_blog/back_end/posts/ ,click New Auth link
2012-02-09 19:04:06 +08:00
31d7cd5b38
Object Auth. Now object can be included with "include OrbitCoreLib::ObjectAuthable" to use kernel method,such as
...
1.Object.authed_for_user(user,title_of_object_auth). title_of_object_auth is optional
2.object.authed_users(user,title_of_object_auth) . title_of_object_auth is optional
if title_of_object_auth is not given,then it will return calculation across all possiblity.
2012-02-09 17:48:51 +08:00
e638c1c7c3
Change announcement route
2012-02-09 15:07:43 +08:00
338d18e909
announcement path error
2012-02-09 14:58:59 +08:00
3a8dbd6af4
first commit for object auth,will take new_blog for experiment
2012-02-07 16:16:48 +08:00
8f885e8bb7
Use key not title for module_app in parser.
...
Modify announcement routes.
2012-02-06 16:58:19 +08:00
f097f83f2b
announcement_category edit
2012-02-06 16:20:51 +08:00
3287b68354
Basic function for ad_banner
2012-02-01 14:27:51 +08:00
762c2f5e8a
Add key in module_app.rb to use instead of title for authorization
2012-01-30 18:12:18 +08:00
783eae4597
Change "NewBlog" folders into "new_blog" in assets
...
Modify routes and pages handling for clean front-end urls
2012-01-24 18:16:58 +08:00
959f3e8b2f
put setup APP var setup into Orbit class
2012-01-24 12:28:32 +08:00
68ad208777
announcement widget page
2012-01-20 16:36:25 +08:00
2c8940e350
announcement widget page
2012-01-20 14:04:52 +08:00
4cfae9c107
announcement widget query
2012-01-18 21:34:26 +08:00
3e912b6262
Merge branches 'master' and 'exception_notification' into new_announcement_dev
2012-01-16 07:57:40 +08:00
7e7fc69a37
add announcemet search & set top
2012-01-13 19:15:03 +08:00
4b838b5ef5
edit announcement upload & show
2012-01-12 18:38:50 +08:00
ec235bcaa3
merge with master
2012-01-11 20:31:52 +08:00
3d9fd359ed
Moving Orbit frontend and widget controller to controllers folder
2012-01-10 18:30:08 +08:00
cae3daa9c4
Change NewBlog to new_blog
2012-01-10 18:29:11 +08:00
79f778ad8c
creating for disabling widgets and frontend
2012-01-05 16:21:33 +08:00
7b40706aed
fixing for app_auth
2012-01-05 16:20:51 +08:00
62aaf79491
Merge with sub_roles
2011-12-23 18:34:21 +08:00
d465febca7
merge with november_presentation
2011-12-22 15:43:38 +08:00
e7c9816139
Move NewBlog to built_in_modules and delete "vendor/templates"
2011-12-22 01:38:27 +08:00
a09f8e4551
merge with november_presentation
2011-12-20 16:47:17 +08:00
1909edbe2a
Simplification of the 'link_back' code
2011-04-19 15:05:48 +08:00
106db069fd
update radius, modify routes to handle modules, add blog module
2011-04-13 18:28:24 +08:00
Harry Bomrah
unknown
Matthew K. Fu JuYuan
Christophe Vilayphiou
Christophe Vilayphiou
Matt
nccu
Matthew Kaito Juyuan Fu