Harry Bomrah
aef1bfaba3
Button fixes
2012-08-20 23:16:54 +08:00
Harry Bomrah
69304fda43
UI modifications
2012-08-20 23:16:06 +08:00
devin
abd1a9ecbc
gallery update
2012-08-20 23:14:11 +08:00
Harry Bomrah
1ba87982ba
Multi language and side bar update
2012-08-20 23:14:11 +08:00
Harry Bomrah
1daf405b3d
Gallery started.
2012-08-20 23:14:10 +08:00
unknown
23a3a7eff6
update archive
2012-08-20 17:14:13 +08:00
Christophe Vilayphiou
96fd89cca3
Fix js for ie in list
2012-08-16 01:09:45 +08:00
Christophe Vilayphiou
43bc704468
Error popup only shows on flash[:error]
2012-08-15 15:55:29 +08:00
Christophe Vilayphiou
fb53ad524a
Add time to announcement quick edit
...
Fix picture for news quick edit
Fix tags not saving when empty
Hide role in quick edit
2012-08-14 14:38:21 +08:00
Harry Bomrah
9ff60d2ba4
form validation again
2012-08-14 01:02:45 +08:00
Christophe Vilayphiou
c32b0dd4b4
Move delete checkboxes to js
2012-08-14 00:59:01 +08:00
Christophe Vilayphiou
33fc96ac7c
Changes for NCCU after email
2012-08-11 18:19:30 +08:00
Christophe Vilayphiou
bebb8a1c1e
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/archive/app/models/archive_file.rb
vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
2012-08-10 15:30:33 +08:00
Christophe Vilayphiou
53cd39f180
Delete duplicate side_bar code
2012-08-10 15:26:34 +08:00
unknown
d8b0613147
archive checkbox
2012-08-10 15:26:34 +08:00
unknown
26931a7b9c
new archive
2012-08-10 15:23:56 +08:00
unknown
81fa2a7428
archive checkbox
2012-08-10 15:19:45 +08:00
unknown
2dd2abc8d2
new archive
2012-08-10 15:17:16 +08:00
unknown
e8cea9f0ab
new archive
2012-08-10 15:14:43 +08:00
unknown
d5c55c9697
widget & frontend field
2012-08-09 15:25:30 +08:00
Matthew K. Fu JuYuan
e8317e0a4b
1.Remove category column when category is specified
...
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
2012-08-08 14:46:08 +08:00
Christophe Vilayphiou
05e61b63bb
Fix fb share, redirect with js when the page is not requested by fb but by user
2012-08-08 11:04:19 +08:00
Christophe Vilayphiou
6cfdf0f25a
Change the way the orig_url is passed to fb
2012-08-08 11:04:19 +08:00
Christophe Vilayphiou
4bed925e0f
Try fb from override and generated page
2012-08-08 11:04:19 +08:00
Christophe Vilayphiou
c6c8187bda
Changes for design: menu, frontend news and announcement
2012-08-08 10:53:04 +08:00
Christophe Vilayphiou
c8dcc9734d
Change width for site map frontend, add link for more in announcement widget
2012-08-08 10:53:04 +08:00
Christophe Vilayphiou
292105bdf1
Remove remotipart (not working with ie9) the upload is working except that the pop-up does not disappear in ie
2012-08-08 10:53:04 +08:00
Christophe Vilayphiou
ecc5c39840
Fix remote upload file for tinymce
2012-08-08 10:51:54 +08:00
Harry Bomrah
4660c26b7a
fix for ie8,9 for tinymce
2012-08-07 20:55:18 +08:00
Christophe Vilayphiou
8ea7bf75cd
Fix uploader, ie9 ok, not ie8
2012-08-07 17:32:15 +08:00
Christophe Vilayphiou
df9a1e8057
Fix typo
2012-08-01 17:11:37 +08:00
Christophe Vilayphiou
f917adcdf3
Fix typo
2012-08-01 17:09:00 +08:00
Christophe Vilayphiou
0d048de33f
Fix link in sitemap
2012-08-01 17:08:07 +08:00
Christophe Vilayphiou
83acb78966
path instead of url
2012-08-01 17:05:34 +08:00
Christophe Vilayphiou
410dfe62e8
Fix typo
2012-08-01 17:03:39 +08:00
Christophe Vilayphiou
02ade108d0
Fix typo
2012-08-01 16:59:11 +08:00
Christophe Vilayphiou
4df4274629
Add links to frontend_sitemap
2012-08-01 16:38:07 +08:00
Christophe Vilayphiou
ecb75fd085
Fix typo
2012-07-30 18:37:20 +08:00
Christophe Vilayphiou
39b63a970c
Fix .class to .class.to_s
2012-07-30 18:34:54 +08:00
Christophe Vilayphiou
7440727acd
Fix: "._type" to ".class"
2012-07-30 17:21:37 +08:00
Christophe Vilayphiou
a8cc581279
Sitemap done for backend and fronted
2012-07-27 19:13:40 +08:00
Christophe Vilayphiou
934b515914
Sitemap with main
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
38804bd118
Add disable for main title
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
db9c4c0e10
Partial sitemap
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
12f9f666eb
Fix bugs after i18n_variable removal
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
53cae0a9ee
Remove i18n_variable for views
2012-07-27 19:13:39 +08:00
unknown
c0cac812c5
demo site widget
2012-07-26 16:39:29 +08:00
Matthew K. Fu JuYuan
87549d4e1f
fix for nil value
2012-07-25 17:49:16 +08:00
Matthew K. Fu JuYuan
13ec25ed10
fix for orbit bar broken
2012-07-25 17:44:50 +08:00
Matthew K. Fu JuYuan
97b4eee798
full site search with google
2012-07-25 17:20:25 +08:00
unknown
10731dc211
demo widget
2012-07-18 18:07:45 +08:00
Matthew K. Fu JuYuan
2ae6b54a45
fix for not working cache
2012-07-13 18:32:17 +08:00
Matthew K. Fu JuYuan
4daf36908c
working cache
2012-07-13 15:36:10 +08:00
unknown
1d8e386bde
demo website widget
2012-07-09 16:28:03 +08:00
devin
58d162d225
publication adjustment
2012-07-09 10:44:01 +08:00
Harry Bomrah
830eb8eb62
Timeline design and timescale update
2012-07-06 16:11:03 +08:00
devin
bfaed4deb4
timeline change
2012-07-05 16:49:03 +08:00
Harry Bomrah
312e63f242
New Timeline with books and seminar pages
2012-07-05 16:42:00 +08:00
Joshua Milton
bb75383ef0
Seminar Pages modified
2012-07-05 16:27:59 +08:00
Harry Bomrah
6923b82284
Added seminar section
2012-07-04 19:12:02 +08:00
Harry Bomrah
f635f642fc
Merge for new timeline updates and font updates
2012-07-04 18:49:10 +08:00
Joshua Milton
6b9926539d
Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua
...
Conflicts:
app/assets/javascripts/orbitdesktop.js
app/controllers/desktop_publications_controller.rb
config/routes.rb
2012-07-04 18:31:00 +08:00
Joshua Milton
3f42a22094
Books section added
2012-07-04 17:55:30 +08:00
Matthew K. Fu JuYuan
ae2cbb728e
archive for announcement
2012-07-04 17:36:51 +08:00
Harry Bomrah
a0c09046a8
Timeline merge plus font update
2012-07-03 19:53:34 +08:00
Matthew K. Fu JuYuan
56ecf9c69b
remove remember for nccu
2012-07-03 15:59:25 +08:00
devin
08fd07b6aa
timeline and font update
2012-07-02 16:22:51 +08:00
devin
6533abf214
font awesome update
2012-07-02 11:10:01 +08:00
Christophe Vilayphiou
a1e74987dc
Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry
...
Conflicts:
Gemfile.lock
app/assets/javascripts/.DS_Store
app/assets/stylesheets/style.css.erb
app/views/layouts/_orbit_bar.html.erb
2012-06-29 16:10:29 +08:00
Harry Bomrah
7151102a86
new page add and timeline changes
2012-06-28 17:31:48 +08:00
Harry Bomrah
4aa155a44d
timeline updates major ones..
2012-06-26 21:09:33 +08:00
Harry Bomrah
555ec86403
Timeline commit
2012-06-26 15:59:28 +08:00
Matthew K. Fu JuYuan
ffd95ee1fd
fix
...
新聞與公告QA-權限設定--優先處理3.一般發佈新聞&公告人,應該只能看到自己發佈的新聞&公告,但是目前可以看到全部,而且可以刪除其他人的公告.至少要不能刪除別人的公告
新聞與公告QA-編輯問題-發佈新聞時,發佈單位預設為請選擇
新聞與公告QA-編輯問題-公告模組請移除 Subtitle 欄位
put rb-readline only in Linux
make app_manager destroy after user deletion. may need to run:
AppManager.all.collect{|am| am if am.user.nil? }.delete_if {|x| x == nil}.each{|am| am.destroy}
for clean up DB.
2012-06-25 16:23:16 +08:00
Matthew K. Fu JuYuan
a36f73bafc
fix 0621 Trello:"171 頁面管理不能使用"
2012-06-22 18:19:40 +08:00
Matthew K. Fu JuYuan
8dd1ab32c1
Add this toolbar, and nccu calendar fix
2012-06-04 16:51:29 +08:00
Matthew K. Fu JuYuan
11247ce84c
Clean up code , cache other auths. Fix sidebar
2012-05-29 17:17:26 +08:00
Matthew K. Fu JuYuan
1f1868a75f
cache privilege user list.
2012-05-29 17:17:26 +08:00
Matthew K. Fu JuYuan
2f500ff460
For non-login user,show no drop down menu and return to home after press orbit button.
2012-05-29 16:33:38 +08:00
Matthew K. Fu JuYuan
4f484599b7
Clean up code , cache other auths. Fix sidebar
2012-05-29 15:23:50 +08:00
Matthew K. Fu JuYuan
6f0cf0e92e
cache privilege user list.
2012-05-29 15:23:50 +08:00
Matthew K. Fu JuYuan
3480fa2545
Fix login and label. Check sync jobs and update info function.
2012-05-24 17:01:00 +08:00
Christophe Vilayphiou
f1c8bed29d
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
2012-05-22 20:33:07 +08:00
Christophe Vilayphiou
d6b92fc604
Fixed bugs for nccu
2012-05-22 20:00:07 +08:00
Christophe Vilayphiou
541aa5831e
JS changes to load drag and drop
2012-05-22 17:37:15 +08:00
Christophe Vilayphiou
d0b030c47d
Put inc/ajax_setting in new_admin
...
Fix callback for link on save
2012-05-22 16:11:00 +08:00
Matthew K. Fu JuYuan
79f67208fa
js for preventing user do stupid things durning ajax
2012-05-22 14:59:54 +08:00
Christophe Vilayphiou
5e9836f371
Changes for structure
2012-05-22 14:45:49 +08:00
Christophe Vilayphiou
aa114568c4
Move design to site_settings side_bar
2012-05-21 18:20:39 +08:00
devin
a78b72ebfc
app update
2012-05-21 15:25:18 +08:00
devin
ab7ae6dcee
app
2012-05-21 14:55:51 +08:00
Matthew K. Fu JuYuan
661fcafe70
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team
...
Conflicts:
vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
2012-05-18 18:50:10 +08:00
Matthew K. Fu JuYuan
6ce6577e83
fix news approve and preview
2012-05-18 18:47:18 +08:00
Matt
6a022c90da
Changes on nccu
2012-05-18 15:20:45 +08:00
Matthew K. Fu JuYuan
5f6696a358
fix view for different_user for ad_banner. add field 'best size' for ad_banner within form
2012-05-18 14:19:13 +08:00
Christophe Vilayphiou
17b6a70506
Merge branch 'design_team' into ldap
2012-05-17 23:36:24 +08:00
Matthew K. Fu JuYuan
16ada34585
fix ad_banner. new ad_image with best size from ad_banner. content editable at tab
2012-05-17 23:35:46 +08:00
Harry Bomrah
1b1c2c0032
image title and description callback fixed…
2012-05-17 20:19:31 +08:00
Christophe Vilayphiou
60988f97fb
Merge branch 'design_team' into ldap
2012-05-17 19:41:24 +08:00
Christophe Vilayphiou
2f7d561310
Put back I18n for file_upload
2012-05-17 19:40:30 +08:00
Christophe Vilayphiou
25de941df7
Merge branch 'design_team' into ldap
2012-05-17 19:10:22 +08:00
Christophe Vilayphiou
606050627e
Remove I18n for file_upload html
2012-05-17 19:09:52 +08:00
Christophe Vilayphiou
698c750cd7
Merge branch 'design_team' into ldap
2012-05-17 18:37:56 +08:00
Christophe Vilayphiou
27fd2d0714
Hide assets links from side_bar
2012-05-17 18:37:46 +08:00
Christophe Vilayphiou
79f484300e
Merge branch 'design_team' into ldap
2012-05-17 18:32:06 +08:00
Christophe Vilayphiou
c9cbec4239
Asset changes, add description
2012-05-17 18:31:40 +08:00
Christophe Vilayphiou
5e93fe51a9
Merge branch 'design_team' into ldap
2012-05-17 16:41:11 +08:00
Christophe Vilayphiou
29c54e6480
Add mandatory fields to assets
2012-05-17 16:40:09 +08:00
Christophe Vilayphiou
eba4671733
Merge branch 'design_team' into ldap
2012-05-17 06:46:29 +08:00
Matthew K. Fu JuYuan
0f354b8ccc
fix ad_image size hints. fix orbit backend controller error when changing language.
2012-05-17 06:44:14 +08:00
Matthew K. Fu JuYuan
a3acd865d7
AdBanner reopen new banner and delete. Rename title with content editable tag.
2012-05-17 06:44:14 +08:00
Matthew K. Fu JuYuan
7f2564a81e
Fix sidebar and hide some links by roles
2012-05-17 06:43:39 +08:00
Matthew K. Fu JuYuan
82d78acbad
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
2012-05-17 06:43:39 +08:00
Matthew K. Fu JuYuan
03387d3c07
Object auth for ad_banner
2012-05-17 06:42:33 +08:00
Matthew K. Fu JuYuan
f663985a40
starting ad_banner auth
2012-05-17 06:42:33 +08:00
Christophe Vilayphiou
6b9c8eb15d
Merge branch 'design_team' into ldap
2012-05-17 06:31:57 +08:00
Christophe Vilayphiou
b05836835a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-17 06:28:49 +08:00
Christophe Vilayphiou
26292f0dcc
Asset upload
2012-05-17 06:28:29 +08:00
Harry Bomrah
27a0984da1
tinymce loading fixed…
2012-05-16 18:51:37 +08:00
Christophe Vilayphiou
9129835f23
Add tags to assets
2012-05-16 18:19:41 +08:00
Harry Bomrah
617a683d00
image insertion completed..
2012-05-16 16:22:50 +08:00
Harry Bomrah
30137b50b4
popup fix..
2012-05-16 15:33:54 +08:00
Christophe Vilayphiou
0b0916179f
Change assets
2012-05-16 11:07:11 +08:00
Christophe Vilayphiou
b31846f424
Delete duplicate side_bar code
2012-05-16 04:35:19 +08:00
Christophe Vilayphiou
ad9ac5f3f7
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-05-16 01:31:16 +08:00
unknown
cc02ea511c
archive checkbox
2012-05-16 01:13:39 +08:00
unknown
cf5e6c1a96
new archive
2012-05-16 01:09:21 +08:00
unknown
4e9bb1b583
new archive
2012-05-16 01:06:26 +08:00
Christophe Vilayphiou
f950f77f36
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile
app/models/ad_banner.rb
2012-05-15 23:02:22 +08:00
Christophe Vilayphiou
80e84c10ba
Remove link from dashboard
2012-05-15 23:01:00 +08:00
Christophe Vilayphiou
e54f4409fb
Add impressionist
2012-05-15 21:26:09 +08:00
Christophe Vilayphiou
59b55d1574
Merge branch 'design_team' into ldap
2012-05-14 12:42:06 +08:00
Matthew K. Fu JuYuan
9ba4c2cf2f
Change to apply page to had object_auth
2012-05-14 12:40:50 +08:00
Christophe Vilayphiou
ebc8dd33ec
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile.lock
app/controllers/admin/module_apps_controller.rb
app/controllers/application_controller.rb
vendor/built_in_modules/web_resource/web_resource.json
2012-05-14 00:57:17 +08:00
Matthew K. Fu JuYuan
7a6d30ad62
Remove unless files and change routes.
2012-05-14 00:50:36 +08:00
Matthew K. Fu JuYuan
0119ab1a74
New Interface for App Auth and Object Auth
2012-05-14 00:50:12 +08:00
Matthew K. Fu JuYuan
a184f96ce7
AdBanner app_auth
2012-05-14 00:49:22 +08:00
Christophe Vilayphiou
cf8d20dc84
Add category and tag to pages
2012-05-14 00:33:52 +08:00
Christophe Vilayphiou
e40c76bf5f
Fix new page form
...
Redirect to home when not authorized
Get only module_apps with app_pages for new and edit page
Change web_resource.json
2012-05-13 23:48:34 +08:00
Christophe Vilayphiou
01d0c002f5
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/views/admin/pages/_edit.html.erb
app/views/admin/pages/_form.html.erb
lib/parsers/parser_back_end.rb
2012-05-13 23:14:13 +08:00
Christophe Vilayphiou
62e9a772f6
Fix titles for widgets
...
Add translations
2012-05-13 23:09:48 +08:00
Christophe Vilayphiou
4ae8299949
Add custom title to widgets
...
Fix pagination conflict with main_content and widgets
2012-05-13 22:35:00 +08:00
Christophe Vilayphiou
281cfa6518
Changes for widgets
2012-05-13 21:55:39 +08:00
Christophe Vilayphiou
4685952bd6
Changes in page_edit
2012-05-13 20:13:26 +08:00
Christophe Vilayphiou
ef2d416c70
Ray's changes for page_edit
2012-05-13 19:36:04 +08:00
Christophe Vilayphiou
803253ebcf
Put nestedSortable in page_edit.js.erb
2012-05-12 22:12:17 +08:00
Christophe Vilayphiou
ef49df448d
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/helpers/admin/item_helper.rb
2012-05-11 18:09:34 +08:00
Christophe Vilayphiou
076f5ad6ef
Ray's changes for drag and drop in structure's side_bar
2012-05-11 17:54:33 +08:00
Christophe Vilayphiou
6a443f0976
Add mongoid-tree to Item
2012-05-11 16:16:09 +08:00
Harry Bomrah
1a9fa8f505
Merge branch 'desktop_harry' into desktop_devin
2012-05-11 15:28:05 +08:00
Harry Bomrah
2c3637e9b4
very important update for widgets management..
2012-05-11 15:27:16 +08:00
Christophe Vilayphiou
fd52d00187
Add drag and drop to structure side_bar
2012-05-11 10:00:45 +08:00
Christophe Vilayphiou
63f904d3b0
Fix tinymce js load
...
Change to full_name for page_context index
2012-05-10 20:36:19 +08:00
Christophe Vilayphiou
5eba2638ce
Merge branch 'design_team' into ldap
2012-05-10 14:17:38 +08:00
Matthew K. Fu JuYuan
b6aad17681
Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.
2012-05-10 14:16:37 +08:00
devin
ada56a7a63
some update
2012-05-10 10:54:43 +08:00
Christophe Vilayphiou
87449ec6a8
Merge branch 'design_team' into ldap
2012-05-10 10:34:28 +08:00
Christophe Vilayphiou
a43877323e
Add tinymce to page_part edit for text
2012-05-10 10:34:13 +08:00
Christophe Vilayphiou
de739d7d20
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/web_resource/web_resource.json
2012-05-10 00:34:23 +08:00
Christophe Vilayphiou
bc5e975fab
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-10 00:29:22 +08:00
Christophe Vilayphiou
9161dc73b5
Translation for "or"
2012-05-10 00:27:12 +08:00
Christophe Vilayphiou
13587306bc
Add list widgets for announcement, news and links with categories and tags
2012-05-10 00:25:30 +08:00
Christophe Vilayphiou
ecd21338bc
Matt's changes for side_bar
2012-05-10 00:23:42 +08:00
Christophe Vilayphiou
dc9af65524
Merge branch 'design_team' into ldap
2012-05-09 15:25:16 +08:00
Christophe Vilayphiou
038378be9a
Ray's changes for inccu in orbit_bar
2012-05-09 15:20:09 +08:00
Christophe Vilayphiou
9d01f624da
Merge branches 'nccu_0509' and 'design_team' into ldap
2012-05-09 14:21:24 +08:00
Matthew K. Fu JuYuan
6c9944918a
Fix i18 variable
2012-05-09 14:18:52 +08:00
Matthew K. Fu JuYuan
47bca643af
hidding new ad_banner
2012-05-09 14:17:20 +08:00
Christophe Vilayphiou
d88d4e58dc
Merge branch 'design_team' into ldap
...
Conflicts:
config/environments/development.rb
2012-05-09 13:51:00 +08:00
Christophe Vilayphiou
f9f7ddc8ee
Hide some links in side_bar for site_settings
2012-05-09 12:53:42 +08:00
Christophe Vilayphiou
44a485611a
Site_info and site_setting i18n
2012-05-09 12:29:46 +08:00
Christophe Vilayphiou
9216f29bc9
Ray's changes for mail settings
2012-05-09 12:19:32 +08:00
Christophe Vilayphiou
41c0c26330
Add mail_settings
2012-05-09 11:38:29 +08:00
Christophe Vilayphiou
b3be210ff7
Small adjustment for dashboard
2012-05-09 05:55:47 +08:00
Christophe Vilayphiou
2b03263fb7
Dashboard partial implementation
2012-05-09 05:53:07 +08:00
Christophe Vilayphiou
8d70d87120
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-09 04:13:14 +08:00
Christophe Vilayphiou
26a50cc862
Add sub_menu to children
2012-05-09 04:15:45 +08:00
Christophe Vilayphiou
a186ae08d8
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 21:47:03 +08:00
Christophe Vilayphiou
18c42a80a6
Put site_settings in the orbit_button
2012-05-08 20:06:56 +08:00
Christophe Vilayphiou
5c7cf1aef2
Add sub_menu to site_info
2012-05-08 17:27:02 +08:00
Christophe Vilayphiou
d2e07f537a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 17:24:40 +08:00
Christophe Vilayphiou
a3868cb785
Ray's changes for front-end banner
2012-05-08 17:21:26 +08:00
Christophe Vilayphiou
caba8ce7a4
Add nccu icon
...
Change news list in front-end
Hide links and files in news and announcement front-end show when nothing
2012-05-08 15:27:43 +08:00
Christophe Vilayphiou
2b9190a49e
Merge branch 'design_team' into ldap
...
Conflicts:
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-05-08 11:40:38 +08:00
Christophe Vilayphiou
ba4385e3fd
Add module authorization for news
...
Add files and links to announcement and news
Change page.children into page.ordered_and_visible_children in parser_commom
2012-05-08 10:50:09 +08:00
Harry Bomrah
2083e0bf4f
widget structure improvised…
2012-05-07 19:00:50 +08:00
Christophe Vilayphiou
469f5c8267
Add always_display checkbox for title in site_info independent of i18n
2012-05-07 16:29:32 +08:00
Christophe Vilayphiou
9a5e7cc8fa
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/views/admin/sites/site_info.html.erb
2012-05-07 16:08:05 +08:00
Christophe Vilayphiou
f534e6ca7b
Ray's changes for site_info
2012-05-07 15:55:45 +08:00
Christophe Vilayphiou
8a3f0b9bdc
Add menu_enabled_for: the page can be shown even if there's no link in the menu
2012-05-07 15:47:14 +08:00
Christophe Vilayphiou
8b61314cc4
Add i18n for site_info.
...
Add always display site title.
Changes for menu in front-end
2012-05-07 15:11:43 +08:00
Christophe Vilayphiou
0246341aef
Add footer to site_info
2012-05-07 11:25:33 +08:00
Christophe Vilayphiou
1fb6c20b86
Add site_info
2012-05-07 00:54:18 +08:00
Christophe Vilayphiou
48f8fbde7f
Fix site_locale_default_head and active for current locale
2012-05-07 00:53:52 +08:00
Christophe Vilayphiou
51f87e7212
Add missing translation for enabled_for
2012-05-06 03:36:01 +08:00
Christophe Vilayphiou
ce1fecaf93
Add position ordering and hiding page for i18n
2012-05-06 00:35:13 +08:00
Christophe Vilayphiou
f190ce18ee
Put sorting in web_link, page_context and design
2012-05-05 21:20:20 +08:00
Harry Bomrah
fcc875bb5d
app store page added… and few other changes..
2012-05-04 20:28:12 +08:00
Christophe Vilayphiou
555aa088d9
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-04 19:23:45 +08:00
Christophe Vilayphiou
e0a191162d
Ray's changes
2012-05-04 19:11:28 +08:00
Matthew K. Fu JuYuan
453cb21066
Announcement preivew
2012-05-04 15:50:45 +08:00
Matthew K. Fu JuYuan
f6307abfbf
fix broken ad_banner
2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan
bff3cefbc7
Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager.
2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan
f427c3803f
clean up useless flash msgs. add i18n vars for app auth and object auth
2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan
05ded8de03
Fix for NCCU 0430 all functions ok with two submanagers but different behavors
2012-05-04 15:38:18 +08:00
Harry Bomrah
3ad11f2098
View functionality, changed controller, journal and pages collections
2012-05-03 21:38:03 +08:00
Harry Bomrah
a3a1e4b92e
controller change, views working and db for paper and journals
2012-05-03 21:30:12 +08:00
devin
aeaf2f05d1
Start Add Page - no function
2012-05-03 17:59:07 +08:00
Harry Bomrah
1fce99c96f
Merge branch 'desktop_harry' into desktop_devin
2012-05-03 14:42:07 +08:00
Harry Bomrah
d6cbbff9de
connection page working now..
2012-05-03 14:40:54 +08:00
devin
b87cf0e2ff
list page
2012-05-03 14:39:22 +08:00
devin
887bda1491
lots of change
2012-05-02 17:04:16 +08:00
Christophe Vilayphiou
b8cd7097b0
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-02 16:27:09 +08:00
Christophe Vilayphiou
2762c24593
Fix wrong variable names in translations
2012-05-02 16:22:06 +08:00
Christophe Vilayphiou
92a53c1b27
Ray's fix
2012-05-02 16:20:59 +08:00
devin
bfc4507696
Connection page design
2012-05-01 18:05:17 +08:00
Harry Bomrah
769a67f026
the group more structured and also demo connecting with gmail account..
2012-04-30 21:17:20 +08:00
Harry Bomrah
1b7fb106f8
lot of updates
2012-04-30 14:33:12 +08:00
Harry Bomrah
aacd9da9fb
auto login encryption done…
2012-04-30 14:29:42 +08:00
Christophe Vilayphiou
767e4a3fe9
Merge branch 'design_team' into ldap
2012-04-30 08:16:17 +08:00
Christophe Vilayphiou
496b8de58a
Side bar translation
2012-04-30 08:15:45 +08:00
Christophe Vilayphiou
20504b2205
Merge branch 'design_team' into ldap
...
Conflicts:
app/controllers/admin/page_parts_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
2012-04-30 07:57:20 +08:00
Christophe Vilayphiou
b8f52fa1ec
Separate announcement and news
2012-04-30 06:31:46 +08:00
Matthew K. Fu JuYuan
a46a8898d7
Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
2012-04-30 00:24:11 +08:00
Matthew K. Fu JuYuan
9d97b7c008
Change for the notice msg at login page
2012-04-30 00:24:10 +08:00
Christophe Vilayphiou
851dc72f42
Ray's changes in css and html
2012-04-30 00:17:18 +08:00
Christophe Vilayphiou
2362e1cfdd
Merge branch 'design_team' into ldap
2012-04-27 15:28:32 +08:00
Christophe Vilayphiou
799fd1e3ac
Fix css bugs (opacity=) and changes in sign_in page
2012-04-27 15:27:59 +08:00
Christophe Vilayphiou
feb2156fd3
Fix error in side_bar for web_links
2012-04-27 14:15:36 +08:00
devin
2ebba577eb
journal start
2012-04-27 14:04:11 +08:00
Christophe Vilayphiou
3beb035101
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-27 11:11:56 +08:00
Christophe Vilayphiou
5aca3db95f
Ray's changes for structure and web_links
2012-04-27 11:02:56 +08:00
Harry Bomrah
c158375d02
with connection and some save settings…
2012-04-26 21:30:13 +08:00
Christophe Vilayphiou
7d6b82d9dd
Merge branch 'ad_banner' into ldap
2012-04-26 17:15:44 +08:00
Matthew K. Fu JuYuan
4af2068c1f
Fix ad_banner sec and msec
2012-04-26 17:11:06 +08:00
Matthew K. Fu JuYuan
faace9893a
dehumanize ad banner
2012-04-26 17:11:05 +08:00
Matthew K. Fu JuYuan
9a5ce5f512
Remove unless sidebar links.
2012-04-26 17:11:05 +08:00
Christophe Vilayphiou
3d293f6419
Fix for quick edit file and link in announcement
...
Change submit_button into ajax_for_submit
2012-04-26 16:42:28 +08:00
Harry Bomrah
64be61d61b
with gmail widget..
2012-04-26 14:47:49 +08:00
Christophe Vilayphiou
6bf4c60d45
Changes for js and ccs load for site's pages
2012-04-26 01:49:02 +08:00
Christophe Vilayphiou
6f1eb97ace
Fix for structure js and css
2012-04-25 18:41:38 +08:00
Christophe Vilayphiou
58d52c60d3
Fix for structure: restore js and change manifests
2012-04-25 18:17:58 +08:00
Christophe Vilayphiou
1f4fe65430
Merge branch 'design_team' into ldap
...
Conflicts:
app/views/devise/sessions/new.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
2012-04-25 16:45:04 +08:00
Christophe Vilayphiou
876036dd20
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/views/admin/ad_banners/_ad_banner_tab.html.erb
2012-04-25 16:39:26 +08:00
Christophe Vilayphiou
44ded537b3
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-25 16:28:34 +08:00
Christophe Vilayphiou
65a6f9c416
Ray's css fix for quick edit
2012-04-25 16:26:27 +08:00
Matthew K. Fu JuYuan
a3a109fb8b
Remove JS debug msg.
2012-04-25 16:10:11 +08:00
Matthew K. Fu JuYuan
7f285f4719
Change ad_banner preview from using title to id
2012-04-25 16:10:11 +08:00
Matthew K. Fu JuYuan
72921d6dfd
fix useless notice at login
2012-04-25 16:10:11 +08:00
Christophe Vilayphiou
8adb9c6878
Merge branch 'design_team' into ldap
2012-04-25 15:10:50 +08:00
Christophe Vilayphiou
3ec8bb7be6
Fix assets bug: when having a '.' in the name, the extension must be specified
2012-04-25 15:10:28 +08:00
Christophe Vilayphiou
8f242e2d39
Merge branch 'design_team' into ldap
2012-04-24 17:00:51 +08:00
Christophe Vilayphiou
3308744396
Fix side_bar after Matt's changes in translation
2012-04-24 17:00:33 +08:00
Christophe Vilayphiou
0c4f1d91f7
Merge branch 'ad_banner' into ldap
2012-04-24 16:46:04 +08:00
Harry Bomrah
a298cbd5f6
Publication started
2012-04-24 16:45:26 +08:00
Matthew K. Fu JuYuan
db46803cda
R4-Billingual
2012-04-24 16:43:45 +08:00
Christophe Vilayphiou
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
Matthew K. Fu JuYuan
33640de184
Changes for Billingual
2012-04-24 14:37:06 +08:00
Matthew K. Fu JuYuan
e7bb9ea86b
Fix ad image date selector
2012-04-24 14:37:06 +08:00
Matthew K. Fu JuYuan
c57ba305e9
Fix ad_banner
2012-04-24 14:37:06 +08:00
Christophe Vilayphiou
c856b4cdce
Fix for upload image component in announcement
2012-04-24 12:41:28 +08:00
Christophe Vilayphiou
42aeaead93
Ray's changes, put the js for upload image component in a separate file
2012-04-24 12:15:32 +08:00
Christophe Vilayphiou
b80339d704
Ray's changes for image upload component and sign-in page
2012-04-24 11:35:50 +08:00
Christophe Vilayphiou
308cfc7cf2
Merge branch 'design_team' into ldap
...
Conflicts:
app/views/devise/sessions/new.html.erb
2012-04-24 02:46:06 +08:00
Christophe Vilayphiou
6831a3dbbb
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-24 02:44:39 +08:00
Christophe Vilayphiou
0c4328987a
Ray's changes for css files, sort headers in announcement and pagination
2012-04-24 02:37:51 +08:00
Christophe Vilayphiou
d4aea664e2
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
2012-04-24 02:37:03 +08:00
Christophe Vilayphiou
a5b13e680f
Add sub_menu in r_tags
2012-04-24 02:30:40 +08:00
Harry Bomrah
670ec2a40e
Themes from db fixed..
2012-04-23 21:04:02 +08:00
Christophe Vilayphiou
834cbe3a11
Fix side_bar for tags
...
Modules needs to use the fullpath for active or visible in tags
2012-04-23 16:12:07 +08:00
unknown
3280ff8311
archive checkbox
2012-04-23 15:53:58 +08:00
Christophe Vilayphiou
2eeb530422
Merge branch 'master' into ldap
...
Conflicts:
app/assets/stylesheets/new_admin.css.erb
2012-04-23 14:13:37 +08:00
Matthew K. Fu JuYuan
67ba2389a2
fix js
2012-04-23 14:07:14 +08:00
Matthew K. Fu JuYuan
8eedbc951e
add i18n vars
2012-04-23 14:07:14 +08:00
Matthew K. Fu JuYuan
0c46b4da23
AdImage and AnBanner JS fixed
2012-04-23 14:07:13 +08:00
Matthew K. Fu JuYuan
81b0046f42
Preview now can be use at both ad_banner and ad_image,however it won't run correctly if user change its ad_banner at ad_image.
2012-04-23 14:07:13 +08:00
Matthew K. Fu JuYuan
e353afb5ac
fix i18n vars in ad_banner
2012-04-23 14:07:13 +08:00
Matthew K. Fu JuYuan
1b70852ff7
realtime preview is working. but save to object when preview
2012-04-23 14:06:37 +08:00
Matthew K. Fu JuYuan
30edc317b2
text area for ad_image
2012-04-23 14:06:36 +08:00
Matthew K. Fu JuYuan
ff472714de
AdBanner i18n vars patch
2012-04-23 14:05:18 +08:00
Christophe Vilayphiou
2f279c53ff
Apply patch from ldap
2012-04-23 14:04:55 +08:00
Matt
b6f64cd8a5
Announcement i18n vars
2012-04-23 11:29:00 +08:00
nccu
fe9032787c
NCCU ldap debug
2012-04-23 10:13:44 +08:00
Harry Bomrah
8c42f6bb7c
Merge branch 'desktop_harry' into desktop_devin
2012-04-20 14:44:57 +08:00
devin
19750d69e0
some update
2012-04-20 05:38:53 +08:00
Harry Bomrah
3eaf97babe
title and heading and welcome msg…
2012-04-19 20:26:21 +08:00
Matthew K. Fu JuYuan
ba0677a001
Merge commit '72efdbd742d4f3ac8a910bd5c817cf5c74570ba5' into ldap
2012-04-19 14:09:37 +08:00
Matthew K. Fu JuYuan
f55b3a4374
Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap
...
Conflicts:
Gemfile
Gemfile.lock
app/views/admin/attributes/_app_selector.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/pages/_app_selector.html.erb
config/application.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-04-19 14:06:00 +08:00
Christophe Vilayphiou
72efdbd742
changes before Chirs and Ray's trip
2012-04-19 11:50:54 +08:00
Harry Bomrah
4bad25e682
Msg box added and background image saving complete
2012-04-18 22:01:12 +08:00
Harry Bomrah
11a0875c44
color changes in custom color…
2012-04-18 17:57:47 +08:00
devin
b743413be9
function update
2012-04-18 13:17:12 +08:00
Harry Bomrah
7b391904f7
Merge branch 'desktop_devin' of https://github.com/Rulingcom/orbit into desktop_devin
2012-04-17 21:20:36 +08:00
Harry Bomrah
95a1e266ae
Custom thème done and theme id done…
2012-04-17 21:15:40 +08:00
devin
1f44a10206
wallpaper added
2012-04-17 18:06:07 +08:00
devin
8cd4844689
html change
2012-04-17 16:32:11 +08:00
Matthew K. Fu JuYuan
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
Matthew K. Fu JuYuan
4af73ecf6f
fix preview window size.
2012-04-13 16:46:16 +08:00
Matthew K. Fu JuYuan
0fe5baf93f
fix for letting ad_banner display even when file in not uploaded
2012-04-13 16:14:43 +08:00
Christophe Vilayphiou
957d4eaebb
Merge branch 'master' into desktop_harry
2012-04-13 16:03:43 +08:00
Christophe Vilayphiou
ebf9a896aa
Merge branches 'dashboard' and 'dashboard' of github.com:Rulingcom/orbit into dashboard
2012-04-13 15:57:42 +08:00
unknown
31baa2cb63
new archive
2012-04-13 15:57:15 +08:00
Christophe Vilayphiou
ca0fc4c767
Comment out code that bugged upload image in ad_banner
2012-04-13 15:53:25 +08:00
Christophe Vilayphiou
d1feb102d0
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
2012-04-13 15:27:10 +08:00
Matthew K. Fu JuYuan
d646a9dff1
fix new ad_image data selector bug
2012-04-13 15:24:59 +08:00
unknown
0bcb74d793
new archive
2012-04-13 15:24:19 +08:00
Christophe Vilayphiou
8167172ca9
Merge branch 'master' into desktop_harry
2012-04-13 14:05:08 +08:00
Matthew K. Fu JuYuan
de035cb89a
fix date selector value fill back problem
2012-04-13 13:52:01 +08:00
Christophe Vilayphiou
f54dba8b0b
Merge branch 'master' into desktop_harry
2012-04-13 13:39:00 +08:00
Matthew K. Fu JuYuan
1e43349eb8
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
2012-04-13 12:48:57 +08:00
Matthew K. Fu JuYuan
fe59446c16
fix date selector value fill back problem
2012-04-13 12:47:57 +08:00
Harry Bomrah
64a9579b92
final on 13 april 00:00
2012-04-13 00:00:24 +08:00
Harry Bomrah
193cee2df7
new icons and widgets
2012-04-12 22:18:58 +08:00
Christophe Vilayphiou
6728c35023
Fix side_bar.
...
In the case of tags, take the uri instead of controller name
2012-04-12 18:14:00 +08:00
Christophe Vilayphiou
015c0cb452
Delete useless code in items
2012-04-12 18:13:10 +08:00
Harry Bomrah
01af32aa60
added divs with id
2012-04-12 16:52:32 +08:00
Harry Bomrah
92427e8831
section page done…
2012-04-12 16:25:06 +08:00
Harry Bomrah
7b423877bf
new updates
2012-04-12 14:50:45 +08:00
Harry Bomrah
48323ac1af
lot of changes in fetching
2012-04-12 14:44:08 +08:00
devin
67d1f7ad08
lots of change
2012-04-12 14:19:53 +08:00
Matthew K. Fu JuYuan
b54578ce1e
ad banner preview
2012-04-12 07:14:06 +08:00
Harry Bomrah
25ca29403c
section page added
2012-04-11 17:58:52 +08:00
Harry Bomrah
5a6541a592
Setting page update
2012-04-11 17:26:25 +08:00
Harry Bomrah
68803c0c97
Lets see
2012-04-11 15:36:32 +08:00
Harry Bomrah
edf6089e0c
Devin complete
2012-04-11 15:34:19 +08:00
Harry Bomrah
4875b339f8
Fetching desktop from db
2012-04-11 15:31:10 +08:00
devin
0219c3df28
various update
2012-04-11 15:04:00 +08:00
devin
42f45aa137
theme setting update
2012-04-11 13:46:32 +08:00
devin
ee85380ab2
little update
2012-04-10 18:09:29 +08:00
devin
360e5228b7
custom theme settings
2012-04-10 17:44:36 +08:00
devin
6006f1b3c6
start editing setting page
...
some relevant stuff updated
2012-04-10 01:06:29 +08:00
Harry Bomrah
695c1dee58
Merge branch 'desktop_devin' of https://github.com/Rulingcom/orbit into desktop_devin
2012-04-09 17:55:17 +08:00
Harry Bomrah
32a1be624b
Fully updated..
2012-04-09 17:55:03 +08:00
devin
9dde708c01
app manager page update
2012-04-09 17:13:24 +08:00
Matthew K. Fu JuYuan
d2e77d6bf8
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
2012-04-09 12:45:27 +08:00
Matthew K. Fu JuYuan
d2a3a4d26e
ad banner preview
2012-04-09 12:44:08 +08:00
Christophe Vilayphiou
e1ef109b8b
Fix bug: Snake -> snake
2012-04-07 01:33:36 +08:00
Harry Bomrah
35567c2139
Widgets Loading dynamically and semi structured
2012-04-06 23:48:03 +08:00
Christophe Vilayphiou
f65bb9b323
Merge branch 'master' into desktop_harry
...
Conflicts:
app/assets/stylesheets/style.css.erb
2012-04-06 19:02:39 +08:00
Christophe Vilayphiou
253f4bcb54
Ray's changes for orbit bar
2012-04-06 18:06:57 +08:00
Harry Bomrah
7309d9c446
Dock change and getting values from db
2012-04-06 17:49:22 +08:00
devin
cd3e04c55c
add tinyscrollbar
2012-04-06 17:47:04 +08:00
devin
293e084bea
dock effect
2012-04-06 17:47:04 +08:00
unknown
79f005c88e
new icons
2012-04-06 17:47:03 +08:00
Harry Bomrah
ddf6a606a2
with notifications and other changes
2012-04-06 17:47:03 +08:00
Harry Bomrah
6158799a47
Stupid theme
2012-04-06 17:47:03 +08:00
Harry Bomrah
77b2919d8c
Desktop Commit
2012-04-06 17:47:02 +08:00
devin
74f083b226
details changed
...
orbitdesktop.js, orbitdesktopAPI.js update!
2012-04-06 04:42:20 +08:00
Harry Bomrah
39e1bc8948
new setting page
2012-04-05 20:09:11 +08:00
Christophe Vilayphiou
ad740b0daf
Missing end tag in side_bar
2012-04-05 18:13:52 +08:00
Christophe Vilayphiou
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
Christophe Vilayphiou
1259d62249
Fix mainTablePosition in js -> remove the notable class
2012-04-05 14:55:41 +08:00
Christophe Vilayphiou
cedd782e7f
Sidebar fix for ad_banner
2012-04-05 13:55:03 +08:00
Matthew K. Fu JuYuan
d8b20ae993
fix ad_banner sidebar
2012-04-05 11:11:48 +08:00
devin
a7d84e8583
add tinyscrollbar
2012-04-05 02:31:32 +08:00
devin
c4b9a9e275
dock effect
2012-04-04 05:53:49 +08:00
unknown
11d3906951
new icons
2012-04-03 18:06:16 +08:00
Matthew K. Fu JuYuan
a9988a0d5c
Change for interface,form.
2012-04-02 11:00:51 +08:00
Matthew K. Fu JuYuan
8f28d45379
The new AdBanner.
2012-04-02 03:04:38 +08:00
Matthew K. Fu JuYuan
b17cd7570f
changing to new admin_layout
2012-04-02 02:58:02 +08:00
Matthew K. Fu JuYuan
928c642840
change layout from old admin to new_admin. not complete code
2012-04-02 02:58:01 +08:00
Christophe Vilayphiou
503f71e554
Ray's changes in tags, css and js
2012-04-02 02:55:36 +08:00
Christophe Vilayphiou
32b7d95669
Fix parser_back_end & side_bar & meta
2012-03-30 15:51:29 +08:00
Harry Bomrah
aa3997f7cf
with notifications and other changes
2012-03-29 19:50:23 +08:00
Harry Bomrah
176597f5af
Stupid theme
2012-03-29 15:23:48 +08:00
Harry Bomrah
2e283a039d
Desktop Commit
2012-03-28 18:53:30 +08:00
Christophe Vilayphiou
d02bbdbaa5
Nokogiri in parsers
2012-03-27 18:58:04 +08:00
Matt Fu
3ba89ecbcf
Fact check program completed,Lin checked
2012-03-27 18:54:03 +08:00
Christophe Vilayphiou
f5fd3dec7a
Trying nokogiri
2012-03-27 18:42:22 +08:00
Christophe Vilayphiou
472744fc87
Changes for IE9 with html5
2012-03-21 15:51:55 +08:00
Christophe Vilayphiou
7cc075e124
Change the monkey picture
2012-03-19 15:49:40 +08:00
Christophe Vilayphiou
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
unknown
6f6e84b015
fix dashboard & announcement
2012-03-16 14:44:57 +08:00
Matt Fu
13b6892f87
code for new fact check
2012-03-16 11:09:44 +08:00
unknown
00ab773942
fix dashboard & announcement
2012-03-14 20:05:03 +08:00
Matt Fu
d5a2de5476
LDAP with sync rake task
2012-03-06 16:41:06 +08:00
Matt Fu
7f05f21930
Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
...
Conflicts:
config/environments/development.rb
2012-03-01 10:13:49 +08:00
Matt Fu
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
Matthew Kaito Juyuan Fu
8932615f05
add "all_user" for app&object auth
2012-02-29 18:56:42 +08:00
Matthew Kaito Juyuan Fu
2e58c63ff7
fix bugs with token
2012-02-29 18:56:42 +08:00
Matthew Kaito Juyuan Fu
cc550c5745
First version for App and Object auth.Taking Announcement as experiment
2012-02-29 18:55:55 +08:00
Matthew Kaito Juyuan Fu
3bcd7ea349
Exp with object_auth
2012-02-29 18:50:23 +08:00
Christophe Vilayphiou
6b2aeadde6
Changes for nccu
2012-02-29 16:01:50 +08:00
Matt Fu
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
Matt Fu
ccb61fc2dd
change Search bar
2012-02-29 11:29:13 +08:00
Christophe Vilayphiou
0fa5c3ba9d
Fix bug in orbit-bar
2012-02-29 04:56:52 +08:00
Christophe Vilayphiou
344ec86c57
Remove class 'error' in devise forms
2012-02-29 04:56:32 +08:00
Christophe Vilayphiou
4b7b57bb3d
Add some missing translations
2012-02-29 04:48:21 +08:00
Christophe Vilayphiou
9aa4173933
Change orbit-bar for language but bug when user name is too long
2012-02-29 04:21:56 +08:00
Christophe Vilayphiou
18617850e5
Add categories for all the widgets
2012-02-28 22:00:05 +08:00
Christophe Vilayphiou
6a30b0a1e4
Add RSS event
2012-02-28 18:29:13 +08:00
Christophe Vilayphiou
fdf4cfad2d
Add category for announcement widget
2012-02-28 14:08:57 +08:00
Christophe Vilayphiou
f13ebc6c46
Fix bugs and changes for nccu
2012-02-27 18:50:56 +08:00
Christophe Vilayphiou
f8d1d7242d
Merge branch 'design_team' into dashboard
2012-02-23 16:05:33 +08:00
Christophe Vilayphiou
1a6e497b3d
Ika's changes
2012-02-23 15:53:15 +08:00
Christophe Vilayphiou
63d7810b35
Add isotope, categories for announcement page, sort for announcement
2012-02-23 15:52:58 +08:00
Christophe Vilayphiou
53ed4b0404
Initial changes in announcement for sorting and filtering
2012-02-23 15:51:33 +08:00
Christophe Vilayphiou
22d9741ac8
Fix for orbit_bar
2012-02-23 15:51:33 +08:00
Christophe Vilayphiou
ba4d71a026
Changes in orbit_bar and js in announcements
2012-02-23 15:51:33 +08:00
Matt Fu
678f1eabef
LDAP connection and modified Devise
2012-02-22 14:43:24 +08:00
Christophe Vilayphiou
1146506063
Fix bug when no bulletins or web_links
2012-02-20 15:56:17 +08:00
Christophe Vilayphiou
a3f152b200
Changes for jquery 1.7 (.live -> .on), create module_layout
2012-02-20 03:24:05 +08:00
Christophe Vilayphiou
3ff2e7867e
Fix bug when editing home
2012-02-20 03:22:53 +08:00
Christophe Vilayphiou
44a346ffe9
Changes for orbit bar, login
2012-02-19 16:33:22 +08:00
Christophe Vilayphiou
0b71714d44
Improve code in items, pages, links
2012-02-17 14:54:11 +08:00
Christophe Vilayphiou
4389f0cf28
Add new created files to previous commit
2012-02-16 13:09:09 +08:00
Christophe Vilayphiou
e0accbecaa
Changes into page_part edition.
...
Can choose between 'text', 'public_r_tag' and 'widget'
2012-02-16 13:09:09 +08:00
Christophe Vilayphiou
d0c2856a3a
Fix relations error in tags
2012-02-15 11:42:19 +08:00
Christophe Vilayphiou
3e70634add
Announcement modifications and tags
2012-02-15 00:34:22 +08:00
Christophe Vilayphiou
1f7dae9bee
Gemfile and bugs in js for orbit-bar
2012-02-15 00:34:22 +08:00
Christophe Vilayphiou
55ae7de01c
Orbit-bar in front-end and back-end, side-bar and drop-down menu
2012-02-15 00:34:22 +08:00
Matthew Kaito Juyuan Fu
dcc6a53430
brief starting for dashboard,adds i18n vars
2012-02-15 00:34:21 +08:00
Matthew Kaito Juyuan Fu
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
Matthew Kaito Juyuan Fu
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
Matthew Kaito Juyuan Fu
3ed9b81df9
first commit for object auth,will take new_blog for experiment
2012-02-15 00:34:21 +08:00
Matthew Kaito Juyuan Fu
8b3b71ca58
fix js bugs,partial bugs
2012-02-06 16:17:07 +08:00
Matthew Kaito Juyuan Fu
394099c388
Ad banner close complete,need validation
2012-02-04 09:37:23 +08:00
Matthew Kaito Juyuan Fu
68cea1ea49
AdBanner is now working
2012-02-04 09:37:23 +08:00
Matthew Kaito Juyuan Fu
f530eb7112
Revert "mistake commit"
...
This reverts commit 2608b72d65
.
2012-02-03 14:39:15 +08:00
Matthew Kaito Juyuan Fu
2608b72d65
mistake commit
2012-02-03 14:28:08 +08:00
Matthew Kaito Juyuan Fu
a980847eb3
Basic function for AdBanner
2012-02-01 14:27:51 +08:00
Christophe Vilayphiou
46db173e0b
Modifications in the Design code: the uploader works but the edit is broken
2012-01-26 12:05:25 +08:00
Matthew Fu
afbb9e266a
User role and sub_role simple interface complete
2012-01-24 12:28:33 +08:00
Matthew Fu
4ed8a2164c
First complete with manager and submanager
2012-01-24 12:28:32 +08:00
Matthew Fu
18a82d7f47
Manger and SubManager
2012-01-24 12:28:32 +08:00
Christophe Vilayphiou
9fcf8280fa
Change "_filename" to "_identifier" for carrierwave
2012-01-24 11:57:27 +08:00
Christophe Vilayphiou
5518ae362d
Ray's modification before redesign
2012-01-24 11:57:27 +08:00
chris2tof
1bbb197fba
Forgot to remove ":remote => true" for asset new
2012-01-24 11:56:08 +08:00
chris2tof
b04d845a5a
New rss.js from Harry and fix html form for assets
2012-01-24 11:56:08 +08:00
chris2tof
4be97f6ea6
Merge branch 'fix_it'
...
Conflicts:
app/assets/javascripts/page_edit.js
app/assets/javascripts/rss.js
app/assets/stylesheets/admin.css.erb
app/assets/stylesheets/admin_back_end.css.erb
app/controllers/admin/app_auths_controller.rb
app/controllers/admin/module_apps_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/application_controller.rb
app/models/app_auth.rb
app/models/user/user.rb
app/views/admin/app_auths/index.html.erb
app/views/admin/attributes/_attribute_field.html.erb
app/views/admin/designs/_new.html.erb
app/views/admin/designs/new.html.erb
app/views/admin/infos/_form.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/module_apps/index.html.erb
app/views/admin/pages/_form.html.erb
app/views/admin/roles/_form.html.erb
app/views/admin/roles/_sub_role.html.erb
app/views/admin/users/_form.html.erb
app/views/admin/users/_show_sub_role.html.erb
app/views/admin/users/_sub_role.html.erb
app/views/admin/users/edit.html.erb
app/views/admin/users/index.html.erb
app/views/admin/users/new.html.erb
app/views/admin/users/show.html.erb
app/views/layouts/admin.html.erb
lib/fraisier/layout.html
lib/parsers/parser_back_end.rb
lib/parsers/parser_layout.rb
lib/tasks/dev.rake
spec/models/app_auth_basic.rb
vendor/built_in_modules/NewBlog/.gitignore
vendor/built_in_modules/NewBlog/Gemfile
vendor/built_in_modules/NewBlog/Gemfile.lock
vendor/built_in_modules/NewBlog/MIT-LICENSE
vendor/built_in_modules/NewBlog/NewBlog.gemspec
vendor/built_in_modules/NewBlog/README.rdoc
vendor/built_in_modules/NewBlog/Rakefile
vendor/built_in_modules/NewBlog/app/assets/images/NewBlog/.gitkeep
vendor/built_in_modules/NewBlog/app/assets/javascripts/NewBlog/.gitkeep
vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep
vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/application.css
vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/production.css
vendor/built_in_modules/NewBlog/app/controllers/.gitkeep
vendor/built_in_modules/NewBlog/app/controllers/application_controller.rb
vendor/built_in_modules/NewBlog/app/controllers/panel/blog/back_end/posts_controller.rb
vendor/built_in_modules/NewBlog/app/helpers/.gitkeep
vendor/built_in_modules/NewBlog/app/helpers/application_helper.rb
vendor/built_in_modules/NewBlog/app/mailers/.gitkeep
vendor/built_in_modules/NewBlog/app/models/.gitkeep
vendor/built_in_modules/NewBlog/app/models/comment.rb
vendor/built_in_modules/NewBlog/app/models/post.rb
vendor/built_in_modules/NewBlog/app/views/.gitkeep
vendor/built_in_modules/NewBlog/app/views/layouts/application.html.erb
vendor/built_in_modules/NewBlog/app/views/layouts/edit_view.html.erb
vendor/built_in_modules/NewBlog/app/views/layouts/production.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/_form.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/index.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/latest_post.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/new.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/show.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/front_end/posts/show.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/index.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/latest_post.html.erb
vendor/built_in_modules/NewBlog/config/locales/en.yml
vendor/built_in_modules/NewBlog/lib/NewBlog.rb
vendor/built_in_modules/NewBlog/lib/NewBlog/engine.rb
vendor/built_in_modules/NewBlog/lib/NewBlog/version.rb
vendor/built_in_modules/NewBlog/lib/tasks/NewBlog_tasks.rake
vendor/built_in_modules/NewBlog/script/rails
vendor/built_in_modules/NewBlog/test/NewBlog_test.rb
vendor/built_in_modules/NewBlog/test/dummy/Rakefile
vendor/built_in_modules/NewBlog/test/dummy/app/assets/javascripts/application.js
vendor/built_in_modules/NewBlog/test/dummy/app/assets/stylesheets/application.css
vendor/built_in_modules/NewBlog/test/dummy/app/controllers/application_controller.rb
vendor/built_in_modules/NewBlog/test/dummy/app/helpers/application_helper.rb
vendor/built_in_modules/NewBlog/test/dummy/app/mailers/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/app/models/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/app/views/layouts/application.html.erb
vendor/built_in_modules/NewBlog/test/dummy/config.ru
vendor/built_in_modules/NewBlog/test/dummy/config/application.rb
vendor/built_in_modules/NewBlog/test/dummy/config/boot.rb
vendor/built_in_modules/NewBlog/test/dummy/config/database.yml
vendor/built_in_modules/NewBlog/test/dummy/config/environment.rb
vendor/built_in_modules/NewBlog/test/dummy/config/environments/development.rb
vendor/built_in_modules/NewBlog/test/dummy/config/environments/production.rb
vendor/built_in_modules/NewBlog/test/dummy/config/environments/test.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/backtrace_silencers.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/inflections.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/mime_types.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/secret_token.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/session_store.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/wrap_parameters.rb
vendor/built_in_modules/NewBlog/test/dummy/config/locales/en.yml
vendor/built_in_modules/NewBlog/test/dummy/config/mongoid.yml
vendor/built_in_modules/NewBlog/test/dummy/config/routes.rb
vendor/built_in_modules/NewBlog/test/dummy/lib/assets/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/log/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/public/404.html
vendor/built_in_modules/NewBlog/test/dummy/public/422.html
vendor/built_in_modules/NewBlog/test/dummy/public/500.html
vendor/built_in_modules/NewBlog/test/dummy/public/favicon.ico
vendor/built_in_modules/NewBlog/test/dummy/script/rails
vendor/built_in_modules/NewBlog/test/integration/navigation_test.rb
vendor/built_in_modules/NewBlog/test/test_helper.rb
vendor/built_in_modules/blog/app/controllers/application_controller.rb
vendor/built_in_modules/blog/app/controllers/panel/blog/posts_controller.rb
vendor/built_in_modules/blog/app/helpers/application_helper.rb
vendor/built_in_modules/blog/app/models/comment.rb
vendor/built_in_modules/blog/app/models/post.rb
vendor/built_in_modules/blog/app/views/layouts/application.html.erb
vendor/built_in_modules/blog/app/views/panel/blog/posts/_form.html.erb
vendor/built_in_modules/blog/app/views/panel/blog/posts/index.html.erb
vendor/built_in_modules/blog/app/views/panel/blog/posts/show.html.erb
vendor/built_in_modules/blog/config/initializers/backtrace_silencers.rb
vendor/built_in_modules/blog/config/initializers/inflections.rb
vendor/built_in_modules/blog/config/initializers/mime_types.rb
vendor/built_in_modules/blog/public/404.html
vendor/built_in_modules/blog/public/422.html
vendor/built_in_modules/blog/public/500.html
vendor/built_in_modules/blog/public/favicon.ico
vendor/built_in_modules/blog/public/stylesheets/.gitkeep
vendor/built_in_modules/blog/script/rails
vendor/built_in_modules/blog/vendor/plugins/.gitkeep
vendor/built_in_modules/new_blog/.gitignore
vendor/built_in_modules/new_blog/Gemfile
vendor/built_in_modules/new_blog/Gemfile.lock
vendor/built_in_modules/new_blog/MIT-LICENSE
vendor/built_in_modules/new_blog/README.rdoc
vendor/built_in_modules/new_blog/Rakefile
vendor/built_in_modules/new_blog/app/assets/images/NewBlog/.gitkeep
vendor/built_in_modules/new_blog/app/assets/javascripts/NewBlog/.gitkeep
vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/.gitkeep
vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/application.css
vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/production.css
vendor/built_in_modules/new_blog/app/controllers/.gitkeep
vendor/built_in_modules/new_blog/app/controllers/application_controller.rb
vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/back_end/posts_controller.rb
vendor/built_in_modules/new_blog/app/helpers/.gitkeep
vendor/built_in_modules/new_blog/app/mailers/.gitkeep
vendor/built_in_modules/new_blog/app/models/.gitkeep
vendor/built_in_modules/new_blog/app/models/comment.rb
vendor/built_in_modules/new_blog/app/models/post.rb
vendor/built_in_modules/new_blog/app/views/.gitkeep
vendor/built_in_modules/new_blog/app/views/layouts/application.html.erb
vendor/built_in_modules/new_blog/app/views/layouts/edit_view.html.erb
vendor/built_in_modules/new_blog/app/views/layouts/production.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/_form.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/index.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/latest_post.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/new.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/show.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/show.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/index.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/latest_post.html.erb
vendor/built_in_modules/new_blog/config/locales/en.yml
vendor/built_in_modules/new_blog/lib/new_blog/version.rb
vendor/built_in_modules/new_blog/lib/tasks/NewBlog_tasks.rake
vendor/built_in_modules/new_blog/new_blog.gemspec
vendor/built_in_modules/new_blog/script/rails
vendor/built_in_modules/new_blog/test/NewBlog_test.rb
vendor/built_in_modules/new_blog/test/dummy/Rakefile
vendor/built_in_modules/new_blog/test/dummy/app/assets/javascripts/application.js
vendor/built_in_modules/new_blog/test/dummy/app/assets/stylesheets/application.css
vendor/built_in_modules/new_blog/test/dummy/app/controllers/application_controller.rb
vendor/built_in_modules/new_blog/test/dummy/app/helpers/application_helper.rb
vendor/built_in_modules/new_blog/test/dummy/app/mailers/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/app/models/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/app/views/layouts/application.html.erb
vendor/built_in_modules/new_blog/test/dummy/config.ru
vendor/built_in_modules/new_blog/test/dummy/config/application.rb
vendor/built_in_modules/new_blog/test/dummy/config/boot.rb
vendor/built_in_modules/new_blog/test/dummy/config/database.yml
vendor/built_in_modules/new_blog/test/dummy/config/environment.rb
vendor/built_in_modules/new_blog/test/dummy/config/environments/development.rb
vendor/built_in_modules/new_blog/test/dummy/config/environments/production.rb
vendor/built_in_modules/new_blog/test/dummy/config/environments/test.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/backtrace_silencers.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/inflections.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/mime_types.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/secret_token.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/session_store.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/wrap_parameters.rb
vendor/built_in_modules/new_blog/test/dummy/config/locales/en.yml
vendor/built_in_modules/new_blog/test/dummy/config/mongoid.yml
vendor/built_in_modules/new_blog/test/dummy/config/routes.rb
vendor/built_in_modules/new_blog/test/dummy/lib/assets/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/log/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/public/404.html
vendor/built_in_modules/new_blog/test/dummy/public/422.html
vendor/built_in_modules/new_blog/test/dummy/public/500.html
vendor/built_in_modules/new_blog/test/dummy/public/favicon.ico
vendor/built_in_modules/new_blog/test/dummy/script/rails
vendor/built_in_modules/new_blog/test/integration/navigation_test.rb
vendor/built_in_modules/new_blog/test/test_helper.rb
vendor/plugins/NewBlog/.gitignore
vendor/plugins/NewBlog/Gemfile
vendor/plugins/NewBlog/Gemfile.lock
vendor/plugins/NewBlog/MIT-LICENSE
vendor/plugins/NewBlog/NewBlog.gemspec
vendor/plugins/NewBlog/README.rdoc
vendor/plugins/NewBlog/Rakefile
vendor/plugins/NewBlog/app/assets/images/NewBlog/.gitkeep
vendor/plugins/NewBlog/app/assets/javascripts/NewBlog/.gitkeep
vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep
vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/application.css
vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css
vendor/plugins/NewBlog/app/controllers/.gitkeep
vendor/plugins/NewBlog/app/helpers/.gitkeep
vendor/plugins/NewBlog/app/mailers/.gitkeep
vendor/plugins/NewBlog/app/models/.gitkeep
vendor/plugins/NewBlog/app/views/.gitkeep
vendor/plugins/NewBlog/app/views/layouts/edit_view.html.erb
vendor/plugins/NewBlog/app/views/layouts/production.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/index.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/latest_post.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/new.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/show.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_index.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb
vendor/plugins/NewBlog/config/locales/en.yml
vendor/plugins/NewBlog/lib/NewBlog/version.rb
vendor/plugins/NewBlog/lib/tasks/NewBlog_tasks.rake
vendor/plugins/NewBlog/script/rails
vendor/plugins/NewBlog/test/NewBlog_test.rb
vendor/plugins/NewBlog/test/dummy/Rakefile
vendor/plugins/NewBlog/test/dummy/app/assets/javascripts/application.js
vendor/plugins/NewBlog/test/dummy/app/assets/stylesheets/application.css
vendor/plugins/NewBlog/test/dummy/app/controllers/application_controller.rb
vendor/plugins/NewBlog/test/dummy/app/mailers/.gitkeep
vendor/plugins/NewBlog/test/dummy/app/models/.gitkeep
vendor/plugins/NewBlog/test/dummy/app/views/layouts/application.html.erb
vendor/plugins/NewBlog/test/dummy/config.ru
vendor/plugins/NewBlog/test/dummy/config/application.rb
vendor/plugins/NewBlog/test/dummy/config/boot.rb
vendor/plugins/NewBlog/test/dummy/config/database.yml
vendor/plugins/NewBlog/test/dummy/config/environment.rb
vendor/plugins/NewBlog/test/dummy/config/environments/development.rb
vendor/plugins/NewBlog/test/dummy/config/environments/production.rb
vendor/plugins/NewBlog/test/dummy/config/environments/test.rb
vendor/plugins/NewBlog/test/dummy/config/initializers/secret_token.rb
vendor/plugins/NewBlog/test/dummy/config/initializers/session_store.rb
vendor/plugins/NewBlog/test/dummy/config/initializers/wrap_parameters.rb
vendor/plugins/NewBlog/test/dummy/config/locales/en.yml
vendor/plugins/NewBlog/test/dummy/config/mongoid.yml
vendor/plugins/NewBlog/test/dummy/config/routes.rb
vendor/plugins/NewBlog/test/integration/navigation_test.rb
vendor/plugins/NewBlog/test/test_helper.rb
2012-01-12 18:15:43 +08:00
Matthew Fu
c0efb5d1bc
Listing for Module-apps
2012-01-12 14:13:41 +08:00
Matthew Fu
79f778ad8c
creating for disabling widgets and frontend
2012-01-05 16:21:33 +08:00
Matthew Fu
7b40706aed
fixing for app_auth
2012-01-05 16:20:51 +08:00
chris2tof
7ebfe3a7f9
Add missing id in site_editor.html.erb and comment out in parser_back_end.rb because of a loading bug
2011-12-29 18:08:08 +08:00
chris2tof
d85f29e65c
Fix missing modification for "panel_main" to "back_main"
2011-12-29 17:49:48 +08:00
chris2tof
c1238a7043
Prefix ids with "back_" in back-end layout to avoid conflict with site's ids
2011-12-29 15:35:13 +08:00
chris2tof
ea19f11fe2
Integrate Harry's modifications to reload pop-up content
2011-12-29 14:09:06 +08:00
chris2tof
b002c411ce
Merge branch 'design_team'
2011-12-28 21:03:35 +08:00
Christophe Vilayphiou
75c9851dbc
Ray's back-end modifications for sub-roles
2011-12-28 20:57:18 +08:00
chris2tof
090493fd51
Re-commit
2011-12-28 20:51:52 +08:00
chris2tof
245def9cb6
Integration of pop-up and generic js.erb
2011-12-28 20:49:53 +08:00
chris2tof
62aaf79491
Merge with sub_roles
2011-12-23 18:34:21 +08:00
Christophe Vilayphiou
fc591ee308
Ray's back_end modification before sub_roles
2011-12-23 18:02:45 +08:00
Matthew Fu
d3ca1647be
fix page form bugs
2011-12-23 13:54:28 +08:00
chris2tof
d465febca7
merge with november_presentation
2011-12-22 15:43:38 +08:00
chris2tof
e7c9816139
Move NewBlog to built_in_modules and delete "vendor/templates"
2011-12-22 01:38:27 +08:00
chris2tof
a09f8e4551
merge with november_presentation
2011-12-20 16:47:17 +08:00
chris2tof
afbffe37d5
Users can now be saved with sub_roles
2011-12-20 14:35:28 +08:00
chris2tof
4108ebf06d
Fix mongoid deeply nested polimorphic
...
Got the commit from github. The roles and sub_roles save.
2011-12-19 21:22:26 +08:00
chris2tof
d27d7a623c
Changes for sub_roles
...
Issues: update doesn't create new i18n_variables, role form has bugs
2011-12-18 10:07:42 +08:00
chris2tof
d23cf152da
Merge 'standardization' and 'role structure modification'
2011-12-10 18:21:59 +08:00
chris2tof
b7ac5478b4
Change role structure
...
Still needs to: change the views and create sub_roles in the dev.rake
2011-12-10 18:12:39 +08:00
Christophe Vilayphiou
f774084e9a
Back-end standardization
2011-12-10 18:03:32 +08:00
chris2tof
e0cdedfa2e
Remove useless controller and view
...
user_attributes_controller and user_attributes views
2011-12-06 18:12:12 +08:00
chris2tof
26b49dcf02
Remove js from html
2011-12-05 10:36:25 +08:00
chris2tof
962bf03af2
Remove snippet
2011-12-05 10:27:22 +08:00
chris2tof
f3f405c1b4
Remove useless files in items
2011-12-05 09:56:26 +08:00
chris2tof
75a3c4d5b1
Modify assets
...
Each layout has a manifest for css and js
2011-12-05 09:54:41 +08:00
chris2tof
a0ec38ca99
Merge with branch november_presentation
2011-12-01 13:50:49 +08:00
chris2tof
b68f5e11e5
Final modifications for the presentation
2011-11-22 18:54:10 +08:00
chris2tof
a03e9bada8
Add missing translations
2011-11-20 02:14:51 +08:00
chris2tof
ad9f9bbf5c
Final Ray's modifications
2011-11-19 21:47:18 +08:00
chris2tof
dac6348402
Integration of module_app workflow
2011-11-19 14:33:26 +08:00
chris2tof
65349796d0
Ray's modifications
2011-11-18 16:43:14 +08:00
chris2tof
861237d65b
Integration of Ray' modifications
2011-11-17 20:02:58 +08:00
chris2tof
0556dc9297
ika's modification to the backend
2011-11-16 18:34:54 +08:00
chris2tof
d9d7099da6
Fix bug: users can now be saved
2011-11-12 17:54:45 +08:00
Matthew Kaito Juyuan Fu
cb07a35cc9
Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD
2011-10-20 10:06:06 +08:00
Matthew Kaito Juyuan Fu
ff82391b7d
Revert "Merge with new_blog"
...
This reverts commit 64c68fcdeb
.
2011-10-20 10:01:39 +08:00
chris2tof
64c68fcdeb
Merge with new_blog
2011-10-18 11:36:01 +08:00
chris2tof
f2e3cb00db
Fix bug when editing a page, the theme wasn't including blank
2011-09-13 14:03:03 +08:00
chris2tof
4db88282a1
Modification in Design structure_css -> default_css
2011-09-13 11:57:20 +08:00
chris2tof
07ccacb7d7
Modifications of the JS in Design
2011-09-09 15:40:13 +08:00
chris2tof
77b8fcdd1d
Fix previous workaround for the uploaded Design
2011-09-09 13:44:43 +08:00
chris2tof
a571d1dcff
Clean code and workaround mongoid embedded with carrierwave
2011-09-08 18:12:04 +08:00
chris2tof
a1391493a3
Revert change in layout/admin.html.erb
2011-09-07 14:03:53 +08:00
chris2tof
0956e9784a
Fix bug in layout, parser and change lib/fraisier
2011-09-07 11:53:16 +08:00
chris2tof
151f005815
structure.css -> default.css
...
Themes are optional, a theme overrides style in default.css
2011-09-05 15:18:36 +08:00
chris2tof
492f691469
Modifications for menu in Design
2011-09-01 09:12:49 +08:00
chris2tof
294e06d630
Change "RulingSite" into "Orbit"
2011-08-25 17:59:49 +08:00
chris2tof
c248b729db
CSS problem for page
2011-08-25 15:08:23 +08:00
chris2tof
f898a29fdf
Add site link in menu
2011-08-25 08:56:01 +08:00
chris2tof
4540f23a3f
Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1
2011-08-25 08:18:22 +08:00
chris2tof
c427e2af14
Page form with drop down. Modifications for Designs
2011-08-25 08:13:38 +08:00
chris2tof
c678545160
Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1
2011-08-25 08:08:09 +08:00
chris2tof
4cd9854706
Ika's changes
2011-08-25 08:07:18 +08:00
chris2tof
27d47215e9
Modify edit page. Still need to handle "form" with drop down lists
2011-08-24 02:34:24 +08:00
chris2tof
1d214bedec
Revert "Revert "Clean code and add 'name' in theme.rb""
...
This reverts commit 00813c9060
.
2011-08-24 02:06:27 +08:00
chris2tof
00813c9060
Revert "Clean code and add 'name' in theme.rb"
...
This reverts commit 608180646b
.
2011-08-24 02:04:54 +08:00
chris2tof
608180646b
Clean code and add 'name' in theme.rb
2011-08-24 01:39:28 +08:00
chris2tof
118455aa81
Check if site is up-to-date
2011-08-23 19:40:49 +08:00
chris2tof
e0e14ddfac
Modify purchases list
2011-08-23 16:33:01 +08:00
chris2tof
09cdb9a852
CSS modifications for design team
2011-08-23 15:59:07 +08:00
chris2tof
2842001a3b
Update source: pull from git
2011-08-23 15:01:22 +08:00
chris2tof
4f38074932
content.css -> content.css.erb
2011-08-23 10:05:16 +08:00
chris2tof
2cdb5a756d
Set store_ip in config.yml
2011-08-22 14:01:51 +08:00
chris2tof
7a4ad240a8
Clean code for layout and modifications in dev.rake
2011-08-22 13:45:21 +08:00
chris2tof
e74f2931b1
Modifications asset pipeline
2011-08-20 22:54:07 +08:00
chris2tof
86443661e9
Merge server and rails_3_1
2011-08-18 13:43:33 +08:00
Kaito
e0811c14db
adding upload package for design. bugs in
2011-08-11 18:20:16 +08:00
Kaito
34d0b8fac1
complete new parser for layout_part
2011-08-10 17:28:10 +08:00
chris2tof
278938a52d
Fixed: layout.file is saved when the design is created
2011-08-08 17:51:37 +08:00
Kaito
9cea77430f
dealing with layout file bug
2011-08-08 17:23:20 +08:00
Kaito
37633ac23d
put layout object as embeded obj in design. have bug with solving uploading file
2011-08-08 12:29:32 +08:00
Kaito
706ec745c3
modified V,C,M related with layout and have bug between layout and design
2011-08-08 09:30:44 +08:00
Kaito
c8d58e30aa
make design work with layout and testing with package andreas05 within r tag
2011-08-01 18:17:28 +08:00
Kaito
1839269581
finishing saving edited file online and redo dev.rake modification
2011-07-28 18:08:16 +08:00
Kaito
9eb80d7424
Made r_editor into class style add functions
2011-07-27 17:23:01 +08:00
Kaito
dabd6dd5b5
Fixing upload bug
2011-07-26 18:22:17 +08:00
Kaito
1ac10e70a2
redo lost code....
2011-07-22 16:28:41 +08:00
Kaito
a272b871e2
complete del and destroy funciton for desgin
2011-07-22 15:54:38 +08:00
Matthew Fu
f8d1a1315b
fixing duplicate when updating design
2011-07-20 17:05:28 +08:00
Matthew Fu
e3a50ccf69
move design file field to partial
2011-07-20 14:04:16 +08:00
Matthew Fu
612ed629bc
fix design upload
2011-07-20 09:58:24 +08:00
Matthew Fu
c48a11d9f5
Add some JS for design uploading
2011-07-19 18:31:53 +08:00
chris2tof
c3ada90365
CarrierWave workaround: the files have to be saved manually
2011-07-14 08:48:42 +08:00
Matthew Fu
f73f09ffcf
adding files not commited from previous commit
2011-07-12 16:02:41 +08:00
Matthew Fu
f387139ae1
rails 3.1 and designs (with bug)
2011-07-12 16:00:57 +08:00
chris2tof
96a43f023e
Edit code (HTML response)
2011-06-10 15:02:34 +08:00
chris2tof
a695b9ad29
Items UI changes
2011-06-10 13:57:42 +08:00
chris2tof
247b8ec4dc
HTML code can be modify (paser: update)
2011-06-10 10:31:50 +08:00
chris2tof
7b5ea870a0
Delete page.
2011-06-01 12:00:41 +08:00
chris2tof
ddc7c74436
Create page.
2011-06-01 10:24:14 +08:00
chris2tof
2522cde2f5
Edition of page part for multiple languages.
2011-05-27 11:27:54 +08:00
chris2tof
0969f6b6cc
CKEditor.
...
The error came from some script in Application.js
2011-05-26 13:48:09 +08:00
chris2tof
964440fa86
Remove CKEditor due to conflicts with the jQuery library
2011-05-26 11:23:46 +08:00
chris2tof
a8c4e17c56
CKEditor.
...
Edition of page part for single language.
2011-05-25 16:27:17 +08:00
chris2tof
d971a8ecbe
Uniformized: @page and @ link in @item
...
Change parser for page edition.
2011-05-25 14:50:56 +08:00
chris2tof
4399804e19
Delete link handle JavaScript disabled
2011-05-13 09:59:29 +08:00
chris2tof
24ae7ed5e3
Links edition
2011-05-13 09:08:42 +08:00
chris2tof
d9ba76ebd5
- No more Home object
...
- Sitemap on the left side and view of the current page in the main block
2011-05-09 18:49:57 +08:00
chris2tof
83bbd77d96
Built-in user_attribute_models
2011-05-02 12:07:31 +08:00
chris2tof
509c106b3e
Modifications of the user model
2011-04-28 22:47:34 +08:00
ihower
8a4cffae8f
Remove files which should be deleted in previous commit
2011-04-13 18:53:47 +08:00
chris
25752b7065
tags: image and css - show ID in assets/index
2011-04-13 18:22:52 +08:00
chris
fc98757772
base layout on id instead of name
2011-04-13 18:22:51 +08:00
chris
4b4cdbfd31
admin status change
2011-04-13 18:22:50 +08:00
chris
e62df90117
user can't delete self and flash_messages
2011-04-13 18:22:50 +08:00
chris
318c264cae
add user_info
2011-04-13 18:22:50 +08:00
chris
2ccc2c9b39
add user_info
2011-04-13 18:22:50 +08:00
chris
27bdbadf08
404 for pages and asset column error
2011-04-13 18:22:49 +08:00
rulingcom
d28a71f5bf
remove .empty? which shouldn't be here
2011-04-13 18:22:49 +08:00
rulingcom
c44b86f284
fix bugs for i18n_variable in page and home
2011-04-13 18:22:49 +08:00
chris
bda67684bd
mongoid rc_6 & fix bugs
2011-04-13 18:22:49 +08:00
ihower
19a7d51e60
Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)
2011-04-13 18:19:51 +08:00
Wen-Tien Chang
554aa0a95d
Support i18n and select options user attributes, but admin edit is broken
2010-03-18 17:57:26 +08:00
Wen-Tien Chang
bebc51e8bb
Admin can new/edit user_attributes
2010-03-15 17:35:01 +08:00
Wen-Tien Chang
263da6aa9f
Let admin can choose user attributes checkbox
2010-03-15 16:13:26 +08:00
Wen-Tien Chang
a40b117fbe
add rough user attributes API
2010-03-08 17:14:59 +08:00
Wen-Tien Chang
29ee4585b2
upgrade to rails3, but grip is broken
2010-03-08 16:04:05 +08:00
Wen-Tien Chang
9f1de1b543
Add UserAttribute model, suppose it will store user model want to use which attribute group
2010-03-04 17:11:18 +08:00
Wen-Tien Chang
13065aa85a
Add devise gem and panel/users controller
2010-03-04 16:33:26 +08:00
Wen-Tien Chang
bd46cb1b12
remove component link
2010-02-22 17:10:08 +08:00
Wen-Tien Chang
93169b1098
Add Item list interface, but acts_as_list can not used
2010-02-22 16:10:13 +08:00
Wen-Tien Chang
66a462faa8
Add nested route url
2010-02-05 17:18:57 +08:00
Wen-Tien Chang
0f7dce8aa6
save asset static file
2010-02-05 16:15:16 +08:00
Wen-Tien Chang
a19e0dba6c
Add asset model and controller
2010-02-01 17:24:28 +08:00
Wen-Tien Chang
8da5323fd0
Let page edit from can select layout
2010-01-28 17:42:55 +08:00
Wen-Tien Chang
32e8bd108f
Add Item#ancestors
2010-01-18 15:52:52 +08:00
Wen-Tien Chang
e1440a79d8
Add Item, Page, Component, Link inheritanced models
2010-01-14 18:30:53 +08:00
Wen-Tien Chang
cd21cadfe7
Add panel namespace
2010-01-11 17:53:44 +08:00
Wen-Tien Chang
314f6d5219
Add reroute middleware hack
2010-01-11 17:09:50 +08:00
Wen-Tien Chang
9f1ba2ae66
1.fix parent page 2.add page title
2010-01-08 18:36:36 +08:00
Wen-Tien Chang
38e365e4b5
remove blueprint, use easyframework
2010-01-08 16:05:58 +08:00
Wen-Tien Chang
e6d083acda
Add zh_tw locale file
2010-01-08 15:45:13 +08:00
Wen-Tien Chang
691d514fa1
fixes announcements i18n
2009-07-06 16:36:41 +08:00
Wen-Tien Chang
ff2dffaeb4
add i18n for layout and snippet
2009-07-06 16:23:34 +08:00
Wen-Tien Chang
c895469d34
add toggle for edit english content
2009-06-22 16:04:06 +08:00
Wen-Tien Chang
db8d2bfa8f
let page model support i18n
2009-06-19 17:31:10 +08:00
Wen-Tien Chang
5570a2dfbf
Add announcement admin and view template
2009-06-01 14:20:15 +08:00
Wen-Tien Chang
4807066c68
Add announcement model
2009-06-01 10:54:16 +08:00
Wen-Tien Chang
62602940ed
Add root menu snippet
2009-05-22 15:16:22 +08:00
Wen-Tien Chang
32fdf99833
Add Page external_link
2009-05-22 14:51:32 +08:00
Wen-Tien Chang
a4c900af4d
Add Page position and parent_page_id
2009-05-22 14:43:52 +08:00
Wen-Tien Chang
96f186a71b
Add blueprint button style
2009-05-15 14:37:03 +08:00
Wen-Tien Chang
68622bb23c
Add blueprint style and install jRails plugin
2009-05-15 14:02:28 +08:00
Wen-Tien Chang
438c508ea1
Add snippet support and unpack liquid plugin
2009-05-08 02:13:27 +08:00
Wen-Tien Chang
8dcde174cf
Add page layout support
2009-05-08 01:54:33 +08:00
Wen-Tien Chang
78e8c32969
Add liquid template render
2009-05-08 01:32:49 +08:00
Wen-Tien Chang
66604d00f4
Add admin/pages scaffold and basic page render
2009-05-08 01:18:16 +08:00