1240064e23
add url generate
2012-09-18 17:37:52 +08:00
5de433d219
user status method. Now the sub_role shall be sat with it's status in order to record sub_role status into user object.
...
Sub_role can be removed normally and the method check_status_record will make sure data is being saved as it should be.
Also unnecessary role will be removed if no sub role exists.
2012-09-18 16:22:56 +08:00
0907324a2f
add member link to orbit menu
2012-09-17 14:18:27 +08:00
228fa0fca3
Remove setting from side bar
2012-09-17 13:40:14 +08:00
19db9d0037
basic function
2012-09-17 13:32:52 +08:00
9eed9ec7b6
demo site plugin
2012-09-17 13:32:52 +08:00
b09b1cf2f5
commit for calendar
2012-09-14 21:59:20 +08:00
af19f11668
calendar update
...
- delete unwanted style in bootstrap-responsive.css
- yet start repeat panel
- please just refer how google works (functionality)
2012-09-14 15:57:44 +08:00
0e507d549d
some more changes
2012-09-14 15:32:15 +08:00
3d9fb548e1
calendar fixed
2012-09-14 15:20:01 +08:00
ee51240102
Ray's changes for new backend
2012-09-14 02:38:56 +08:00
194773f064
Fix bugs after merge
2012-09-14 02:27:49 +08:00
42d50ae534
Plugins
2012-09-14 00:05:31 +08:00
03b5827392
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
...
Conflicts:
app/controllers/application_controller.rb
app/views/layouts/_side_bar.html.erb
2012-09-14 00:03:52 +08:00
5fb94f644d
break down Ray's HTML
2012-09-14 00:02:22 +08:00
3e5978c8fd
users new interface controller
2012-09-14 00:02:21 +08:00
4818e3f444
first version for new member html
2012-09-14 00:02:21 +08:00
29ea95b4c6
event_calendar testing
2012-09-13 23:57:47 +08:00
9bfd1d2b0c
break down Ray's HTML
2012-09-13 18:39:27 +08:00
2e9af5d1a8
fix commit bugs
2012-09-13 15:53:36 +08:00
f88176ee1f
Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit
2012-09-12 16:48:33 +08:00
3432d1359b
Fix bug in show_from_link
2012-09-12 16:46:03 +08:00
17195a9a23
fix for admin has no orbit menu
2012-09-12 16:20:15 +08:00
98e8f5f607
complete visitor dashbroad
2012-09-12 16:20:15 +08:00
803f83b239
fix for no login window for backend
2012-09-12 16:20:15 +08:00
45ef7fd302
guest user
2012-09-12 16:20:15 +08:00
17f3104c8d
Merge branch 'gallery_orbit' into desktop_devin
2012-09-12 16:18:13 +08:00
e96ebefe9c
calendar update
2012-09-12 16:16:01 +08:00
905541aa38
Ray's tp CSS changes
2012-09-12 03:50:20 +08:00
816b542ca6
Change side bar to use key instead of title for ModuleApps
2012-09-12 03:07:25 +08:00
e88b09cf72
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
...
Conflicts:
app/controllers/pages_controller.rb
app/views/layouts/_side_bar.html.erb
lib/parsers/parser_common.rb
vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
vendor/built_in_modules/gallery/config/locales/en.yml
vendor/built_in_modules/gallery/config/locales/zh_tw.yml
2012-09-12 02:21:18 +08:00
4ea0c0ec9c
minor fix for sidebar
2012-09-12 02:14:50 +08:00
8a71bd530f
page added...
2012-09-12 02:14:50 +08:00
8dd69a140f
frontend commits
2012-09-12 02:12:15 +08:00
3749e919cb
front ends updates
2012-09-12 02:12:15 +08:00
7ae1dcd8e0
Calendar Module
2012-09-12 02:06:22 +08:00
789c2df7fd
gallery frontend update
2012-09-12 02:05:10 +08:00
6a23e29f33
Ruby structure implementation
2012-09-12 02:05:09 +08:00
04877b9945
design update
2012-09-12 01:58:23 +08:00
c84b6a626e
minor fix for sidebar
2012-09-11 16:50:42 +08:00
01a8a9b5b6
users new interface controller
2012-09-11 10:53:05 +08:00
42cfe5ac91
first version for new member html
2012-09-11 10:52:27 +08:00
71021b8c69
Changes for empty file and link in create and edit for news and announcement + partially fix tinymce
2012-09-11 00:41:52 +08:00
7bab8bf8ad
page added...
2012-09-10 14:44:21 +08:00
3db2664c14
add missing file
2012-09-10 14:23:45 +08:00
e12701b34b
preview for association object
2012-09-10 14:19:39 +08:00
768f907f66
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-09-10 11:54:20 +08:00
a20db344f1
preview for update
2012-09-10 11:53:59 +08:00
9d21a86f53
Ray's CSS changes for NCCU email
2012-09-07 18:16:34 +08:00
6044857fea
complete preview for both new and announcement
2012-09-07 17:55:59 +08:00
8bd5481b3f
fix object_auth security problem
2012-09-07 17:53:43 +08:00
8295286c6e
frontend commits
2012-09-05 19:08:48 +08:00
b726c10857
front ends updates
2012-09-04 21:30:17 +08:00
671f86b612
First version of new preview. Only plain text
2012-09-04 12:31:27 +08:00
ae1595a008
view for preview
2012-09-04 09:24:12 +08:00
fc4e2ceba5
fix for 403 for new interface
2012-08-31 18:56:26 +08:00
26f99c296f
fix page blank for 403 forbidden.
2012-08-31 18:33:18 +08:00
6b904a37ad
let all signed in users at NCCU upload files
2012-08-31 17:54:25 +08:00
dcdd730a01
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/assets/javascripts/bulletin_form.js.erb
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
vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
2012-08-31 14:31:54 +08:00
0cb573946e
update item page
2012-08-30 15:17:39 +08:00
a1560ebcf5
update archive
2012-08-30 15:17:39 +08:00
3ebe7378b9
Delete duplicate side_bar code
2012-08-30 14:49:31 +08:00
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
e17bc400f1
gallery frontend update
2012-08-29 17:12:20 +08:00
62abbf9417
Ruby structure implementation
2012-08-27 23:36:56 +08:00
94ee16ae01
design update
2012-08-23 01:36:55 +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
1bfae05242
update item page
2012-08-21 17:37:25 +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
587595f815
gallery translation supported
2012-08-20 23:14:11 +08:00
0333f97bf3
Gallery update..
2012-08-20 23:14:10 +08:00
797c9e57b8
Gallery update
2012-08-20 23:14:10 +08:00
1daf405b3d
Gallery started.
2012-08-20 23:14:10 +08:00
801c7cab0c
tinyscroll bar update
2012-08-20 23:11:32 +08:00
1efb807246
tinyscrollbar extension
2012-08-20 23:11:32 +08:00
23a3a7eff6
update archive
2012-08-20 17:14:13 +08:00
3c283d1a7a
Set default picture
...
Fix tags where not in params for index fronted (news and announcement)
Change backend index for news
Home banner link for images and main title
2012-08-16 17:24:12 +08:00
96fd89cca3
Fix js for ie in list
2012-08-16 01:09:45 +08:00
53c5f6a3b9
New css and images for rss
2012-08-15 18:00:55 +08:00
0d330edfa3
New css and images for rss
2012-08-15 17:42:45 +08:00
43bc704468
Error popup only shows on flash[:error]
2012-08-15 15:55:29 +08:00
a19a5415c1
Ray's changes for list.css
2012-08-15 12:13:58 +08:00
fb53ad524a
Add time to announcement quick edit
...
Fix picture for news quick edit
Fix tags not saving when empty
Hide role in quick edit
2012-08-14 14:38:21 +08:00
ab1c457a51
Add i18n for message in editor pop-up
2012-08-14 01:20:45 +08:00
9ff60d2ba4
form validation again
2012-08-14 01:02:45 +08:00
ffa49fd092
form validation
2012-08-14 01:02:45 +08:00
9196deb997
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-14 01:00:25 +08:00
c32b0dd4b4
Move delete checkboxes to js
2012-08-14 00:59:01 +08:00
83569fac82
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-13 18:36:04 +08:00
6cc470ede9
nccu fix
2012-08-13 18:35:47 +08:00
18e18a4add
Fix for banner on ie
2012-08-13 15:10:53 +08:00
c2f3f45196
Fix for link in nccu widget
2012-08-13 11:34:14 +08:00
92fc0c8c26
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-13 11:20:23 +08:00
2ea3193879
Fix for banner link
2012-08-13 11:03:11 +08:00
080974b563
Merge branch 'new_rss'
...
Conflicts:
vendor/built_in_modules/announcement/app/models/bulletin.rb
2012-08-12 23:32:28 +08:00
f1b4d9e204
Add authorization for rescue interface
...
Change logic for NCCU site for status panel.
2012-08-12 23:29:13 +08:00
33fc96ac7c
Changes for NCCU after email
2012-08-11 18:19:30 +08:00
5281464af4
Fix bug for sorting when there's only one category with elements
2012-08-11 16:56:28 +08:00
bebb8a1c1e
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/archive/app/models/archive_file.rb
vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
2012-08-10 15:30:33 +08:00
53cd39f180
Delete duplicate side_bar code
2012-08-10 15:26:34 +08:00
d8b0613147
archive checkbox
2012-08-10 15:26:34 +08:00
26931a7b9c
new archive
2012-08-10 15:23:56 +08:00
81fa2a7428
archive checkbox
2012-08-10 15:19:45 +08:00
2dd2abc8d2
new archive
2012-08-10 15:17:16 +08:00
e8cea9f0ab
new archive
2012-08-10 15:14:43 +08:00
2bd132cef9
Pass category and tag to search to redirect to the right page
...
Ray's change for mouseover (take out the black background)
2012-08-09 19:16:26 +08:00
e256440678
RSS first page
2012-08-09 17:04:08 +08:00
d5c55c9697
widget & frontend field
2012-08-09 15:25:30 +08:00
1aea8d91f4
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-08 18:16:38 +08:00
0645f04240
Ray's change in css
2012-08-08 18:11:18 +08:00
62ba8c9f18
Fix bugs on 172:180
2012-08-08 17:56:00 +08:00
e8317e0a4b
1.Remove category column when category is specified
...
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
2012-08-08 14:46:08 +08:00
b4c2dfe0ef
Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share
2012-08-08 11:53:47 +08:00
3fdff9357c
Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share
2012-08-08 11:52:11 +08:00
fbb53cca36
Ray's changes for sitemap backend
2012-08-08 11:51:20 +08:00
05e61b63bb
Fix fb share, redirect with js when the page is not requested by fb but by user
2012-08-08 11:04:19 +08:00
a03d1ad10b
Change for getting url from key
2012-08-08 11:04:19 +08:00
6cfdf0f25a
Change the way the orig_url is passed to fb
2012-08-08 11:04:19 +08:00
4bed925e0f
Try fb from override and generated page
2012-08-08 11:04:19 +08:00
acf4446523
Add meta to head for fb share
2012-08-08 11:04:19 +08:00
85a556a4a2
first version of fb_share
2012-08-08 11:04:19 +08:00
c6c8187bda
Changes for design: menu, frontend news and announcement
2012-08-08 10:53:04 +08:00
9982fd880f
Update the path when name is changed in item.rb
2012-08-08 10:53:04 +08:00
c8dcc9734d
Change width for site map frontend, add link for more in announcement widget
2012-08-08 10:53:04 +08:00
292105bdf1
Remove remotipart (not working with ie9) the upload is working except that the pop-up does not disappear in ie
2012-08-08 10:53:04 +08:00
86a3d4a4b1
Remove console.log
2012-08-08 10:52:22 +08:00
ecc5c39840
Fix remote upload file for tinymce
2012-08-08 10:51:54 +08:00
e9de0e24b4
Fix fb share, redirect with js when the page is not requested by fb but by user
2012-08-08 10:12:21 +08:00
db16fdc7b5
Change for getting url from key
2012-08-08 07:46:10 +08:00
f7e6703d5f
Change the way the orig_url is passed to fb
2012-08-08 06:50:28 +08:00
fc560f4205
Try fb from override and generated page
2012-08-08 05:40:50 +08:00
3cb182ff8e
Add meta to head for fb share
2012-08-08 03:10:26 +08:00
Matthew K. Fu JuYuan
Christophe Vilayphiou
unknown
Harry Bomrah
devin
OrbitServer
Matt
Fu Matthew