bc5235aa9f
archive checkbox
2012-08-30 14:49:31 +08:00
e281262b6d
new archive
2012-08-30 14:49:31 +08:00
2a4c737cdd
archive checkbox
2012-08-30 14:48:42 +08:00
7ce4a51b73
new archive
2012-08-30 14:45:28 +08:00
eb7e73b393
new archive
2012-08-30 14:44:55 +08:00
becf88bc20
Delete duplicate side_bar code
2012-08-30 14:39:48 +08:00
c74ebb91b8
archive checkbox
2012-08-30 14:37:56 +08:00
57717eef33
new archive
2012-08-30 14:36:48 +08:00
8a5519073b
new archive
2012-08-30 14:32:32 +08:00
29bcfa3139
archive checkbox
2012-08-30 14:19:51 +08:00
c5c7b0ca7c
new archive
2012-08-30 14:18:16 +08:00
d5cc9961e3
new archive
2012-08-30 14:14:53 +08:00
9cd7aa81a6
Calendar Module
2012-08-29 20:13:41 +08:00
62abbf9417
Ruby structure implementation
2012-08-27 23:36:56 +08:00
7d5531bf01
Merge branch 'nccu_master' into demo_site
...
Conflicts:
Gemfile
app/assets/javascripts/tinymce_orbit.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/admin/assets_controller.rb
app/controllers/admin/module_apps_new_interface_controller.rb
app/controllers/admin/page_parts_controller.rb
app/jobs/sync_db.rb
app/models/page.rb
app/models/page_part.rb
app/models/user/user.rb
app/uploaders/image_uploader.rb
app/views/admin/assets/create.js.erb
app/views/admin/module_apps/reload_frontend_pages.js.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
app/views/layouts/_users_checkbox_ary.html.erb
app/views/shared/_privilege_user.html.erb
config/mongoid.yml
lib/parsers/parser_common.rb
vendor/built_in_modules/announcement/announcement.json
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
2012-08-22 18:07:49 +08:00
2c0058e8c9
authorization
2012-08-20 23:18:50 +08:00
faf2d914b6
Page added for desktop
2012-08-20 23:17:31 +08:00
263cf130e2
tp
2012-08-20 23:16:54 +08:00
aef1bfaba3
Button fixes
2012-08-20 23:16:54 +08:00
69304fda43
UI modifications
2012-08-20 23:16:06 +08:00
abd1a9ecbc
gallery update
2012-08-20 23:14:11 +08:00
1ba87982ba
Multi language and side bar update
2012-08-20 23:14:11 +08:00
1daf405b3d
Gallery started.
2012-08-20 23:14:10 +08:00
23a3a7eff6
update archive
2012-08-20 17:14:13 +08:00
96fd89cca3
Fix js for ie in list
2012-08-16 01:09:45 +08:00
43bc704468
Error popup only shows on flash[:error]
2012-08-15 15:55:29 +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
9ff60d2ba4
form validation again
2012-08-14 01:02:45 +08:00
c32b0dd4b4
Move delete checkboxes to js
2012-08-14 00:59:01 +08:00
33fc96ac7c
Changes for NCCU after email
2012-08-11 18:19:30 +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
d5c55c9697
widget & frontend field
2012-08-09 15:25:30 +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
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
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
c6c8187bda
Changes for design: menu, frontend news and announcement
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
ecc5c39840
Fix remote upload file for tinymce
2012-08-08 10:51:54 +08:00
4660c26b7a
fix for ie8,9 for tinymce
2012-08-07 20:55:18 +08:00
8ea7bf75cd
Fix uploader, ie9 ok, not ie8
2012-08-07 17:32:15 +08:00
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
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
7440727acd
Fix: "._type" to ".class"
2012-07-30 17:21:37 +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
53cae0a9ee
Remove i18n_variable for views
2012-07-27 19:13:39 +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
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
1d8e386bde
demo website widget
2012-07-09 16:28:03 +08:00
58d162d225
publication adjustment
2012-07-09 10:44:01 +08:00
830eb8eb62
Timeline design and timescale update
2012-07-06 16:11:03 +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
6923b82284
Added seminar section
2012-07-04 19:12:02 +08:00
f635f642fc
Merge for new timeline updates and font updates
2012-07-04 18:49:10 +08:00
6b9926539d
Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua
...
Conflicts:
app/assets/javascripts/orbitdesktop.js
app/controllers/desktop_publications_controller.rb
config/routes.rb
2012-07-04 18:31:00 +08:00
3f42a22094
Books section added
2012-07-04 17:55:30 +08:00
ae2cbb728e
archive for announcement
2012-07-04 17:36:51 +08:00
a0c09046a8
Timeline merge plus font update
2012-07-03 19:53:34 +08:00
56ecf9c69b
remove remember for nccu
2012-07-03 15:59:25 +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
4aa155a44d
timeline updates major ones..
2012-06-26 21:09:33 +08:00
555ec86403
Timeline commit
2012-06-26 15:59:28 +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
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
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
6f0cf0e92e
cache privilege user list.
2012-05-29 15:23:50 +08:00
3480fa2545
Fix login and label. Check sync jobs and update info function.
2012-05-24 17:01:00 +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
541aa5831e
JS changes to load drag and drop
2012-05-22 17:37:15 +08:00
d0b030c47d
Put inc/ajax_setting in new_admin
...
Fix callback for link on save
2012-05-22 16:11:00 +08:00
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
a78b72ebfc
app update
2012-05-21 15:25:18 +08:00
ab7ae6dcee
app
2012-05-21 14:55:51 +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
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
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
eba4671733
Merge branch 'design_team' into ldap
2012-05-17 06:46:29 +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
617a683d00
image insertion completed..
2012-05-16 16:22:50 +08:00
30137b50b4
popup fix..
2012-05-16 15:33: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
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
unknown
Christophe Vilayphiou
Harry Bomrah
devin
Matthew K. Fu JuYuan
Joshua Milton
Christophe Vilayphiou
Matt