572e512a1d
fix link for default widget
2013-02-19 14:21:54 +08:00
0a115906f1
fix i18n,reload problems
2013-02-19 14:21:54 +08:00
71d5abae2e
first version of app config and modified inits.
2013-01-29 20:33:40 +08:00
bfaa22052f
Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config
...
Conflicts:
app/controllers/admin/page_parts_controller.rb
app/controllers/default_widget_controller.rb
app/uploaders/gprs_uploader.rb
app/uploaders/location_uploader.rb
app/views/admin/page_parts/_module_widget.html.erb
app/views/admin/page_parts/reload_widget_styles.js.erb
app/views/admin/page_parts/reload_widgets.js.erb
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
lib/parsers/parser_front_end.rb
vendor/built_in_modules/announcement/init.rb
vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js
vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css
vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb
vendor/built_in_modules/location/README.rdoc
vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js
vendor/built_in_modules/location/app/assets/javascripts/panel/location/back_end/locations.js
vendor/built_in_modules/location/app/assets/stylesheets/panel/gprs/back_end/locations.css
vendor/built_in_modules/location/app/assets/stylesheets/panel/location/back_end/locations.css
vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb
vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb
vendor/built_in_modules/location/app/models/location.rb
vendor/built_in_modules/location/app/uploaders/locations_uploader.rb
vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/_form.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/edit.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/index.html.erb
vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/new.html.erb
vendor/built_in_modules/location/config/routes.rb
vendor/built_in_modules/location/lib/location.rb
vendor/built_in_modules/location/location.gemspec
vendor/built_in_modules/location/test/functional/panel/gprs/back_end/locations_controller_test.rb
vendor/built_in_modules/location/test/functional/panel/location/back_end/locations_controller_test.rb
2013-01-24 16:30:02 +08:00
979df9ac80
daily commit
2013-01-23 18:51:18 +08:00
e1e003af6e
Complete new interface
2013-01-14 19:18:25 +08:00
504f5027cc
member role edit
2013-01-14 19:00:08 +08:00
758cab5ecd
move journal code to persional_journal modulaar
2013-01-14 17:53:59 +08:00
84e4a558be
member roles edit
2013-01-14 17:02:51 +08:00
e24f7a7880
Put back some field so ad_image can work
2013-01-10 11:08:57 +08:00
1c1839fc00
Remove useless code in de_image.rb
2013-01-09 21:17:50 +08:00
81d4481797
Merge commit '5b13c53ed99858f69d19bd03fe1a6bb74071a007' into sidebar_config
2013-01-08 14:18:04 +08:00
76296ab29b
Merge branch 'sidebar_config' into ntu
...
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/controllers/orbit_backend_controller.rb
app/controllers/orbit_widget_controller.rb
app/models/module_app.rb
app/views/admin/page_parts/_module_widget.html.erb
config/locales/zh_tw.yml
lib/parsers/parser_common.rb
lib/parsers/parser_front_end.rb
2013-01-08 14:17:21 +08:00
e3d34263e3
Schedule job for tag_cloud
2013-01-08 12:36:50 +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
a34da20e48
Merge branch 'master' into desktop
...
* master: (57 commits)
Add translations
Add mobile version in site settings
Add mobile but remove news in it
Remove mysql
Fix album widget options
Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end
Add link to default widget (temporary)
Ika's fix for width
Ika's fix for width
Gallery i18n
Ika's changes for css default widgets
Ika's changes for css default widgets
change bulletin object to bulletin title
fixing default widget error when needs image
make default widget works without init
Fix order in structure
Fix old tags
correct pic file format
complete page error handler logic
change sub_menu to header in site setting
...
2013-01-07 16:44:05 +08:00
35e0011111
Merge remote-tracking branch 'remotes/origin/publication' into desktop
...
* remotes/origin/publication:
new desktop framework updates
2013-01-07 12:44:30 +08:00
6c6bda988d
Add mobile version in site settings
2013-01-07 03:57:36 +08:00
c6111460f5
Fix album widget options
2013-01-07 00:40:43 +08:00
49e289e0fd
fixing default widget error when needs image
2013-01-03 20:07:05 +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
5587e83419
Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
2012-12-28 15:31:32 +08:00
baf1240b76
gallery options
2012-12-28 15:30:46 +08:00
37309a452d
Fix site map and menu order
2012-12-28 11:37:37 +08:00
bab8328029
Put back old tags (don't use the class ProtoTag)
2012-12-28 10:43:48 +08:00
Harry Bomrah
37f8c1637a
new desktop framework updates
2012-12-27 18:25:54 +08:00
269e5b033f
Fix for page_part and widget back-end
2012-12-27 16:20:40 +08:00
2d6b70b97f
regenerate pageparts
2012-12-27 15:50:05 +08:00
2dd0f9a9d2
fix disappear widget inter block
2012-12-27 15:06:01 +08:00
062ebecae3
fix serval bugs on sidebar.
2012-12-24 16:39:53 +08:00
5f712622ad
default widgets and sidebar.
2012-12-24 16:38:35 +08:00
6995bb1622
put module app json into init,making orbit app work with module app.
2012-12-24 16:23:16 +08:00
b4633a2ccb
.not_guest_user
2012-12-19 19:48:13 +08:00
3d39c2c3c3
hidden guest user
2012-12-19 19:48:13 +08:00
ec1fad9729
fixed empty name of member list
2012-12-19 19:48:13 +08:00
fcbba6660b
Only one parser for front end
...
Separate site map for i18n
2012-12-19 17:15:31 +08:00
ff435a4af4
Change the design for the whole site form designs index
2012-12-07 12:14:31 +08:00
6f1748d2b3
- template list/show is loaded from central server
...
- buy a template downloads and creates it in DB
- changes in designs index
2012-12-06 23:20:27 +08:00
e0e1c30f68
delete onside widget in db
2012-12-06 07:59:42 +08:00
7d3c535e01
add info field
2012-12-06 07:58:39 +08:00
58e71c29b3
uniq relation
2012-12-04 00:31:46 +08:00
9759a32394
can display relation between author
2012-12-04 00:31:46 +08:00
e143f9a345
can select relection from relation db
2012-12-04 00:31:46 +08:00
7822ffc33d
can add relation between co-author
2012-12-04 00:31:06 +08:00
eb97d417bd
if coauthor not in coauthor db then it will be add in db
2012-12-04 00:31:06 +08:00
dc3be3c9a1
Translation changes
2012-12-03 23:00:04 +08:00
9254b9960d
Add timeout to user
2012-12-03 21:45:00 +08:00
4f9aa63045
Remove extra end
2012-12-03 18:45:32 +08:00
5c7f1aa164
Fix saving of page_part after layout change
2012-12-03 18:42:50 +08:00
2757044c32
Forgot to save the page_parts
2012-12-03 17:49:26 +08:00
bdcfb46294
Fix previous commit
2012-12-03 17:38:55 +08:00
6543491a53
Save pages to generate page_parts when a layout is updated
2012-12-03 17:25:27 +08:00
77386f0284
disable data transform when switching attribute field type. new member stable
2012-11-22 21:10:35 +08:00
d502f561ef
add co-author db and curd page, but it can't destory it...
2012-11-21 18:36:32 +08:00
97ffb5ff18
file view update
2012-11-21 07:37:42 +08:00
5643b0a528
delete demo db of journal and paper
2012-11-21 07:37:41 +08:00
c8bbb28d42
Fix wrong alias in design.rb for themes
2012-11-20 12:46:50 +08:00
84c284fa71
Fix wrong naming in theme.rb
2012-11-20 12:42:53 +08:00
d61621e198
Remove some pry and add address code
2012-11-20 10:05:38 +08:00
6789d44431
Fix design edit
2012-11-20 10:04:50 +08:00
2aa9a19deb
complete address field. still have javascript issue for fill back and display address ext fields in modal.
2012-11-20 09:53:37 +08:00
17988f2fb2
address field and text field convert
2012-11-20 09:53:37 +08:00
a85e5fcc0d
address field. js and style is broken
2012-11-20 09:53:36 +08:00
be448d42c9
add_more ok
2012-11-20 09:52:50 +08:00
23e86bfe31
Fix bug due to change of structure for stylesheet
2012-11-06 12:33:00 +08:00
b40d4702d5
Merge branch 'master' into various_bugs
...
Conflicts:
config/locales/en.yml
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
2012-11-06 11:44:00 +08:00
da5e7f670e
Desktop Widgtes updates..
2012-11-06 10:36:34 +08:00
ca3e06c58b
update for desktop widgets
2012-11-05 11:40:11 +08:00
58d4554b0b
Fixing bugs
2012-11-05 11:30:15 +08:00
beb843f75b
add new member with role interface. add more not usable.
...
role management new attribute is ok. delete is ok.
2012-11-04 20:42:58 +08:00
bc9082a858
Fix bug: Fix the bug due to not finding the ModuleApp
2012-10-30 17:10:59 +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
9b5f4e4775
Fix bug: User cannot connect using the orbit button (Devise configuration)
2012-10-26 17:42:14 +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
0a1a9d2c2e
member for THU
2012-10-26 11:19:56 +08:00
68bc4c1874
Fix page_part creation when design is changed
2012-10-26 11:19:56 +08:00
03b608593d
can add member
2012-10-26 11:19:56 +08:00
8b9cffd4f2
new code for attribute fields and values for new member interface
2012-10-26 11:19:55 +08:00
a50ccdafb2
consolidate_object_auth for 171 production
2012-10-16 15:08:02 +08:00
b3a9a7ab07
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-10-16 14:24:01 +08:00
6dfe10040b
fix object auth without app_auth
2012-10-16 14:23:44 +08:00
afff128e9c
Fix page_part creation when design is changed
2012-10-16 14:15:33 +08:00
9f825de288
user new interface 70%
2012-10-09 06:40:18 +08:00
1aacf5e2ce
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-10-09 06:40:18 +08:00
e67ca84282
object_auth change to reload
2012-10-04 18:20:21 +08:00
19db9d0037
basic function
2012-09-17 13:32:52 +08:00
5fb94f644d
break down Ray's HTML
2012-09-14 00:02:22 +08:00
4818e3f444
first version for new member html
2012-09-14 00:02:21 +08:00
45ef7fd302
guest user
2012-09-12 16:20:15 +08:00
04877b9945
design update
2012-09-12 01:58:23 +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
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
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
2ea3193879
Fix for banner link
2012-08-13 11:03:11 +08:00
d5c55c9697
widget & frontend field
2012-08-09 15:25: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
9982fd880f
Update the path when name is changed in item.rb
2012-08-08 10:53:04 +08:00
5f88408dcb
Check for 'http' or 'https' before saving a link
2012-08-04 16:29:31 +08:00
4127d7f2eb
Fix tags
2012-08-03 01:35:41 +08:00
ee5ac0227e
change the algorithm of tag cloud.
2012-08-01 18:15:10 +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
f3ccbce5c8
Put back impressions for new and bulletin.
...
Add view_count field to tag.
2012-07-30 17:57:55 +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
946ec9306f
first version of tag cloud.
2012-07-30 11:59:20 +08:00
a6a8fe3d64
Remove remaining 18n_variables
2012-07-27 19:37:25 +08:00
a8cc581279
Sitemap done for backend and fronted
2012-07-27 19:13:40 +08:00
934b515914
Sitemap with main
2012-07-27 19:13:39 +08:00
db9c4c0e10
Partial sitemap
2012-07-27 19:13:39 +08:00
12f9f666eb
Fix bugs after i18n_variable removal
2012-07-27 19:13:39 +08:00
804695749d
Fix bugs after removal of i18n_variable
2012-07-27 19:13:39 +08:00
53cae0a9ee
Remove i18n_variable for views
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
c0cac812c5
demo site widget
2012-07-26 16:39:29 +08:00
97b4eee798
full site search with google
2012-07-25 17:20:25 +08:00
10731dc211
demo widget
2012-07-18 18:07:45 +08:00
4daf36908c
working cache
2012-07-13 15:36:10 +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
f20f36383e
Timeline ajax load fixed… a bit change in structure..
2012-07-03 19:45:47 +08:00
d0632b2e4c
change name format
2012-07-03 16:05:19 +08:00
bacb1f1e63
Timeline ajax loading
2012-07-02 21:06:36 +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
7151102a86
new page add and timeline changes
2012-06-28 17:31:48 +08:00
4aa155a44d
timeline updates major ones..
2012-06-26 21:09:33 +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
1f1868a75f
cache privilege user list.
2012-05-29 17:17:26 +08:00
6f0cf0e92e
cache privilege user list.
2012-05-29 15:23:50 +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
11a371cbb9
Fix destroy in structure
...
Fix sorting
2012-05-22 17:55:45 +08:00
d0b030c47d
Put inc/ajax_setting in new_admin
...
Fix callback for link on save
2012-05-22 16:11:00 +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
6a022c90da
Changes on nccu
2012-05-18 15:20:45 +08:00
79f484300e
Merge branch 'design_team' into ldap
2012-05-17 18:32:06 +08:00
c9cbec4239
Asset changes, add description
2012-05-17 18:31:40 +08:00
5e93fe51a9
Merge branch 'design_team' into ldap
2012-05-17 16:41:11 +08:00
29c54e6480
Add mandatory fields to assets
2012-05-17 16:40:09 +08:00
bfad553cc3
Merge branch 'design_team' into ldap
2012-05-17 09:31:02 +08:00
84dac1d250
Create FileAssetUploader
2012-05-17 09:30:21 +08:00
eba4671733
Merge branch 'design_team' into ldap
2012-05-17 06:46:29 +08:00
cd1640482a
Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
...
Conflicts:
app/views/layouts/_side_bar.html.erb
2012-05-17 06:45:30 +08:00
0f354b8ccc
fix ad_image size hints. fix orbit backend controller error when changing language.
2012-05-17 06:44:14 +08:00
Fu Matthew
unknown
Rueshyna
chris
Harry Bomrah
Matthew K. Fu JuYuan
Harry Bomrah
Matt