0a3a140b18
Fix migration bug
2012-09-11 16:32:20 +08:00
73e48aebc6
Change news subtitle to textarea, no tinymce
2012-09-11 15:40:27 +08:00
6044857fea
complete preview for both new and announcement
2012-09-07 17:55:59 +08:00
671f86b612
First version of new preview. Only plain text
2012-09-04 12:31:27 +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
84ad9dd724
Fix ab_banner display
2012-08-15 16:34:00 +08:00
4e3dc7c438
Fix ab_banner display
2012-08-15 16:08:47 +08:00
39604d30ce
Fix ab_banner display
2012-08-15 14:58:43 +08:00
905844f7bb
Typo
2012-08-15 10:24:47 +08:00
18e18a4add
Fix for banner on ie
2012-08-13 15:10:53 +08:00
2ea3193879
Fix for banner link
2012-08-13 11:03:11 +08:00
33fc96ac7c
Changes for NCCU after email
2012-08-11 18:19:30 +08:00
e8317e0a4b
1.Remove category column when category is specified
...
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
2012-08-08 14:46:08 +08:00
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
c4e12ff347
Add missing class to ad_banner for link
2012-08-03 13:55:22 +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
f092aff9e9
Fix for data_migration but there's still a bug with red is, the red is code has to be commented out to run the rake task
2012-08-01 02:43:06 +08:00
c951cc6b6f
Fix for data_migration
2012-08-01 00:58:59 +08:00
b989f458d3
Do not show news/anc if no context.
2012-07-31 18:22:40 +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
39b63a970c
Fix .class to .class.to_s
2012-07-30 18:34:54 +08:00
7440727acd
Fix: "._type" to ".class"
2012-07-30 17:21:37 +08:00
f76b1c02b5
first version of mid_site_sync for new i18n var
2012-07-27 19:13:40 +08:00
a8cc581279
Sitemap done for backend and fronted
2012-07-27 19:13:40 +08:00
ad3ec43a00
Remove comments in migrate task
2012-07-27 19:13:39 +08:00
804695749d
Fix bugs after removal of i18n_variable
2012-07-27 19:13:39 +08:00
780386d7f1
Remove i18n_variable for parser
2012-07-27 19:13:39 +08:00
49dd3a1770
Remove i18n_variable for controllers, helpers and models
2012-07-27 19:13:39 +08:00
327996a7b0
Task part for i18n_variable removal for web_resource
2012-07-27 19:12:59 +08:00
207b0c5886
Remove i18n_variable for web_resource
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
e2ebd48b22
Remove i18n_variable for announcement
2012-07-27 19:12:58 +08:00
7c3cc30784
fix for rake encoding
2012-07-26 16:58:17 +08:00
c0cac812c5
demo site widget
2012-07-26 16:39:29 +08:00
30cc3431b9
rename sub roles
2012-07-26 14:12:52 +08:00
397b444390
fix for bugs
2012-07-24 20:58:34 +08:00
834fcddc52
Add data migration for search widget for news and announcement.
2012-07-20 16:30:43 +08:00
f9bdb4a327
New and Announcement search. Disabled impression.
2012-07-20 15:47:40 +08:00
10731dc211
demo widget
2012-07-18 18:07:45 +08:00
4daf36908c
working cache
2012-07-13 15:36:10 +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
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
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
f635f642fc
Merge for new timeline updates and font updates
2012-07-04 18:49:10 +08:00
edef51d58c
DM for archive bulletin categroy
2012-07-04 17:56:51 +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
4014f8ee47
fix over queue at resque
2012-07-03 10:51:26 +08:00
a1e74987dc
Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry
...
Conflicts:
Gemfile.lock
app/assets/javascripts/.DS_Store
app/assets/stylesheets/style.css.erb
app/views/layouts/_orbit_bar.html.erb
2012-06-29 16:10:29 +08:00
8c7a0fdf0a
test
2012-06-26 16:59:29 +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
7f0267aedd
have both sinatra and rails running.. just change the routes to use rails or sinatra.. tried using a lot of gems but failed to use devise variables
2012-06-04 18:00:06 +08:00
8dd1ab32c1
Add this toolbar, and nccu calendar fix
2012-06-04 16:51:29 +08:00
3480fa2545
Fix login and label. Check sync jobs and update info function.
2012-05-24 17:01:00 +08:00
f1c8bed29d
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
2012-05-22 20:33:07 +08:00
dd4c1697cd
Fix bug when object_auth was only built but not created
2012-05-22 16:52:12 +08:00
361722f252
fix orbit core to adopt current user behavior
2012-05-22 14:59:54 +08:00
6a022c90da
Changes on nccu
2012-05-18 15:20:45 +08:00
eba4671733
Merge branch 'design_team' into ldap
2012-05-17 06:46:29 +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
f950f77f36
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile
app/models/ad_banner.rb
2012-05-15 23:02:22 +08:00
77deffb512
Nccu calendar and daily job.
2012-05-15 14:03:54 +08:00
551e1ef740
Reflect login method. LDAP,MidSite connection. The Mysql connection now is build on fly.
2012-05-15 11:28:24 +08:00
8fcb8ef8de
Change the way links are displayed in menus in front-end
2012-05-14 21:43:10 +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
1ecdb91778
Merge branch 'design_team' into ldap
2012-05-14 09:31:44 +08:00
f0dd1eb871
Fix designs.rake
2012-05-14 09:30:49 +08:00
9837f8eae7
Merge branch 'design_team' into ldap
2012-05-14 09:07:36 +08:00
33e3821e61
Rake task to change design_ids
2012-05-14 08:59:53 +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
0119ab1a74
New Interface for App Auth and Object Auth
2012-05-14 00:50:12 +08:00
cf8d20dc84
Add category and tag to pages
2012-05-14 00:33:52 +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
4685952bd6
Changes in page_edit
2012-05-13 20:13:26 +08:00
82fa85def8
Clean the parsers code
2012-05-13 19:32:05 +08:00
17b486f9e9
Fix bugs for shift_to and change items.rake for the missing position in db
2012-05-11 17:56:26 +08:00
6a443f0976
Add mongoid-tree to Item
2012-05-11 16:16:09 +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
13587306bc
Add list widgets for announcement, news and links with categories and tags
2012-05-10 00:25:30 +08:00
d88d4e58dc
Merge branch 'design_team' into ldap
...
Conflicts:
config/environments/development.rb
2012-05-09 13:51:00 +08:00
909ca19456
Fix bugs in sub_menu
2012-05-09 04:31:04 +08:00
9ead6cafda
Ray's changes
2012-05-09 04:15:02 +08:00
8d70d87120
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-09 04:13:14 +08:00
26a50cc862
Add sub_menu to children
2012-05-09 04:15:45 +08:00
a186ae08d8
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 21:47:03 +08:00
49e2eb0187
Add class 'active' in the menu for current page
2012-05-08 21:46:24 +08:00
c28d7d59b6
starting Resque
2012-05-08 20:21:28 +08:00
083963af65
Test version for DB sync schedule job
2012-05-08 19:20:53 +08:00
5c7cf1aef2
Add sub_menu to site_info
2012-05-08 17:27:02 +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
65a0998080
Merge branch 'jobs_and_mail' into ldap
...
Conflicts:
config/environments/development.rb
config/routes.rb
2012-05-08 11:45:34 +08:00
7339d1ee4a
starting Resque
2012-05-08 11:41:58 +08:00
Christophe Vilayphiou
Fu Matthew
Matthew K. Fu JuYuan
unknown
Harry Bomrah
Joshua Milton
Matt
Christophe Vilayphiou