ocs-webserver into dev
1d341ae5c94d
Actions

Authored by David Nelband <dnelband@gmail.com> on Jun 17 2019, 1:53 PM.

Description

Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev

Details

Committed

David Nelband <dnelband@gmail.com>

Jun 17 2019, 1:53 PM

Parents

R767:7c557fac9cfd: pms music player init
R767:c90054b01817: update db

Branches

Unknown

Tags

Unknown

David Nelband <dnelband@gmail.com> committed R767:1d341ae5c94d: Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev (authored by David Nelband <dnelband@gmail.com>).Jun 17 2019, 1:53 PM

Merged Changes

Commit	Author	Details	Committed
c90054b01817	ronaldv	update db	Jun 14 2019
297194fd747b	ronaldv	dls: db update	Jun 14 2019
40dc84cebd74	ronaldv	test	Jun 14 2019
9b912ea48bce	alexanderschmidt	changes for docker	Jun 14 2019
485388471b6b	siyuandong	update sql	Jun 12 2019
53eec5b0dd5f	siyuandong	score	Jun 12 2019
ace644067ffd	siyuandong	css metaheader	Jun 12 2019

Changes (151)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		README
M		application/configs/application.ini
M		application/modules/default/controllers/AuthorizationController.php
M		application/modules/default/controllers/ProductController.php
M		application/modules/default/forms/Product.php
M		application/modules/default/forms/Register.php
M		application/modules/default/models/DbTable/Image.php
A	(dir)	application/modules/default/models/Exception/
A		application/modules/default/models/Exception/Image.php
M		application/modules/default/models/Member.php
A	(dir)	application/modules/default/models/Ocs/Gitlab/
M		application/modules/default/models/Ocs/Gitlab.php
A		application/modules/default/models/Ocs/Gitlab/Exception.php
M		application/modules/default/models/Project.php
M		application/modules/default/views/helpers/Image.php
M		application/modules/default/views/scripts/product/add.phtml
M		httpdocs/theme/react/assets/css/metaheader.css
M		httpdocs/theme/react/assets/less/metaheader.less
M		library/Zend/Http/Client.php
M		sql_code/20160914_add_file_type.sql
M		sql_code/20160916_file_type_rename.sql
M		sql_code/20160919_file_type_rename.sql
M		sql_code/20160921_add_mail_template_comment_reply.sql
M		sql_code/20160922_add_member_email_table.sql
M		sql_code/20161011_add_index_stat_table_views.sql
M		sql_code/20161025_update_session_table.sql
M		sql_code/20161130_add_stat_downloads_quarter_year.sql
M		sql_code/20170103_add_trigger_comment_update.sql
M		sql_code/20170112_create_table_member_token.sql
M		sql_code/20170123_add_masspay.sql
M		sql_code/20170125_add_package_type_in_store_config.sql
D		sql_code/20170223_add_table_sso_token
A		sql_code/20170223_add_table_sso_token.sql
M		sql_code/20170505_projects_mv.sql
M		sql_code/20170510_add_fields_stat_projects.sql
M		sql_code/20170526_alter_table_report_project.sql
M		sql_code/20170529_add_view reported_projects.sql
M		sql_code/20170607_add_field_to_config_store.sql
M		sql_code/20170607_add_field_to_project.sql
M		sql_code/20170608_add_paypal_valid_status.sql
M		sql_code/20170608_alter_table_member_addcolumn.sql
M		sql_code/20170613_alter_member_table.sql
M		sql_code/20170622_add_reviews.sql
M		sql_code/20170629_add_event_daily_views.sql
M		sql_code/20170629_prod_daily_views.sql
M		sql_code/20170704_add_member_paypal_table.sql
M		sql_code/20170706_add_stored_procedure_for_solr.sql
M		sql_code/20170713_add_table_payout_status.sql
M		sql_code/20170801_add_laplace_scrore_sql_function.sql
M		sql_code/20170808_add_stored_procedure_projects.sql
M		sql_code/20170811_add_stored_procedure_cat_tree.sql
M		sql_code/20170811_add_stored_procedure_prod_count.sql
M		sql_code/20170825_add_support_btn.sql
M		sql_code/20170904_cat_show_description.sql
M		sql_code/20170908_paypal_ipn.sql
M		sql_code/20170922_complete_sql_for_tags.sql
M		sql_code/20171109_activity_log_types_updated.sql
M		sql_code/20171115_add_field_pling_excluded.sql
M		sql_code/20171214_add_piwik.sql
M		sql_code/20180122_member_dl_history.sql
M		sql_code/20180131_add_activity_log_type_paypal.sql
M		sql_code/20180207_alter_comment_update_trigger.sql
M		sql_code/20180208_alter_table_project_follower.sql
M		sql_code/20180208_reports_comment_add_ip.sql
M		sql_code/20180213_ghns_excluded.sql
M		sql_code/20180227_add_package_type_sourcecode.sql
M		sql_code/20180228_hive_import_fan.sql
M		sql_code/20180306_proejct_rating_memberid_idx.sql
M		sql_code/20180326_source_required.sql
M		sql_code/20180327_project_license.sql
M		sql_code/20180328_source_url.sql
M		sql_code/20180403_cat_tag.sql
M		sql_code/20180405_cat_tag_proj.sql
M		sql_code/20180406_alter_tag.sql
M		sql_code/20180409_alter_tag.sql
M		sql_code/20180412_payout_requierments.sql
M		sql_code/20180417_alter_tag_fullname.sql
M		sql_code/20180422_project_plings.sql
M		sql_code/20180424_add_file_tags.sql
M		sql_code/20180504_alter_project_pling.sql
M		sql_code/20180506_add_plings_member_dl_plings.sql
M		sql_code/20180515_report_project_advance.sql
M		sql_code/20180515_report_project_clone.sql
M		sql_code/20180516_member_score.sql
M		sql_code/20180518_member_pling_excluded.sql
M		sql_code/20180605_tag_object.sql
M		sql_code/20180621_add_table_member_external_id.sql
M		sql_code/20180622_configstore_addcolumn.sql
M		sql_code/20180712_generate_stat_project.sql
M		sql_code/20180718_configstore_addcolumn.sql
M		sql_code/20180724_project_moderation.sql
M		sql_code/20180724_project_moderation2.sql
M		sql_code/20180730_configstore_addcolumn.sql
M		sql_code/20180801_add_password_type.sql
M		sql_code/20180802_add_email_hash.sql
M		sql_code/20180809_member_pass.sql
M		sql_code/20180815_add_stored_procedure.sql
M		sql_code/20180821_solr_procedure.sql
M		sql_code/20180918_alter_table_tag.sql
M		sql_code/20180920_add_member_username_old.sql
M		sql_code/20180926_add_procedure_merge_members.sql
M		sql_code/20180926_member_update.sql
M		sql_code/20181012_add_git_group.sql
M		sql_code/20181019_alter_project_gitlab.sql
M		sql_code/20181112_member_gitlab_user_id.sql
M		sql_code/20181119_add_table_stat_projects_source_url.sql
M		sql_code/20181119_page_views_48h.sql
M		sql_code/20181129_add_stat_downloads_24h.sql
M		sql_code/20181205_member_deactivate_log.sql
M		sql_code/20181214_dactivation_log.sql
M		sql_code/20181218_category_taggroup.sql
M		sql_code/20190104_add_suspicious_table.sql
M		sql_code/20190110_add_table_spam_keywords.sql
M		sql_code/20190110_store_config_show_git.sql
M		sql_code/20190115_stat_cnt_projects_catid_memberid.sql
M		sql_code/20190121_add_tag_group_display_name.sql
M		sql_code/20190123_add_proc_stat_project_tagids.sql
M		sql_code/20190123_add_stored_prod_for tags.sql
M		sql_code/20190123_add_table_config_store_tag.sql
M		sql_code/20190124_add_table_member_setting.sql
M		sql_code/20190125_change_stat_cat_prod_count.sql
M		sql_code/20190131_ updated_generate_stat_product.sql
M		sql_code/20190131_update_fetch_tree_with_tags_for_store.sql
M		sql_code/20190131_updated_generate_stat_store_prod_count.sql
M		sql_code/20190205_stat_cat_store_count.sql
M		sql_code/20190212_project_major_updated_at.sql
M		sql_code/20190213_system_tags_update.sql
M		sql_code/20190214_store_config_stay_in_context.sql
M		sql_code/20190215_update_solr_query_inactive_files_excluded.sql
M		sql_code/20190219_config_store_tag_group.sql
M		sql_code/20190314_add_config_store_show_news_and_forum.sql
M		sql_code/20190326_project_add_user_category.sql
M		sql_code/20190327_create_tabe_collection_projects.sql
M		sql_code/20190411_alter_support_add_type_period.sql
M		sql_code/20190424_cat_tag_group_multiselect.sql
M		sql_code/20190503_alter_support_add_tie.sql
M		sql_code/20190503_create_files_downloaded_all.sql
M		sql_code/20190503_stat_files_downloaded.sql
M		sql_code/20190507_project_rating_score.sql
M		sql_code/20190508_create_stat_ranking_project.sql
M		sql_code/20190508_stat_projects_new_scorecolumn.sql
M		sql_code/20190509_generate_stat_rating_project.sql
M		sql_code/20190509_laplace_score_with_plings.sql
M		sql_code/20190509_stat_projects_update_scorecolumn.sql
M		sql_code/20190509_v_support.sql
M		sql_code/20190513_stat_projects_updates.sql
A		sql_code/20190514_score.sql
M		sql_code/20190515_media_views.sql
M		sql_code/20190516_solr_query_import_updates.sql
M		sql_code/20190605_dl_unique.sql
M		sql_code/20190607_add_fields_to_config_store.sql