• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
RF-10197: fix merge problems

Following files modifies:

modified: application/src/main/webapp/components/richFileUpload/list.xhtml (removed MERGE CONFLICT mark)

deleted: application/src/main/webapp/resources/script/push.js (this file was renamed to pushHelper.js)

deleted: notes (no longer needed)

  1. … 2 more files in changeset.
RF-10197: Merge contextMenu tests into trunk

Conflicts:

application/src/main/java/org/richfaces/demo/push/TopicsContextMessageProducer.java

application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java

application/src/main/java/org/richfaces/tests/metamer/bean/a4j/A4JPushBean.java

application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichHotKeyBean.java

application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichMessageBean.java

application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichMessagesBean.java

application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichTooltipBean.java

application/src/main/webapp/components/a4jPush/simple.xhtml

application/src/main/webapp/components/a4jRepeat/keepSaved.xhtml

application/src/main/webapp/components/richCollapsibleSubTable/keepSaved.xhtml

application/src/main/webapp/components/richDataGrid/keepSaved.xhtml

application/src/main/webapp/components/richDataTable/keepSaved.xhtml

application/src/main/webapp/components/richDragIndicator/simple.xhtml

application/src/main/webapp/components/richDragSource/cc.xhtml

application/src/main/webapp/components/richDragSource/simple.xhtml

application/src/main/webapp/components/richDropTarget/simple.xhtml

application/src/main/webapp/components/richExtendedDataTable/keepSaved.xhtml

application/src/main/webapp/components/richExtendedDataTable/list.xhtml

application/src/main/webapp/components/richFileUpload/list.xhtml

application/src/main/webapp/components/richHotKey/editor.xhtml

application/src/main/webapp/components/richHotKey/orderingList.xhtml

application/src/main/webapp/components/richHotKey/pickList.xhtml

application/src/main/webapp/components/richHotKey/simple.xhtml

application/src/main/webapp/components/richList/keepSaved.xhtml

application/src/main/webapp/components/richTabPanel/list.xhtml

application/src/main/webapp/components/richTooltip/list.xhtml

application/src/main/webapp/components/richTree/rf-10994.xhtml

ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java

ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java

ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java

ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessages/TestRichMessagesCSV.java

ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessages/TestRichMessagesJSFValidator.java

ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessages/TestRichMessagesJSR303.java

ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.java

ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/AbstractTestTree.java

ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreePhases.java

ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSelection.java

ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java

ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java

ftest/src/test/resources/testng-misc.xml

pom.xml

    • -0
    • +65
    ./images/pics/pic9.jpg
  1. … 24 more files in changeset.
RFPL-982: Add class for element displaying push's timestamp
RFPL-982: Rename and update script for push

Rename script to avoid name collision (push.js is named script providing push functionality, so client library using push should be named differently).

Updated script behavior: value from push even replace previous value (removed behavior adding new item in list)

RFPL-982: Change default message from pushBot

Change message to better describe that message is generated periodically by bot, and pushed to client

  1. … 1 more file in changeset.
RF-11825: add example for fileUpload component within composite component.
    • -0
    • +29
    ./jjatest/testFileUpload.xhtml
  1. … 2 more files in changeset.
RFPL-1572: add message pushed without user action
  1. … 8 more files in changeset.
rfpl-1612: add column layout example for rich:pickList
    • -0
    • +8
    ./images/capitals/alabama.gif
    • -0
    • +6
    ./images/capitals/alaska.gif
    • -0
    • +13
    ./images/capitals/arizona.gif
    • -0
    • +10
    ./images/capitals/arkansas.gif
    • -0
    • +6
    ./images/capitals/california.gif
    • -0
    • +13
    ./images/capitals/colorado.gif
    • -0
    • +6
    ./images/capitals/connecticut.gif
    • -0
    • +11
    ./images/capitals/delaware.gif
    • -0
    • +14
    ./images/capitals/florida.gif
    • -0
    • +10
    ./images/capitals/georgia.gif
    • -0
    • +8
    ./images/capitals/hawaii.gif
    • -0
    • +11
    ./images/capitals/idaho.gif
    • -0
    • +7
    ./images/capitals/illinois.gif
    • -0
    • +9
    ./images/capitals/indiana.gif
  1. … 39 more files in changeset.
workaround for Mojarra 2.1

* code formatted

* cargo plugin upgraded

  1. … 5 more files in changeset.
added sample for verifying RF-10992

    • -0
    • +29
    ./metamer/dragSource.xhtml
  1. … 2 more files in changeset.
added a workaround for RF-10646

https://issues.jboss.org/browse/RFPL-982

new implementation of a4j:push added

  1. … 17 more files in changeset.
empty directory for rich:dragBehavior removed

css file's name refactored

  1. … 4 more files in changeset.
https://issues.jboss.org/browse/RFPL-946

added two new templates - rich:dataGrid and rich:extendedDataTable

    • -0
    • +20
    ./css/template-edt.css
  1. … 13 more files in changeset.
empty css files removed and references to them removed
  1. … 24 more files in changeset.
headers updated
  1. … 27 more files in changeset.
enabled updating javax.faces.ViewState across all forms for MyFaces (Mojarra compatibility RFPL-1187)
added parameter "for" for labels

added parameter "alt" for images

  1. … 2 more files in changeset.
removed empty stylesheet
  1. … 15 more files in changeset.
metamer:attributes - added @exclude parameter to be able exclude some attributes from page (e.g. if they doesn't make sense in given scenario)
* sample and tests for a4j:outputPanel refactored

  1. … 4 more files in changeset.
drag-n-drop: pre-automation activities (RFPL-992)
  1. … 5 more files in changeset.
drag-n-drop: pre-automation activities (RFPL-992)
  1. … 2 more files in changeset.
rich:panelMenu - pre-automation activities (RFPL-950)
  1. … 5 more files in changeset.
drag-n-drop: pre-automation activities (RFPL-992)
  1. … 6 more files in changeset.
tweaked phases list to don't scroll
clientTime-refresh.js changed to print human readable dates
phases panel size stabilized (scroller added for overflowing)
* sample for a4j:commandLink updated

* added 15 new tests for command link

* old tests refactored

  1. … 3 more files in changeset.