Index: branches/5.1.x/install/upgrades.sql =================================================================== diff -u -N -r14480 -r14532 --- branches/5.1.x/install/upgrades.sql (.../upgrades.sql) (revision 14480) +++ branches/5.1.x/install/upgrades.sql (.../upgrades.sql) (revision 14532) @@ -231,4 +231,9 @@ SET VariableValue = 'in-bulletin/topics/topic_detail' WHERE VariableName = 'bb_ItemTemplate' AND VariableValue = 'in-bulletin/designs/detail'; -# ===== v 5.1.3-RC2 ===== \ No newline at end of file +# ===== v 5.1.3-RC2 ===== + +# ===== v 5.1.3 ===== +UPDATE Phrase +SET `Module` = 'Core' +WHERE PhraseKey = 'LA_FLD_REQUIRELOGIN'; \ No newline at end of file Index: branches/5.1.x/units/poll_answers/poll_answers_config.php =================================================================== diff -u -N -r14251 -r14532 --- branches/5.1.x/units/poll_answers/poll_answers_config.php (.../poll_answers_config.php) (revision 14251) +++ branches/5.1.x/units/poll_answers/poll_answers_config.php (.../poll_answers_config.php) (revision 14532) @@ -1,6 +1,6 @@ Array ( '' => Array( 'ForcedSorting' => Array('Priority' => 'desc'), - 'Sorting' => Array('Answer' => 'ASC'), + 'Sorting' => Array('Answer' => 'asc'), ) ), @@ -75,9 +75,9 @@ 'module' => 'core', ), 'Fields' => Array ( - 'AnswerId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'Answer' => Array ('title' => 'la_col_Name', 'data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 300, ), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), + 'AnswerId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'Answer' => Array ('data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 300, ), + 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ), 'VotesQty' => Array ('title' => 'la_col_VoteCount', 'filter_block' => 'grid_like_filter', 'width' => 100, ), ), Index: branches/5.1.x/units/topics/topics_config.php =================================================================== diff -u -N -r14251 -r14532 --- branches/5.1.x/units/topics/topics_config.php (.../topics_config.php) (revision 14251) +++ branches/5.1.x/units/topics/topics_config.php (.../topics_config.php) (revision 14532) @@ -1,6 +1,6 @@ 'icon16_topic_new.png', ), 'Fields' => Array ( - 'TopicId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'TopicId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), 'TopicText' => Array ('title' => 'la_col_TopicText', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 300, 'first_chars' => 290, ), - 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65), - 'UserName' => Array ('title' => 'la_col_PostedBy', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ), + 'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65), + 'UserName' => Array ('title' => 'column:la_fld_PostedBy', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ), + 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ), 'LastPostDate' => Array ('title' => 'la_col_LastPostOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), 'Posts' => Array ('title' => 'la_col_Posts', 'filter_block' => 'grid_range_filter', 'width' => 70, ), - 'Views' => Array ('title' => 'la_col_Views', 'filter_block' => 'grid_range_filter', 'width' => 70, ), + 'Views' => Array ('filter_block' => 'grid_range_filter', 'width' => 70, ), ), ), @@ -536,15 +536,15 @@ 'NEW' => 'icon16_topic_new.png', ), 'Selector' => 'radio', 'Fields' => Array ( - 'TopicId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'TopicId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), 'TopicText' => Array ('title' => 'la_col_TopicText', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 300, 'first_chars' => 290, ), - 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65), - 'UserName' => Array ('title' => 'la_col_PostedBy', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ), + 'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65), + 'UserName' => Array ('title' => 'column:la_fld_PostedBy', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ), + 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ), 'LastPostDate' => Array ('title' => 'la_col_LastPostOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), 'Posts' => Array ('title' => 'la_col_Posts', 'filter_block' => 'grid_range_filter', 'width' => 70, ), - 'Views' => Array ('title' => 'la_col_Views', 'filter_block' => 'grid_range_filter', 'width' => 70, ), + 'Views' => Array ('filter_block' => 'grid_range_filter', 'width' => 70, ), ), ), ), Index: branches/5.1.x/units/censorship/censorship_config.php =================================================================== diff -u -N -r14251 -r14532 --- branches/5.1.x/units/censorship/censorship_config.php (.../censorship_config.php) (revision 14251) +++ branches/5.1.x/units/censorship/censorship_config.php (.../censorship_config.php) (revision 14532) @@ -1,6 +1,6 @@ 'core', ), 'Fields' => Array ( - 'CensorshipId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50), - 'BadWord' => Array ('title' => 'la_col_BadWord', 'filter_block' => 'grid_like_filter', 'width' => 250), - 'Replacement' => Array ('title' => 'la_col_Replacement', 'filter_block' => 'grid_like_filter', 'width' => 250), + 'CensorshipId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50), + 'BadWord' => Array ('filter_block' => 'grid_like_filter', 'width' => 250), + 'Replacement' => Array ('filter_block' => 'grid_like_filter', 'width' => 250), ), ), ), Index: branches/5.1.x/units/emoticons/emoticons_config.php =================================================================== diff -u -N -r14251 -r14532 --- branches/5.1.x/units/emoticons/emoticons_config.php (.../emoticons_config.php) (revision 14251) +++ branches/5.1.x/units/emoticons/emoticons_config.php (.../emoticons_config.php) (revision 14532) @@ -1,6 +1,6 @@ 'core', ), 'Fields' => Array ( - 'EmoticonId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ), - 'Name' => Array ('title' => 'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'KeyStroke' => Array ('title' => 'la_col_KeyStroke', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'EmotionImage' => Array ('title' => 'la_col_Image', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'EmoticonId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ), + 'Name' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ), + 'KeyStroke' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ), + 'EmotionImage' => Array ('title' => 'column:la_fld_Image', 'filter_block' => 'grid_like_filter', 'width' => 150, ), ), ), ), Index: branches/5.1.x/install/english.lang =================================================================== diff -u -N -r14251 -r14532 --- branches/5.1.x/install/english.lang (.../english.lang) (revision 14251) +++ branches/5.1.x/install/english.lang (.../english.lang) (revision 14532) @@ -1,37 +1,30 @@ - + - Q2Vuc29yZWQgV29yZA== VXNlcg== - S2V5IFN0cm9rZQ== TGFzdCBQb3N0IE9u RGF0ZS9UaW1l RGF5cyBBY3RpdmU= - Q29tbWVudA== - UG9zdGVy UmVwbGllcw== - UmVwbGFjZW1lbnQ= VG9waWM= - Vmlld3M= Vm90ZXM= QWxsb3cgQ29tbWVudHM= QWxsb3cgTXVsdGlwbGUgVm90aW5ncw== - Q2Vuc29yZWQgV29yZA== + Q2Vuc29yZWQgV29yZA== VG9waWNzIEl0ZW0gVGVtcGxhdGU= - RW5kIERhdGU= - S2V5IFN0cm9rZQ== + RW5kIERhdGU= + S2V5IFN0cm9rZQ== QW5zd2Vy - Q29tbWVudA== + Q29tbWVudA== R3Vlc3QgRW1haWw= R3Vlc3QgTmFtZQ== - UG9zdGVkIEJ5 + UG9zdGVkIEJ5 UXVlc3Rpb24= - UmVxdWlyZSBMb2dpbg== VG9waWMgTG9ja2Vk TWF4aW11bSBudW1iZXIgb2YgSE9UIHRvcGljcw== TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgdG9waWMgUE9Q TWluaW11bSBudW1iZXIgb2YgcG9zdHMgdG8gY29uc2lkZXIgdG9waWMgUE9Q - Vmlld3M= + Vmlld3M= SW4tQnVsbGV0aW4= VG9waWNz TGFzdCBQb3N0ZXI= Index: branches/5.1.x/units/polls/polls_config.php =================================================================== diff -u -N -r14251 -r14532 --- branches/5.1.x/units/polls/polls_config.php (.../polls_config.php) (revision 14251) +++ branches/5.1.x/units/polls/polls_config.php (.../polls_config.php) (revision 14532) @@ -1,6 +1,6 @@ 'core', ), 'Fields' => Array ( - 'PollId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'Name' => Array ('title' => 'la_col_Name', 'data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ), - 'StartDate' => Array ('title' => 'la_col_StartDate', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), - 'EndDate' => Array ('title' => 'la_col_EndDate', 'data_block' => 'poll_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), + 'PollId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'Name' => Array ('data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'StartDate' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ), + 'EndDate' => Array ('data_block' => 'poll_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), 'CachedVotesQty' => Array ('title' => 'la_col_VoteCount', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), + 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ), // 'DaysActive' => Array ('title' => 'la_col_NumberOfDaysActive', 'filter_block' => 'grid_range_filter',), ), ), Index: branches/5.1.x/units/poll_comments/poll_comments_config.php =================================================================== diff -u -N -r14441 -r14532 --- branches/5.1.x/units/poll_comments/poll_comments_config.php (.../poll_comments_config.php) (revision 14441) +++ branches/5.1.x/units/poll_comments/poll_comments_config.php (.../poll_comments_config.php) (revision 14532) @@ -1,6 +1,6 @@ 'core', ), 'Fields' => Array ( - 'CommentId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'CommentBody' => Array ('title' => 'la_col_PollComment', 'data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ), + 'CommentId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'CommentBody' => Array ('title' => 'column:la_fld_PollComment', 'data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ), 'CommentedByUser' => Array( 'title'=>'la_col_CommentedByUser', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), + 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ), + 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ), ), ), ), Index: branches/5.1.x/install/upgrades.php =================================================================== diff -u -N -r14480 -r14532 --- branches/5.1.x/install/upgrades.php (.../upgrades.php) (revision 14480) +++ branches/5.1.x/install/upgrades.php (.../upgrades.php) (revision 14532) @@ -1,6 +1,6 @@ Array ('Core' => '5.1.3-B2'), '5.1.3-RC1' => Array ('Core' => '5.1.3-RC1'), '5.1.3-RC2' => Array ('Core' => '5.1.3-RC2'), + '5.1.3' => Array ('Core' => '5.1.3'), ); }