17ac564fbb
Fix sitemap nil
...
Fix namespace of role in subrole
2013-02-19 17:39:43 +08:00
61648d23e1
Change delete_all to destroy_all
2013-02-19 17:39:42 +08:00
7105f103e1
Task to delete settings for old version of default widget
2013-02-19 17:34:39 +08:00
0b88f7d1f8
deliver app config. fix wrong value cause error for default widget
2013-02-19 14:21:54 +08:00
0a115906f1
fix i18n,reload problems
2013-02-19 14:21:54 +08:00
9771d42587
migrate for app config. fix panel style intro misplace
2013-02-04 18:10:39 +08:00
bbd30759f5
fix web resource frontend page
2013-02-04 18:01:42 +08:00
fc702a6210
add front-end page for web_resource
2013-01-24 13:54:14 +08:00
979df9ac80
daily commit
2013-01-23 18:51:18 +08:00
46b1d55ff6
Complete new interface
2013-01-14 18:49:23 +08:00
5ab4bbd367
add ad_banner inner page,pic title.
2013-01-09 16:54:33 +08:00
b71ebb3982
clean default widget
2013-01-07 17:20:37 +08:00
5793f0fe5d
default widget link.
...
make sure to run
rake migrate:make_default_widget_work_config
for changing announcement module app
2013-01-07 17:20:37 +08:00
39f715319b
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
...
Conflicts:
lib/tasks/migrate.rake
2013-01-03 19:41:52 +08:00
a70110f787
make default widget works without init
2013-01-03 19:38:14 +08:00
fa83dbf791
Fix order in structure
2013-01-03 19:15:08 +08:00
5d6279a9ea
fix calendar broken
2013-01-03 10:58:52 +08:00
641b5310b0
fix NTU album module_app data
2013-01-02 16:04:11 +08:00
32c6f17613
fix object auth. show error message if user try to do object auth in a wrong way.
2013-01-02 14:34:34 +08:00
baf1240b76
gallery options
2012-12-28 15:30:46 +08:00
2d6b70b97f
regenerate pageparts
2012-12-27 15:50:05 +08:00
fcbba6660b
Only one parser for front end
...
Separate site map for i18n
2012-12-19 17:15:31 +08:00
77386f0284
disable data transform when switching attribute field type. new member stable
2012-11-22 21:10:35 +08:00
475642d375
Remove news and fix default_url in ImageUploader
2012-11-22 09:30:25 +08:00
192e52b5de
Remove middle site
2012-11-20 10:06:07 +08:00
eaf465525a
rake update
2012-11-06 12:35:15 +08:00
65ac6980c4
Merge branch 'various_bugs' into nccu_master
...
Conflicts:
Gemfile.lock
app/assets/javascripts/ajax_form.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/application_controller.rb
app/controllers/sessions_controller.rb
app/helpers/admin/web_link_helper.rb
app/views/admin/attributes/_attribute_field.html.erb
app/views/admin/designs/_form.html.erb
app/views/admin/pages/_form.html.erb
app/views/admin/sites/_side_bar.html.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
config/locales/en.yml
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
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/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-10-29 16:10:07 +08:00
bd0d975014
for user new interface, member role is working.
2012-10-26 11:27:37 +08:00
d7fd61ce55
Edit uploaded package
2012-10-26 11:19:57 +08:00
38e6d6c2c8
add rake task
2012-10-16 15:43:31 +08:00
6dfe10040b
fix object auth without app_auth
2012-10-16 14:23:44 +08:00
d027cf8e6a
add new data from NCCU
2012-10-09 14:40:28 +08:00
9f825de288
user new interface 70%
2012-10-09 06:40:18 +08:00
89b1aace8a
fix for rescue job failed on 171
2012-10-08 16:42:49 +08:00
4a5fc47c0a
NCCU maintenance rake task
2012-10-08 10:35:11 +08:00
54b874b2c9
fix nccu login
2012-09-25 15:07:07 +08:00
87e2510d02
add rake task for rebuild index
2012-09-24 18:46:38 +08:00
19db9d0037
basic function
2012-09-17 13:32:52 +08:00
df6c7afd68
add data_migration for rename field for attribute_field. not yet tested
2012-09-14 00:02:22 +08:00
5fb94f644d
break down Ray's HTML
2012-09-14 00:02:22 +08:00
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
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
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
f76b1c02b5
first version of mid_site_sync for new i18n var
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
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
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
4daf36908c
working cache
2012-07-13 15:36:10 +08:00
edef51d58c
DM for archive bulletin categroy
2012-07-04 17:56: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
3480fa2545
Fix login and label. Check sync jobs and update info function.
2012-05-24 17:01:00 +08:00
6a022c90da
Changes on nccu
2012-05-18 15:20:45 +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
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
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
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
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
fe9032787c
NCCU ldap debug
2012-04-23 10:13:44 +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
717e50a25e
Add rake task for layout with nokogiri
2012-03-27 19:00:03 +08:00
13b6892f87
code for new fact check
2012-03-16 11:09:44 +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
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
cc550c5745
First version for App and Object auth.Taking Announcement as experiment
2012-02-29 18:55:55 +08:00
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
f13ebc6c46
Fix bugs and changes for nccu
2012-02-27 18:50:56 +08:00
3209f9aa27
Complete for 229 check.
2012-02-24 19:07:47 +08:00
9cd3cbc478
Modifications for design, pages, page_parts…
...
Move orbit_bar out of kernel.js
2012-02-17 02:09:32 +08:00
e61aa6b210
Modify dev.rake to create the ModuleApp object for web_recsource
2012-02-16 13:28:51 +08:00
e0accbecaa
Changes into page_part edition.
...
Can choose between 'text', 'public_r_tag' and 'widget'
2012-02-16 13:09:09 +08:00
0af37c0688
Add rake task for ad_banner. Will have ad_banner at dev:build
2012-02-04 09:37:23 +08:00
762c2f5e8a
Add key in module_app.rb to use instead of title for authorization
2012-01-30 18:12:18 +08:00
7f999f20ab
Modify rake.dev for new design structure
2012-01-30 15:45:55 +08:00
chris
Fu Matthew
Matthew K. Fu JuYuan
Harry Bomrah
Matt
nccu
Matthew Kaito Juyuan Fu
Christophe Vilayphiou