29c5126455
gallery update
2012-09-12 02:04:36 +08:00
4b6eebba7c
gallery update
2012-09-12 02:04:08 +08:00
b6f10951b8
gallery update
...
especially upload panel
2012-09-12 02:04:07 +08:00
6e6d441b26
code merged … ui updated
2012-09-12 02:03:02 +08:00
2274df4111
gallery update
2012-09-12 02:02:29 +08:00
584d1eb0e0
gallery update
2012-09-12 02:02:01 +08:00
ede9727a18
gallery update
2012-09-12 02:02:00 +08:00
0e5a305f39
gallery update
2012-09-12 01:58:23 +08:00
0c624794d5
gallery update
2012-09-12 01:58:23 +08:00
887b2d528d
gallery update
...
especially upload panel
2012-09-12 01:58:23 +08:00
ad431b1d06
Minor update
2012-09-12 01:58:23 +08:00
91d45b64da
code merged … ui updated
2012-09-12 01:58:23 +08:00
17c4b9a1bf
gallery update
2012-09-12 01:58:22 +08:00
01eae75ad0
gallery update
2012-09-12 01:58:22 +08:00
a2ed9e3350
gallery update
2012-09-12 01:58:22 +08:00
a579e16109
Change rows for news textarea
2012-09-11 16:41:35 +08:00
73e48aebc6
Change news subtitle to textarea, no tinymce
2012-09-11 15:40:27 +08:00
e486ac5d25
complete visitor dashbroad
2012-09-11 11:30:58 +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
b110b22daa
Change 熱門 to 頭版 for news
2012-09-10 15:55:06 +08:00
4dfe3e7b3b
Change 熱門 to 頭版 for news
2012-09-10 15:19:29 +08:00
7bab8bf8ad
page added...
2012-09-10 14:44:21 +08:00
e12701b34b
preview for association object
2012-09-10 14:19:39 +08:00
a20db344f1
preview for update
2012-09-10 11:53:59 +08:00
6044857fea
complete preview for both new and announcement
2012-09-07 17:55:59 +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
a080667615
frontend updates
2012-09-04 17:17:18 +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
4a12c9d6fb
frontend update
2012-09-03 21:49:35 +08:00
202d736a5d
one more modification
2012-08-31 22:02:06 +08:00
4d6a9a8e87
Modifications in ruby
2012-08-31 22:01:19 +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
a1560ebcf5
update archive
2012-08-30 15:17:39 +08:00
bc5235aa9f
archive checkbox
2012-08-30 14:49:31 +08:00
c739ab3984
new archive
2012-08-30 14:49:31 +08:00
2a4c737cdd
archive checkbox
2012-08-30 14:48:42 +08:00
eb7e73b393
new archive
2012-08-30 14:44:55 +08:00
c74ebb91b8
archive checkbox
2012-08-30 14:37:56 +08:00
8a5519073b
new archive
2012-08-30 14:32:32 +08:00
10d9253399
announcement edit to view file
2012-08-30 14:25:51 +08:00
29bcfa3139
archive checkbox
2012-08-30 14:19:51 +08:00
d5cc9961e3
new archive
2012-08-30 14:14:53 +08:00
9cd7aa81a6
Calendar Module
2012-08-29 20:13:41 +08:00
34764fb28d
front update
2012-08-29 17:54:18 +08:00
43294b2f49
backend update
2012-08-29 17:48:29 +08:00
4fc196fb71
resize thumbnails
2012-08-29 17:36:12 +08:00
a2da065ce6
Merge branch 'gallery_orbit' into desktop_devin
2012-08-29 17:19:04 +08:00
4e6703dae6
ruby update for form and edit tagging
2012-08-29 17:13:45 +08:00
e17bc400f1
gallery frontend update
2012-08-29 17:12:20 +08:00
a11d865dd1
Ruby update
2012-08-28 21:04:48 +08:00
833349bf6c
Merge branch 'gallery_orbit' into desktop_devin
2012-08-28 15:45:20 +08:00
86535874f7
language fix
2012-08-28 15:38:35 +08:00
d2733bde28
front end added
2012-08-28 15:23:55 +08:00
62abbf9417
Ruby structure implementation
2012-08-27 23:36:56 +08:00
99096c4ac0
View only update
2012-08-23 21:30:37 +08:00
33bc430df5
Commit for view only
2012-08-23 19:25:56 +08:00
861f521da3
Merge branch 'gallery_orbit' into desktop_devin
2012-08-23 17:15:03 +08:00
e2c16e1931
frontend fixes
2012-08-23 17:13:33 +08:00
e4cc80248d
Merge branch 'demo_site' of github.com:Rulingcom/orbit into visitor_dsahbroad
...
Conflicts:
config/mongoid.yml
2012-08-23 16:08:17 +08:00
01d278d688
guest user
2012-08-23 16:05:14 +08:00
4d9244005a
Code merge
2012-08-23 01:40:55 +08:00
1e4d534908
frontend updates
2012-08-23 01:36:56 +08:00
93da8520ed
gallery update
2012-08-23 01:36:56 +08:00
9430f66bee
gallery update
2012-08-23 01:36:56 +08:00
1a4097d1c0
gallery update
...
especially upload panel
2012-08-23 01:36:56 +08:00
4fe4dc35de
Minor update
2012-08-23 01:36:55 +08:00
0799fb4f87
code merged … ui updated
2012-08-23 01:36:55 +08:00
d6b24c6454
gallery update
2012-08-23 01:36:55 +08:00
a732910f35
gallery update
2012-08-23 01:36:55 +08:00
7b42adc9a0
gallery 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
75b6c447fc
gallery update
2012-08-22 16:46:37 +08:00
e8a0015365
gallery update
2012-08-22 15:59:06 +08:00
1437d2dc14
gallery update
...
especially upload panel
2012-08-22 01:15:50 +08:00
4a53e5faea
Minor update
2012-08-21 20:26:07 +08:00
16b1e97685
code merged … ui updated
2012-08-21 20:15:17 +08:00
0ad0ea9acf
gallery update
2012-08-21 16:32:55 +08:00
cbef7cd368
gallery update
2012-08-21 14:31:25 +08:00
1a6ecf4d0f
gallery update
2012-08-21 13:56:50 +08:00
68aed18956
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
...
Conflicts:
app/views/layouts/_side_bar.html.erb
config/mongoid.yml
vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb
vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
2012-08-20 23:24:41 +08:00
3d607cfca4
updates for tagging and language fix
2012-08-20 23:20:20 +08:00
2c0058e8c9
authorization
2012-08-20 23:18:50 +08:00
489231166f
gallery update
2012-08-20 23:17:32 +08:00
1731c4bcf7
gallery update
...
add "tag panel", not complete
2012-08-20 23:17:32 +08:00
4beedb1aa4
gallery update
2012-08-20 23:17:31 +08:00
0dd1c6eb51
encoding fixed
...
Maybe there are some "chinese" in galleryAPI.js.erb and Ruby treat them
all US-ASCII, so everything crash.
see this post
"http://stackoverflow.com/questions/7761540/encoding-issues-in-javascrip
t-files-using-rails-asset-pipeline"
2012-08-20 23:16:54 +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
8a9e724979
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
e27c1b0175
gallery update
2012-08-20 23:14:11 +08:00
587595f815
gallery translation supported
2012-08-20 23:14:11 +08:00
314af3c16f
Major updates for gallery
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
9f3d22360e
gallery module update
2012-08-20 23:11:32 +08:00
6e90196b77
updates for tagging and language fix
2012-08-20 22:00:57 +08:00
23a3a7eff6
update archive
2012-08-20 17:14:13 +08:00
edf9d8a159
Fix can_display
2012-08-16 18:55:34 +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
c5b95e2e0f
Fix rss feed i18n
2012-08-15 16:17:28 +08:00
43bc704468
Error popup only shows on flash[:error]
2012-08-15 15:55:29 +08:00
d9f6bb3b4e
can display scope
2012-08-15 11:34:19 +08:00
bcc13a47e6
Fix deadline was set to nil when update
2012-08-14 16:23:34 +08:00
efaed060d9
Change for date
2012-08-14 15:11:52 +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
77224bcc8f
check deadline for news
2012-08-14 13:49:24 +08:00
e57b429398
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-14 13:13:25 +08:00
5bb4aa95ee
fix for dept
2012-08-14 13:13:06 +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
e86d5ab338
tagging
2012-08-13 16:43:23 +08:00
4d676d9ee9
Merge
2012-08-13 16:17:23 +08:00
c2f3f45196
Fix for link in nccu widget
2012-08-13 11:34:14 +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
34e4928ee1
authorization
2012-08-11 17:28:49 +08:00
7fb6a1e86b
gallery update
2012-08-11 01:32:53 +08:00
9333503545
demo_site widget edit
2012-08-10 15:33: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
d8b0613147
archive checkbox
2012-08-10 15:26:34 +08:00
d5cc470e5d
new archive
2012-08-10 15:23:56 +08:00
cdb8d6c755
announcement edit to view file
2012-08-10 15:20:17 +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
6059edad70
Merge branch 'new_rss' of github.com:Rulingcom/NCCU into new_rss
2012-08-09 18:36:31 +08:00
50baac2cb7
gallery update
...
add "tag panel", not complete
2012-08-09 18:09:36 +08:00
1e7bc9aadd
1.Rss feed but no entry for clicking now. wait for design.
...
2.Unit link is now fixed.
2012-08-09 17:04:37 +08:00
e256440678
RSS first page
2012-08-09 17:04:08 +08:00
561d510aa8
rss branch end
2012-08-09 17:04:08 +08:00
2d2172752f
remove announcement category column in announcement
2012-08-09 16:14:05 +08:00
d5c55c9697
widget & frontend field
2012-08-09 15:25:30 +08:00
987e6fff2b
1.Rss feed but no entry for clicking now. wait for design.
...
2.Unit link is now fixed.
2012-08-09 02:20:10 +08:00
5fcc910723
Merge branch 'master' of github.com:Rulingcom/NCCU into new_rss
2012-08-09 00:32:09 +08:00
ee03bd5b65
code merge
2012-08-08 19:35:36 +08:00
1aea8d91f4
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-08 18:16:38 +08:00
0d55a2f76b
Hide quick edit
2012-08-08 18:11:03 +08:00
62ba8c9f18
Fix bugs on 172:180
2012-08-08 17:56:00 +08:00
41930eb693
RSS first page
2012-08-08 17:41:48 +08:00
eb91322e1f
rss branch end
2012-08-08 17:40:49 +08:00
2158e0a879
Merge branch 'nccu_fix_matt'
2012-08-08 16:15:49 +08:00
1b35415699
conditional showing quick edit.
2012-08-08 15:56:46 +08:00
959def6c1f
Merge branch 'nccu_fix_matt' of github.com:Rulingcom/NCCU into nccu_fix_matt
...
Conflicts:
app/models/item.rb
config/locales/en.yml
vendor/built_in_modules/announcement/app/models/bulletin.rb
vendor/built_in_modules/news/app/models/news_bulletin.rb
2012-08-08 14:48:29 +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
a03d1ad10b
Change for getting url from key
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
06919e76ed
fix approval at news and announcement for abnormal flags that causing search result fault.
2012-08-08 11:01:50 +08:00
1cdc0e24bd
First version of Solr search.
2012-08-08 10:59:55 +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
cd4c9306da
Revert useless changes
2012-08-08 10:24:44 +08:00
4660c26b7a
fix for ie8,9 for tinymce
2012-08-07 20:55:18 +08:00
cbf7ccc13b
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-07 19:21:54 +08:00
b5227c7b6c
gallery update
2012-08-07 14:33:30 +08:00
0f5707394b
encoding fixed
...
Maybe there are some "chinese" in galleryAPI.js.erb and Ruby treat them
all US-ASCII, so everything crash.
see this post
"http://stackoverflow.com/questions/7761540/encoding-issues-in-javascrip
t-files-using-rails-asset-pipeline"
2012-08-06 22:11:36 +08:00
13f3d4db70
tp
2012-08-06 20:10:38 +08:00
a08f85a3e2
Button fixes
2012-08-06 17:49:10 +08:00
5f0d6c9003
Code Merge
2012-08-06 17:05:12 +08:00
47408f4467
UI modifications
2012-08-06 17:01:53 +08:00
9ebee5daea
gallery update
2012-08-06 14:02:55 +08:00
337d690c54
gallery update
2012-08-06 11:07:58 +08:00
73b2cd1035
Fix typo and title in news and announcement frontend
2012-08-05 15:04:52 +08:00
5f88408dcb
Check for 'http' or 'https' before saving a link
2012-08-04 16:29:31 +08:00
5fc679e0ca
Toggle line color for announcement frontend
2012-08-04 16:16:28 +08:00
6a94d4f550
Put back impressionist where it was commented out
2012-08-04 15:42:53 +08:00
2d2e01115b
Fix page: take category and tag at the same time
...
With news and announcement views
2012-08-03 01:44:06 +08:00
4127d7f2eb
Fix tags
2012-08-03 01:35:41 +08:00
6159c04da6
Merge branch 'gallery_orbit' into desktop_devin
2012-08-01 20:09:58 +08:00
b0ef2b6957
Multi language and side bar update
2012-08-01 20:07:54 +08:00
d2564af001
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-01 16:38:35 +08:00
eaa8171689
gallery update
2012-08-01 16:35:59 +08:00
25a911b4f8
Change for page: take category and tag at the same time
2012-08-01 16:33:46 +08:00
acebec8904
don't dislay web links if no eng. lists in widget is now sorted.
2012-08-01 15:24:55 +08:00
625801c0e9
Fix auth_users bug without category in news
2012-08-01 03:07:23 +08:00
c951cc6b6f
Fix for data_migration
2012-08-01 00:58:59 +08:00
7accbed1a0
gallery translation supported
2012-07-31 21:15:42 +08:00
b2f28eabaf
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 18:23:01 +08:00
b989f458d3
Do not show news/anc if no context.
2012-07-31 18:22:40 +08:00
0078c97b19
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 14:27:44 +08:00
9f859b903d
Add custom validator and fix .html_safe with rescue
2012-07-31 14:25:46 +08:00
7e3b59c09a
finished tag clouds
2012-07-31 11:57:32 +08:00
af4865ceb7
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 11:01:11 +08:00
4dea025c8a
fix for
...
1.Announcement 15 per page
2.Search keywords.
3.Redis search index with new code.
2012-07-31 10:59:48 +08:00
45da2971ef
Merge branch 'gallery_orbit' into desktop_harry
2012-07-31 01:16:22 +08:00
17dffb15e1
Major updates for gallery
2012-07-31 01:15:48 +08:00
f3ccbce5c8
Put back impressions for new and bulletin.
...
Add view_count field to tag.
2012-07-30 17:57:55 +08:00
4d7a53866e
Delete remaining impressionist files
2012-07-30 17:45:26 +08:00
bb154f5be6
fix error when creating bulletin and news
2012-07-30 16:38:02 +08:00
4e1a91ed90
Merge branch 'changing_tag'
...
Conflicts:
vendor/built_in_modules/news/app/models/news_tag.rb
2012-07-30 14:43:53 +08:00
effad63c92
make sure no pending news or announcement will be searched out
2012-07-30 14:39:40 +08:00
946ec9306f
first version of tag cloud.
2012-07-30 11:59:20 +08:00
929cd3b0cc
Gallery update..
2012-07-29 18:52:30 +08:00
afa4b7dcb3
Remove cache
2012-07-28 16:06:44 +08:00
a6a8fe3d64
Remove remaining 18n_variables
2012-07-27 19:37:25 +08:00
23854e7adc
Merge branch 'i18n_var' of github.com:Rulingcom/NCCU into i18n_var
...
Conflicts:
app/controllers/pages_controller.rb
app/models/item.rb
app/models/site.rb
config/environments/development.rb
vendor/built_in_modules/announcement/app/models/bulletin.rb
2012-07-27 19:21:39 +08:00
cd6d95204f
Move Impressionist to Gemfile
2012-07-27 19:14:25 +08:00
207b0c5886
Remove i18n_variable for web_resource
2012-07-27 19:12:59 +08:00
30624c0bd8
Fix error in i18n_variable removal for page_content
2012-07-27 19:12:59 +08:00
50813eb57d
Remove i18n_variable for page_content
2012-07-27 19:12:59 +08:00
61c1af7316
Remove i18n_variable for news
2012-07-27 19:12:58 +08:00
8eec7b4dac
Fix announcement for i18n_variable removal
2012-07-27 19:12:58 +08:00
e2ebd48b22
Remove i18n_variable for announcement
2012-07-27 19:12:58 +08:00
d589a1b522
fix for 標題後台為「校園新聞」，前台顯示為「新聞」 該頁面為列表，最上方卻出現「搜尋結果」？ from Mr.張
2012-07-27 07:42:00 +08:00
eed7b78357
fix for loading failed
2012-07-27 05:45:39 +08:00
c0cac812c5
demo site widget
2012-07-26 16:39:29 +08:00
fb1f08327d
fix redis search limit for 10 items
2012-07-26 12:12:43 +08:00
a1cf0a3eb6
Remove i18n_variable for web_resource
2012-07-26 04:10:15 +08:00
3466a19362
Fix error in i18n_variable removal for page_content
2012-07-26 04:10:02 +08:00
4a6b9fbe64
Remove i18n_variable for page_content
2012-07-26 03:47:14 +08:00
e33afc0822
Remove i18n_variable for news
2012-07-26 03:37:07 +08:00
875fad848c
Fix announcement for i18n_variable removal
2012-07-26 03:29:06 +08:00
b9cf5263f6
Remove i18n_variable for announcement
2012-07-26 02:27:43 +08:00
4768da3c7a
fix announcement loading failed caused by impression. disable pinyin search.
2012-07-25 18:26:05 +08:00
584d5d388e
Merge branch 'gallery_orbit' into desktop_harry
2012-07-25 16:21:03 +08:00
8f23755c0d
Gallery update
2012-07-25 16:20:07 +08:00
25f4e292e6
add not found for no result
2012-07-25 13:58:09 +08:00
98fd9223a8
open search for news
2012-07-25 10:42:55 +08:00
397b444390
fix for bugs
2012-07-24 20:58:34 +08:00
f9bdb4a327
New and Announcement search. Disabled impression.
2012-07-20 15:47:40 +08:00
642e0c20ae
Routes conflicts removed
2012-07-19 15:54:04 +08:00
59ab1e6d17
Got gallery update
2012-07-19 15:51:41 +08:00
37f6037333
Gallery started.
2012-07-19 15:44:44 +08:00
10731dc211
demo widget
2012-07-18 18:07:45 +08:00
033667f99b
fix for missing disable category at frontend and widget
2012-07-17 11:26:50 +08:00
a4b1681d39
fix rejection for announcement and news.
2012-07-17 10:21:46 +08:00
87be934aa3
gallery module update
2012-07-16 20:26:04 +08:00
4daf36908c
working cache
2012-07-13 15:36:10 +08:00
85d6bbe1c9
add i18n variable. fix web_links for disable category
2012-07-11 17:56:31 +08:00
ca2c056a07
fix for not displaying bulletin at fronted when it's parent category is disable
2012-07-11 17:17:44 +08:00
ba3d13790c
gallery module update
2012-07-10 17:43:21 +08:00
773371e885
fix from messy search
2012-07-09 16:48:23 +08:00
89446ba796
demo
2012-07-09 16:28:04 +08:00
fce2762ec3
demo
2012-07-09 16:28:04 +08:00
1d8e386bde
demo website widget
2012-07-09 16:28:03 +08:00
09d46f2f75
NCCU 上傳版本 0709
...
Merge branch 'nccu0621'
Conflicts:
Gemfile
config/resque.god
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
2012-07-09 16:02:59 +08:00
49862e70f9
hide category at front end
2012-07-09 12:05:21 +08:00
56caf4b34e
category disable for backend
2012-07-06 18:11:55 +08:00
c5fdff764e
orbit disable object for categories
2012-07-05 16:00:45 +08:00
32480e10ed
en translation
2012-07-04 17:43:52 +08:00
ae2cbb728e
archive for announcement
2012-07-04 17:36:51 +08:00
4fe92b844e
Add sorting order for NCCU request
2012-07-03 15:47:28 +08:00
c0b3798bad
fix for date for qu menu
2012-06-29 11:41:06 +08:00
f66c3d9c0c
fix bugs.
2012-06-29 11:17:35 +08:00
6c4c1046bc
fix date select cause error back to the time of Jesus
2012-06-28 15:19:51 +08:00
58a11ff569
fix javascript for new and anc link removing
2012-06-28 13:50:11 +08:00
243c9e2946
fix relation between bulletin and category (news also)
2012-06-27 15:16:16 +08:00
55449efb35
fix 新聞與公告QA
...
1.優先處理-快速編輯中的檔案上傳無法新增，但可刪除
2.優先處理-編輯中的檔案列表，無法刪除
3.優先處理-刪除時應彈出警告視窗，請user確認一次，再將檔案刪除
2012-06-27 14:21:06 +08:00
4c4929c20a
Fix js for news quick_edit and edit for files
2012-06-27 11:36:18 +08:00
6a4abc6c43
fix news error
2012-06-27 09:59:32 +08:00
83a72bdf6e
fix for announcement
2012-06-26 18:23:44 +08:00
818c58c1ee
fix for 新聞與公告QA
...
1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時，圖片無法正常顯示（但是可以正常被編輯調整並於前台顯示）
2.add 上傳檔案大小限制: 3MB
3.公告的發佈單位為何是顯示單位代碼：M00？應顯示發布單位
2012-06-26 17:46:02 +08:00
df722ba90f
change display of user dept for showing announcement
2012-06-26 16:21:18 +08:00
2b54067ecb
change order of display menu of categories of news_bulletin and bulletin.
2012-06-26 14:28:21 +08:00
56b1bd9eaa
add translation
2012-06-26 10:57:51 +08:00
73fbed8837
fix 1.page_content user empty problem
...
2.add i18n variable for news and announcement
2012-06-26 10:04:40 +08:00
ffd95ee1fd
fix
...
新聞與公告QA-權限設定--優先處理3.一般發佈新聞&公告人，應該只能看到自己發佈的新聞&公告，但是目前可以看到全部，而且可以刪除其他人的公告.至少要不能刪除別人的公告
新聞與公告QA-編輯問題-發佈新聞時，發佈單位預設為請選擇
新聞與公告QA-編輯問題-公告模組請移除 Subtitle 欄位
put rb-readline only in Linux
make app_manager destroy after user deletion. may need to run:
AppManager.all.collect{|am| am if am.user.nil? }.delete_if {|x| x == nil}.each{|am| am.destroy}
for clean up DB.
2012-06-25 16:23:16 +08:00
3f95fe4f13
tmp commit for search. start nccu0621 first
2012-06-22 11:34:10 +08:00
cb17fe0825
Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working
2012-06-20 14:50:51 +08:00
8dd1ab32c1
Add this toolbar, and nccu calendar fix
2012-06-04 16:51:29 +08:00
11247ce84c
Clean up code , cache other auths. Fix sidebar
2012-05-29 17:17:26 +08:00
4f484599b7
Clean up code , cache other auths. Fix sidebar
2012-05-29 15:23:50 +08:00
a663231c8c
Merge branch 'design_team' into ldap
2012-05-25 10:01:41 +08:00
75b67dddf5
Fix date bugs
2012-05-25 09:59:39 +08:00
c062b43069
Merge branch 'design_team' into ldap
2012-05-23 12:11:38 +08:00
7c44e94285
Order list by created_at desc
...
Add best image size in news new
2012-05-23 11:46:19 +08:00
f1c8bed29d
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
2012-05-22 20:33:07 +08:00
d6b92fc604
Fixed bugs for nccu
2012-05-22 20:00:07 +08:00
e0260542d3
fix code
2012-05-22 16:11:52 +08:00
99bcdf6e1e
clean up unless code
2012-05-22 14:59:54 +08:00
79f67208fa
js for preventing user do stupid things durning ajax
2012-05-22 14:59:54 +08:00
27cf99462e
Fix bug in page and news
2012-05-22 14:42:19 +08:00
815e6a8361
Fix matt's code and add it to filters
2012-05-19 03:19:55 +08:00
dc4116bc3d
Fix page hits count
2012-05-19 01:59:17 +08:00
db410b9c50
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-18 19:44:18 +08:00
4d33c7a56d
Changes for dat and time format
...
Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title
2012-05-18 19:42:36 +08:00
661fcafe70
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team
...
Conflicts:
vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
2012-05-18 18:50:10 +08:00
6ce6577e83
fix news approve and preview
2012-05-18 18:47:18 +08:00
6a022c90da
Changes on nccu
2012-05-18 15:20:45 +08:00
7c6b807170
Change impression count to exclude when :referrer is nil
2012-05-18 14:13:11 +08:00
f72d0bc7e0
Merge branch 'design_team' into ldap
2012-05-18 10:51:20 +08:00
d9c12ea5a4
Proof authed_users for case when no category
2012-05-18 10:50:51 +08:00
a4afd5c1d3
Merge branch 'design_team' into ldap
2012-05-18 10:36:32 +08:00
8ad7f70822
Proof i18n_variable for categories
2012-05-18 10:28:28 +08:00
17b6a70506
Merge branch 'design_team' into ldap
2012-05-17 23:36:24 +08:00
16ada34585
fix ad_banner. new ad_image with best size from ad_banner. content editable at tab
2012-05-17 23:35:46 +08:00
1e2b146c21
Merge branch 'design_team' into ldap
2012-05-17 10:00:07 +08:00
4467bc5e48
Change Date to DateTime
...
Fix filename error
2012-05-17 09:59:49 +08:00
eba4671733
Merge branch 'design_team' into ldap
2012-05-17 06:46:29 +08:00
7f2564a81e
Fix sidebar and hide some links by roles
2012-05-17 06:43:39 +08:00
82d78acbad
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
2012-05-17 06:43:39 +08:00
f663985a40
starting ad_banner auth
2012-05-17 06:42:33 +08:00
6b9c8eb15d
Merge branch 'design_team' into ldap
2012-05-17 06:31:57 +08:00
be7ce0bf45
Redmine change's
2012-05-17 06:25:38 +08:00
0b0916179f
Change assets
2012-05-16 11:07:11 +08:00
ab616fc3b5
announcement edit to view file
2012-05-16 01:15:00 +08:00
cc02ea511c
archive checkbox
2012-05-16 01:13:39 +08:00
cf5e6c1a96
new archive
2012-05-16 01:09:21 +08:00
4e9bb1b583
new archive
2012-05-16 01:06:26 +08:00
f950f77f36
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile
app/models/ad_banner.rb
2012-05-15 23:02:22 +08:00
42881553a8
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-15 22:48:40 +08:00
5e9b55e08e
Ray took out 'default' tags
2012-05-15 22:47:28 +08:00
a8c1cbdbba
Add vendor/impressionist
2012-05-15 22:42:49 +08:00
3462c0e319
Add each page name to page_context index
2012-05-15 21:31:54 +08:00
e54f4409fb
Add impressionist
2012-05-15 21:26:09 +08:00
59b55d1574
Merge branch 'design_team' into ldap
2012-05-14 12:42:06 +08:00
9ba4c2cf2f
Change to apply page to had object_auth
2012-05-14 12:40:50 +08:00
ebc8dd33ec
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile.lock
app/controllers/admin/module_apps_controller.rb
app/controllers/application_controller.rb
vendor/built_in_modules/web_resource/web_resource.json
2012-05-14 00:57:17 +08:00
039e837fff
Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
...
Conflicts:
app/views/admin/object_auths_new_interface/_privilege_user.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_category_setting/_modal_list.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_category_setting/setting.html.erb
2012-05-14 00:51:53 +08:00
b804ba4d96
Fix for manager and admin can see all post in announcement. Haven't applied to news
2012-05-14 00:50:36 +08:00
7a6d30ad62
Remove unless files and change routes.
2012-05-14 00:50:36 +08:00
0119ab1a74
New Interface for App Auth and Object Auth
2012-05-14 00:50:12 +08:00
8b42c595b3
Don't display admin in any premission select. Fix not necessary header for UT data
2012-05-14 00:49:22 +08:00
e40c76bf5f
Fix new page form
...
Redirect to home when not authorized
Get only module_apps with app_pages for new and edit page
Change web_resource.json
2012-05-13 23:48:34 +08:00
62e9a772f6
Fix titles for widgets
...
Add translations
2012-05-13 23:09:48 +08:00
4ae8299949
Add custom title to widgets
...
Fix pagination conflict with main_content and widgets
2012-05-13 22:35:00 +08:00
281cfa6518
Changes for widgets
2012-05-13 21:55:39 +08:00
e696516aae
Fix for manager and admin can see all post in announcement. Haven't applied to news
2012-05-11 17:07:21 +08:00
0a34f0277e
Remove unless files and change routes.
2012-05-11 16:46:36 +08:00
20a1a6e30f
New Interface for App Auth and Object Auth
2012-05-11 16:44:40 +08:00
6a443f0976
Add mongoid-tree to Item
2012-05-11 16:16:09 +08:00
63f904d3b0
Fix tinymce js load
...
Change to full_name for page_context index
2012-05-10 20:36:19 +08:00
4f1e47bb82
Don't display admin in any premission select. Fix not necessary header for UT data
2012-05-10 14:43:05 +08:00
87449ec6a8
Merge branch 'design_team' into ldap
2012-05-10 10:34:28 +08:00
07815eee8f
fix display for announcement and remove ut field
2012-05-10 10:29:18 +08:00
99c4e94729
Fix for home_list widget
2012-05-10 10:28:29 +08:00
f13e006e4d
fix display for announcement and remove ut field
2012-05-10 10:27:01 +08:00
64effbd83c
Remove extra widgets declaration
2012-05-10 00:41:32 +08:00
de739d7d20
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/web_resource/web_resource.json
2012-05-10 00:34:23 +08:00
bc5e975fab
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-10 00:29:22 +08:00
13587306bc
Add list widgets for announcement, news and links with categories and tags
2012-05-10 00:25:30 +08:00
6727f27181
Change for 0509 Nccu check
2012-05-09 16:58:12 +08:00
9a6b66c57d
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509
2012-05-09 15:54:59 +08:00
93946c37f4
fix wrong link
2012-05-09 15:54:00 +08:00
a9c241658a
Repeat code for news module
2012-05-09 15:28:02 +08:00
c82d701b55
Permission setting for announcement for bulletin cate
2012-05-09 15:28:02 +08:00
618e4f4047
Repeat code for news module
2012-05-09 15:22:15 +08:00
1785da51a2
Merge branch 'design_team' into ldap
2012-05-09 15:04:06 +08:00
50edfdd02f
Changes for tag key in side_bar announcement and news, fix ad_banner css for dot
2012-05-09 14:59:06 +08:00
71a5731fe8
Permission setting for announcement for bulletin cate
2012-05-09 14:54:20 +08:00
d88d4e58dc
Merge branch 'design_team' into ldap
...
Conflicts:
config/environments/development.rb
2012-05-09 13:51:00 +08:00
9ead6cafda
Ray's changes
2012-05-09 04:15:02 +08:00
23d2d9a81e
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 17:36:35 +08:00
41424d2829
Fix error in front-end announcement index
2012-05-08 17:40:14 +08:00
ef9afca19f
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 17:28:05 +08:00
55bfaea43e
Can show announcement and news list by tag's key
2012-05-08 17:27:42 +08:00
d2e07f537a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 17:24:40 +08:00
a3868cb785
Ray's changes for front-end banner
2012-05-08 17:21:26 +08:00
7603cb91ad
Change subrole's context from code to text at approval setting.
2012-05-08 16:21:10 +08:00
caba8ce7a4
Add nccu icon
...
Change news list in front-end
Hide links and files in news and announcement front-end show when nothing
2012-05-08 15:27:43 +08:00
2b9190a49e
Merge branch 'design_team' into ldap
...
Conflicts:
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-05-08 11:40:38 +08:00
ba4385e3fd
Add module authorization for news
...
Add files and links to announcement and news
Change page.children into page.ordered_and_visible_children in parser_commom
2012-05-08 10:50:09 +08:00
2aaff21000
Add missing class in widget news_bulletin/index
2012-05-07 23:23:17 +08:00
ca88d0e01b
Fix bug that was never displaying preview
2012-05-07 17:29:56 +08:00
4c7a3842d6
Add drop_down to news_bulletin widget index for categories
2012-05-07 15:58:52 +08:00
48f8fbde7f
Fix site_locale_default_head and active for current locale
2012-05-07 00:53:52 +08:00
f190ce18ee
Put sorting in web_link, page_context and design
2012-05-05 21:20:20 +08:00
b48099d752
Fix bug in is_admin?
...
Fix bug in helpers for news and announcement
2012-05-05 17:40:07 +08:00
8e6fd277c2
Fix bug: preview was always true
2012-05-04 19:02:40 +08:00
e9b337a385
Copy changes into news after merge
2012-05-04 18:49:07 +08:00
119d8ff13a
add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data.
2012-05-04 15:50:45 +08:00
048ce4c97e
disable input
2012-05-04 15:50:45 +08:00
453cb21066
Announcement preivew
2012-05-04 15:50:45 +08:00
f427c3803f
clean up useless flash msgs. add i18n vars for app auth and object auth
2012-05-04 15:40:43 +08:00
05ded8de03
Fix for NCCU 0430 all functions ok with two submanagers but different behavors
2012-05-04 15:38:18 +08:00
92a53c1b27
Ray's fix
2012-05-02 16:20:59 +08:00
20504b2205
Merge branch 'design_team' into ldap
...
Conflicts:
app/controllers/admin/page_parts_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
2012-04-30 07:57:20 +08:00
b8f52fa1ec
Separate announcement and news
2012-04-30 06:31:46 +08:00
63ee8eaca9
Remove url from sorting
...
Add sorting_options to params in filters
2012-04-30 06:30:52 +08:00
32faef0c70
DRY code for sorting
2012-04-30 06:30:52 +08:00
a46a8898d7
Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
2012-04-30 00:24:11 +08:00
382932036d
Hide Approval button when bulletin is checked.
2012-04-30 00:24:11 +08:00
c4db7e2157
Fix approval setting ajax problem
2012-04-30 00:24:11 +08:00
94d61abf83
A modal view for approval user
2012-04-30 00:24:10 +08:00
851dc72f42
Ray's changes in css and html
2012-04-30 00:17:18 +08:00
2362e1cfdd
Merge branch 'design_team' into ldap
2012-04-27 15:28:32 +08:00
bf2c89da54
Add sorting to web_links
2012-04-27 14:20:09 +08:00
3beb035101
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-27 11:11:56 +08:00
5aca3db95f
Ray's changes for structure and web_links
2012-04-27 11:02:56 +08:00
7d6b82d9dd
Merge branch 'ad_banner' into ldap
2012-04-26 17:15:44 +08:00
3d293f6419
Fix for quick edit file and link in announcement
...
Change submit_button into ajax_for_submit
2012-04-26 16:42:28 +08:00
1f4fe65430
Merge branch 'design_team' into ldap
...
Conflicts:
app/views/devise/sessions/new.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
2012-04-25 16:45:04 +08:00
876036dd20
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/views/admin/ad_banners/_ad_banner_tab.html.erb
2012-04-25 16:39:26 +08:00
44ded537b3
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-25 16:28:34 +08:00
65a6f9c416
Ray's css fix for quick edit
2012-04-25 16:26:27 +08:00
a704a054cc
Remove useless files
2012-04-25 16:10:11 +08:00
8adb9c6878
Merge branch 'design_team' into ldap
2012-04-25 15:10:50 +08:00
3ec8bb7be6
Fix assets bug: when having a '.' in the name, the extension must be specified
2012-04-25 15:10:28 +08:00
c65213c4f1
Merge branch 'design_team' into ldap
2012-04-24 17:10:34 +08:00
dc07964bc3
Fix js bug after Matt's changes in 'approval'
2012-04-24 17:10:23 +08:00
0c4f1d91f7
Merge branch 'ad_banner' into ldap
2012-04-24 16:46:04 +08:00
a47ef5cfe8
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
2012-04-24 16:45:13 +08:00
db46803cda
R4-Billingual
2012-04-24 16:43:45 +08:00
d1f687e43e
Merge branch 'design_team' into ldap
2012-04-24 16:32:30 +08:00
c7d8e0b27b
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
2012-04-24 16:32:00 +08:00
17e55b9805
Merge branch 'design_team' into ldap
2012-04-24 16:25:58 +08:00
9f6c9156c6
Spen patch for nccu
2012-04-24 16:25:30 +08:00
291d5e3a03
Ray's changes in css
2012-04-24 16:24:50 +08:00
d0ced39c74
R4-Billingual
2012-04-24 16:06:42 +08:00
70f6c7b540
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
2012-04-24 15:28:52 +08:00
d247f05d2e
Add missing translations in announcement and change announcement behavior for passed and rejected
2012-04-24 15:27:46 +08:00
c0abaa643c
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-24 15:21:12 +08:00
45c194e870
Ray's changes in css
2012-04-24 15:15:36 +08:00
e7bb9ea86b
Fix ad image date selector
2012-04-24 14:37:06 +08:00
c856b4cdce
Fix for upload image component in announcement
2012-04-24 12:41:28 +08:00
8041452be5
Fix for translation in sort headers for announcement
2012-04-24 11:05:01 +08:00
308cfc7cf2
Merge branch 'design_team' into ldap
...
Conflicts:
app/views/devise/sessions/new.html.erb
2012-04-24 02:46:06 +08:00
6831a3dbbb
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-24 02:44:39 +08:00
0c4328987a
Ray's changes for css files, sort headers in announcement and pagination
2012-04-24 02:37:51 +08:00
d4aea664e2
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
2012-04-24 02:37:03 +08:00
a748ccaac7
Patch from ldap for announcement translation
2012-04-24 02:33:35 +08:00
db1b84e962
Fix bug where an rejected announcement could still be edited by url
2012-04-24 00:58:56 +08:00
6130f8b1e4
Fix errors in status filter in announcement
2012-04-24 00:53:05 +08:00
b502bedd0f
Fix filter and sort for status in announcement
2012-04-24 00:46:34 +08:00
4f87165039
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
2012-04-23 18:10:16 +08:00
a8eeaf235f
Add Announcement translation
2012-04-23 15:28:56 +08:00
5a423178e3
Merge branch 'design_team' into ldap
...
Conflicts:
app/assets/stylesheets/new_admin.css.erb
app/assets/stylesheets/widget.css
2012-04-23 15:16:50 +08:00
1ebf460f7e
Fix 'loading fail' in front-end for announcement
...
The show action was returning an array instead of a bulletin
2012-04-23 14:47:33 +08:00
fe9032787c
NCCU ldap debug
2012-04-23 10:13:44 +08:00
7e355b77c2
Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap
...
Conflicts:
Gemfile
Gemfile.lock
app/views/admin/attributes/_app_selector.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/pages/_app_selector.html.erb
config/application.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-04-19 14:31:05 +08:00
f55b3a4374
Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap
...
Conflicts:
Gemfile
Gemfile.lock
app/views/admin/attributes/_app_selector.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/pages/_app_selector.html.erb
config/application.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-04-19 14:06:00 +08:00
198825a309
Merge branch 'master' into ldap
...
Conflicts:
Gemfile
Gemfile.lock
app/views/admin/attributes/_app_selector.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/pages/_app_selector.html.erb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-04-12 18:50:48 +08:00
167f6d07a0
Remove extra "]"
2012-04-12 18:13:26 +08:00
e4c41ab54c
A filter UI for permission select. with Harry's JS
2012-04-12 07:14:06 +08:00
0909156eb4
fix i18n var for fact check pending
2012-04-12 07:14:06 +08:00
1fd38c8135
factcheck status for and
2012-04-12 07:14:06 +08:00
5417c6fec0
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
2012-04-12 07:13:13 +08:00
7bca339a5b
Ray's fix for columns width in bulletins
2012-04-12 07:01:34 +08:00
486845460c
Filter and delete for bulletins
2012-04-12 06:50:36 +08:00
963a0cb604
Change filter to js with history for bulletins
2012-04-07 00:20:52 +08:00
01bda515a6
fact_check with Ray's permission check.
...
needs Ray's new css
2012-04-05 17:41:43 +08:00
4da03026a4
Fix pagination bug in bulletins
2012-04-05 15:28:43 +08:00
5f5871d1c2
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
2012-04-05 15:24:39 +08:00
d45725cf3b
fix announcement & add lang tab
2012-04-05 15:23:20 +08:00
9382ef6ae8
Merge branch 'dashboard' of https://github.com/Rulingcom/orbit into dashboard
...
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
2012-04-05 15:16:33 +08:00
1259d62249
Fix mainTablePosition in js -> remove the notable class
2012-04-05 14:55:41 +08:00
ccb0110b77
fix announcement & add lang tab
2012-04-05 14:48:31 +08:00
7bf50d6c52
Move the audit block to the bottom
2012-04-05 14:08:03 +08:00
9c1c70b598
Fix sorting in annoucement
2012-04-02 02:55:36 +08:00
503f71e554
Ray's changes in tags, css and js
2012-04-02 02:55:36 +08:00
6c50aa5243
Add pagination to bulletin index and remove ajax to make it simple
2012-04-02 02:55:36 +08:00
c645c1b5df
Remove extra code in bulletin form
2012-03-28 10:51:14 +08:00
172d3d7847
Remove bad references to NewBlog
2012-03-27 19:42:07 +08:00
212730fd8a
Add missing end tag in bulletin _form
2012-03-27 19:37:47 +08:00
b587b7ca6b
Remove limit(1) to bulletins index action
2012-03-27 19:22:50 +08:00
50be40f7b3
Ray's changes in announcenment back-end
2012-03-27 19:10:35 +08:00
1e60acaa11
Fact check program completed,Lin checked
2012-03-27 19:06:28 +08:00
cf297fc424
Changed inherited controller in module_apps to OrbitBackendController
2012-03-27 18:58:04 +08:00
b134e690e9
Delete new_blog
2012-03-27 18:58:04 +08:00
07ba457dd7
admin now can post without fact check
2012-03-27 18:58:03 +08:00
55d12e50f2
Ray's changes in announcenment back-end
2012-03-27 18:58:03 +08:00
97adf94e15
fix with what ray needs for the fact_check form
2012-03-27 18:56:18 +08:00
3ba89ecbcf
Fact check program completed,Lin checked
2012-03-27 18:54:03 +08:00
f9c5ee5d18
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/assets/javascripts/bulletin_form.js.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
vendor/built_in_modules/announcement/config/routes.rb
2012-03-27 18:37:14 +08:00
e8d1352890
fix announcement
2012-03-27 14:29:11 +08:00
33955b4554
Delete files with Chinese characters in name
2012-03-27 14:21:32 +08:00
c4299245de
Delete files with Chinese characters in name
2012-03-27 14:19:58 +08:00
a30bc499c7
fix announcement & links
2012-03-27 14:19:58 +08:00
7765f0d2e1
Delete files with Chinese characters in name
2012-03-27 14:17:48 +08:00
74636fb16d
Delete file with Chinese character in the name
2012-03-27 14:16:04 +08:00
f37eb5bf43
Add missing file
2012-03-23 18:27:41 +08:00
42519d9f78
fix announcement & links
2012-03-23 18:04:11 +08:00
61698f3f2c
Remove quick_edit on bulletin index load
2012-03-23 17:32:59 +08:00
9f9d0f5bff
Merge branch 'design_team' into ldap
2012-03-21 13:13:01 +08:00
0e8f8b3424
Add missing category when redirect to front-end for bulletin back-end index
2012-03-21 12:58:13 +08:00
2c6208db3c
Merge branch 'master' into ldap
2012-03-21 12:44:22 +08:00
3aa7c5120d
Put tinymce in its own js file.
...
To use on a text area just add the class "tinymce_textarea".
2012-03-21 12:41:32 +08:00
5d7202af8b
Modify bulletin back-end index to show announcement in front-end
2012-03-21 12:37:52 +08:00
c4d541d3b9
Remove code from back_end/bulletins/show
2012-03-21 12:36:52 +08:00
47215693c4
Merge branch 'master' into ldap
...
Conflicts:
Gemfile
Gemfile.lock
config/application.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-03-19 14:27:15 +08:00
6700114955
after merge
2012-03-19 10:55:58 +08:00
9c8b0235b0
add new files
2012-03-19 10:55:58 +08:00
a755eb184b
fix announcement links & files
2012-03-16 16:49:25 +08:00
7d553acaec
fix announcement link & files
2012-03-16 15:53:57 +08:00
f4fda08e86
Replace PrototypeR4 by Orbit.
...
Move session into mongoid_store.
Reset session when sing_in.
2012-03-16 14:58:32 +08:00
785ead5209
Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
...
Conflicts:
app/views/layouts/_side_bar.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
2012-03-16 14:55:21 +08:00
6f6e84b015
fix dashboard & announcement
2012-03-16 14:44:57 +08:00
b6d49df145
Change Obit to Orbit
2012-03-16 11:54:31 +08:00
13b6892f87
code for new fact check
2012-03-16 11:09:44 +08:00
00ab773942
fix dashboard & announcement
2012-03-14 20:05:03 +08:00
79c8b3861b
Fix link in widget
2012-03-07 18:16:59 +08:00
4dd9b7ffa4
Fix announcement pagination in front-end
2012-03-07 18:16:59 +08:00
0b1f83c042
Fix extra loaded js: the widgets only need to render layout when they need js.
2012-03-07 18:16:59 +08:00
d5a2de5476
LDAP with sync rake task
2012-03-06 16:41:06 +08:00
7f05f21930
Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
...
Conflicts:
config/environments/development.rb
2012-03-01 10:13:49 +08:00
7c55f6fb88
Merge branch 'announcement_dev_view_and_auth' of github.com:Rulingcom/orbit into announcement_dev_view_and_auth
...
Conflicts:
config/environments/development.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/announcements_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/models/bulletin.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb
vendor/built_in_modules/announcement/config/routes.rb
vendor/built_in_modules/web_resource/lib/tasks/web_resource_tasks.rake
2012-02-29 19:03:29 +08:00
cceb785a8d
change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.
2012-02-29 18:58:33 +08:00
2e58c63ff7
fix bugs with token
2012-02-29 18:56:42 +08:00
cc550c5745
First version for App and Object auth.Taking Announcement as experiment
2012-02-29 18:55:55 +08:00
devin
Harry Bomrah
Christophe Vilayphiou
Matthew K. Fu JuYuan
Matt
Fu Matthew
unknown
Christophe Vilayphiou
nccu
Matthew Kaito Juyuan Fu