Index: trunk/admin/install/upgrades/changelog_1_0_5.txt
===================================================================
diff -u -r192 -r243
--- trunk/admin/install/upgrades/changelog_1_0_5.txt (.../changelog_1_0_5.txt) (revision 192)
+++ trunk/admin/install/upgrades/changelog_1_0_5.txt (.../changelog_1_0_5.txt) (revision 243)
@@ -5,6 +5,8 @@
File in-portal/admin/index.php changed
File in-portal/admin/install.php changed
File in-portal/admin/toolbar.php changed
+File in-portal/admin/backup/backup1.php changed
+File in-portal/admin/backup/restore1.php changed
File in-portal/admin/browse/checkboxes_new.js changed
File in-portal/admin/browse/toolbar.js changed
File in-portal/admin/browse/toolbar.php changed
@@ -51,7 +53,9 @@
File in-portal/admin/icons/icon46_advanced_view.gif is new
File in-portal/admin/icons/icon46_list_advanced_view.gif is new
File in-portal/admin/import/import.php changed
+File in-portal/admin/import/inlinkimport2.php changed
File in-portal/admin/include/sections.php changed
+File in-portal/admin/include/style.css changed
File in-portal/admin/include/tabs.js changed
File in-portal/admin/install/inportal_data.sql changed
File in-portal/admin/install/install_lib.php changed
@@ -62,9 +66,12 @@
File in-portal/admin/install/upgrades/changelog_1_0_5.txt is new
File in-portal/admin/install/upgrades/inportal_upgrade_v1.0.5.sql is new
File in-portal/admin/install/upgrades/readme_1_0_5.txt is new
+File in-portal/admin/listview/columnheader.php changed
+File in-portal/admin/listview/listview.js changed
File in-portal/admin/listview/listview.php changed
File in-portal/admin/logs/session_list.php changed
File in-portal/admin/templates/cat_tab_element.tpl is new
+File in-portal/admin/tools/sql_query.php changed
File in-portal/admin/tree/tree.php changed
File in-portal/admin/users/addgroup_users.php changed
File in-portal/admin/users/adduser.php changed
@@ -97,20 +104,24 @@
File in-portal/kernel/include/custommetadata.php changed
File in-portal/kernel/include/emailmessage.php changed
File in-portal/kernel/include/item.php changed
+File in-portal/kernel/include/language.php changed
File in-portal/kernel/include/modules.php changed
File in-portal/kernel/include/parseditem.php changed
File in-portal/kernel/include/portaluser.php changed
File in-portal/kernel/include/searchconfig.php changed
File in-portal/kernel/include/searchitems.php changed
File in-portal/kernel/include/usersession.php changed
+File in-portal/kernel/include/adodb/adodb.inc.php changed
File in-portal/themes/default/search_results.tpl changed
File in-portal/themes/default/categories/catlist_element.tpl changed
+File in-portal/themes/default/incs/inportal_main.css changed
File in-portal/themes/default/misc/right_searchbox.tpl changed
Changes in phrases and events:
+Removed label "lu_fieldcustom__test"
Removed label "lu_fieldcustom__uc2"
Removed label "lu_fieldcustom__uc3"
Removed label "lu_fieldcustom__uc4"
@@ -134,3 +145,9 @@
Added label "lu_editors_picks"
Added label "la_tab_AdvancedView"
Added label "la_title_AdvancedView"
+Added label "la_error_duplicate_username"
+Added label "la_Description_in-portal:advanced_view"
+Added label "lu_pick_links"
+Added label "lu_pick_news"
+Added label "la_error_duplicate_username"
+Added label "la_error_duplicate_username"
Index: trunk/admin/install/langpacks/english.lang
===================================================================
diff -u -r231 -r243
--- trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 231)
+++ trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 243)
@@ -1535,8 +1535,6 @@
VGhpcyBzZWN0aW9uIGFsbG93cyB5b3UgdG8gbWFuYWdlIGNhdGVnb3JpZXMgYW5kIGl0ZW1zIGFjcm9zcyBhbGwgY2F0ZWdvcmllcw==
RWRpdG9yJ3MgUGljayBMaW5rcw==
RWRpdG9yJ3MgUGljayBBcnRpY2xlcw==
-VXNlcm5hbWUgeW91IGhhdmUgZW50ZXJlZCBhbHJlYWR5IGV4aXN0cyBpbiB0aGUgc3lzdGVtLCBwbGVhc2UgY2hvb3NlIGFub3RoZXIgdXNlcm5hbWUu
-VXNlcm5hbWUgeW91IGhhdmUgZW50ZXJlZCBhbHJlYWR5IGV4aXN0cyBpbiB0aGUgc3lzdGVtLCBwbGVhc2UgY2hvb3NlIGFub3RoZXIgdXNlcm5hbWUu
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogSW4tcG9ydGFsIHJlZ2lzdHJhdGlvbgoKRGVhciA8aW5wOnRvdXNlciBfRmllbGQ9IkZpcnN0TmFtZSIgLz4gPGlucDp0b3VzZXIgX0ZpZWxkPSJMYXN0TmFtZSIgLz4sDQoNClRoYW5rIHlvdSBmb3IgcmVnaXN0ZXJpbmcgb24gPGlucDptX3BhZ2VfdGl0bGUgLz4uIFlvdXIgcmVnaXN0cmF0aW9uIGlzIG5vdyBhY3RpdmUu
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogTmV3IHVzZXIgaGFzIGJlZW4gYWRkZWQKCkEgbmV3IHVzZXIgIjxpbnA6dG91c2VyIF9GaWVsZD0iVXNlck5hbWUiIC8+IiBoYXMgYmVlbiBhZGRlZC4=
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogWW91IGhhdmUgYmVlbiBhcHByb3ZlZAoKV2VsY29tZSB0byBJbi1wb3J0YWwhDQpZb3VyIHVzZXIgcmVnaXN0cmF0aW9uIGhhcyBiZWVuIGFwcHJvdmVkLiBZb3VyIHVzZXIgbmFtZSBpcyAiPGlucDp0b3VzZXIgX0ZpZWxkPSJVc2VyTmFtZSIgLz4iLg==