Skip to content

erp5
erp5
Commit 25cd1201 authored by Cédric Le Ninivin's avatar Cédric Le Ninivin
3 Browse files
Options

Revert "Merge remote-tracking branch 'origin/master'" 

This reverts commit b847b45e, reversing
changes made to 9075a38f.
The reverted commmit has been done automatically, investigation is needed
parent b847b45e
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 26 deletions
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalTradeConditionModule_viewInternalTradeConditionList/listbox.xml
View file @ 25cd1201
...@@ -115,6 +115,10 @@ ...@@ -115,6 +115,10 @@
</tuple> </tuple>
<tuple> <tuple>
<string>default_destination_project_title</string> <string>default_destination_project_title</string>
<string></string>
</tuple>
<tuple>
<string>Client Project</string>
<string>Client Project</string> <string>Client Project</string>
</tuple> </tuple>
<tuple> <tuple>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeConditionModule_viewPurchaseTradeConditionList/listbox.xml
View file @ 25cd1201
...@@ -114,6 +114,10 @@ ...@@ -114,6 +114,10 @@
</tuple> </tuple>
<tuple> <tuple>
<string>default_destination_project_title</string> <string>default_destination_project_title</string>
<string></string>
</tuple>
<tuple>
<string>Client Project</string>
<string>Client Project</string> <string>Client Project</string>
</tuple> </tuple>
<tuple> <tuple>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeConditionModule_viewSaleTradeConditionList/listbox.xml
View file @ 25cd1201
...@@ -114,6 +114,10 @@ ...@@ -114,6 +114,10 @@
</tuple> </tuple>
<tuple> <tuple>
<string>default_destination_project_title</string> <string>default_destination_project_title</string>
<string></string>
</tuple>
<tuple>
<string>Client Project</string>
<string>Client Project</string> <string>Client Project</string>
</tuple> </tuple>
<tuple> <tuple>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_appcache.xml
View file @ 25cd1201
...@@ -108,14 +108,13 @@ ...@@ -108,14 +108,13 @@
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
CACHE MANIFEST\n CACHE MANIFEST\n
# generated on Fri, 30 Sep 2016 13:00:00 GMT\n # generated on Tue, 29 Jul 2016 13:00:00 GMT .\n
# XXX + fonts\n # XXX + fonts\n
# images/ajax-loader.gif\n # images/ajax-loader.gif\n
CACHE:\n CACHE:\n
font-awesome/font-awesome-webfont.eot?v=4.6.3\n font-awesome/font-awesome-webfont.eot?v=4.6.3\n
font-awesome/font-awesome-webfont.eot?#iefix&v=4.6.3\n font-awesome/font-awesome-webfont.eot?#iefix&v=4.6.3\n
font-awesome/font-awesome-webfont.woff?v=4.6.3\n font-awesome/font-awesome-webfont.woff?v=4.6.3\n
font-awesome/font-awesome-webfont.woff2?v=4.6.3\n
font-awesome/font-awesome-webfont.ttf?v=4.6.3\n font-awesome/font-awesome-webfont.ttf?v=4.6.3\n
font-awesome/font-awesome-webfont.svg?v=4.6.3#fontawesomeregular\n font-awesome/font-awesome-webfont.svg?v=4.6.3#fontawesomeregular\n
URI.js\n URI.js\n
...@@ -355,7 +354,7 @@ NETWORK:\n ...@@ -355,7 +354,7 @@ NETWORK:\n
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>954.17206.22181.11161</string> </value> <value> <string>952.57579.5740.15394</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -373,7 +372,7 @@ NETWORK:\n ...@@ -373,7 +372,7 @@ NETWORK:\n
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1475244194.36</float> <float>1469799631.33</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_frontpage_js.js
View file @ 25cd1201
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
"key": "field_listbox", "key": "field_listbox",
"lines": 1000, "lines": 1000,
"list_method": "portal_catalog", "list_method": "portal_catalog",
"query": "urn:jio:allDocs?query=parent_uid%3A%220%22%20AND%20meta_type%3A%22ERP5%20Folder%22%20AND%20id%3A%22%25_module%22", "query": "urn:jio:allDocs?query=meta_type%3A%22ERP5%20Folder%22%20AND%20id%3A%22%25_module%22",
"portal_type": [], "portal_type": [],
"search_column_list": column_list, "search_column_list": column_list,
"sort_column_list": column_list, "sort_column_list": column_list,
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_frontpage_js.xml
View file @ 25cd1201
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>952.64761.25287.18397</string> </value> <value> <string>952.57689.22903.13841</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1475244399.84</float> <float>1469806084.35</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSection_viewRenderJSPreference.xml
View file @ 25cd1201
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
<list> <list>
<string>left</string> <string>left</string>
<string>right</string> <string>right</string>
<string>center</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -69,40 +68,32 @@ ...@@ -69,40 +68,32 @@
<key> <string>groups</string> </key> <key> <string>groups</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>center</string> </key>
<value>
<list>
<string>my_configuration_content_security_policy</string>
<string>my_configuration_x_frame_options</string>
</list>
</value>
</item>
<item> <item>
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>my_configuration_default_view_action_reference</string> <string>my_configuration_default_view_action_reference</string>
<string>my_configuration_view_action_category</string> <string>my_configuration_view_action_category</string>
<string>my_configuration_application_title</string>
<string>my_configuration_hateoas_url</string>
<string>my_configuration_frontpage_gadget_url</string> <string>my_configuration_frontpage_gadget_url</string>
</list>
</value>
</item>
<item>
<key> <string>right</string> </key>
<value>
<list>
<string>my_configuration_panel_gadget_url</string> <string>my_configuration_panel_gadget_url</string>
<string>my_configuration_application_title</string>
<string>my_configuration_hateoas_url</string>
<string>my_configuration_manifest_url</string> <string>my_configuration_manifest_url</string>
<string>my_configuration_jio_gadget_url</string> <string>my_configuration_jio_gadget_url</string>
<string>my_configuration_translation_gadget_url</string> <string>my_configuration_translation_gadget_url</string>
<string>my_configuration_router_gadget_url</string> <string>my_configuration_router_gadget_url</string>
<string>my_configuration_header_gadget_url</string> <string>my_configuration_header_gadget_url</string>
<string>my_configuration_content_security_policy</string>
<string>my_configuration_x_frame_options</string>
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>right</string> </key>
<value>
<list/>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
  • Jérome Perrin @jerome

    mentioned in commit f7050220

     ·

    mentioned in commit f7050220

    Toggle commit list
  • Jérome Perrin @jerome ·
    Owner

    @cedric.leninivin I am afraid this revert did not do what you expected.

    I noticed 25cd1201 was reverted, so I re-applied it, but the same happened for other commits too. I can see at least 27664772 was also reverted. Can you please take a look ?

    BTW, about this merge origin/master into master commit, I have a theory. This happens when you do git pull and there was new commits on master, probably this is what happened and by reverting the merge, you were also reverting these new commits. This problem does not happen when instead of git pull, you do git fetch followed by git rebase.

  • Cédric Le Ninivin @cedric.leninivin ·
    Maintainer

    I see, this was done automatically when pushing from ERP5. I'll look into it

Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7