Viewing all changes in revision 374.
- Committer: Eugene Fryntov
- Date: 2016-11-15 22:13:59 UTC
- mfrom: (373.1.1 psiphon)
- Revision ID: e.fryntov@psiphon.ca-20161115221359-f6s56ue1a54n4ijj
merged lp:~t7-vla7-lz/psiphon/psiphon @ 374
- files added:
- trunk/sql/site-compat/voa.sql
- files removed:
- trunk/mod_psiphon/utils/jsf.c
- trunk/testing
- trunk/testing/db_test
- trunk/testing/selenium_scripts
- trunk/testing/selenium_scripts/selenium
- trunk/testing/selenium_scripts/selenium/META-INF
- trunk/testing/selenium_scripts/selenium/META-INF/maven
- trunk/testing/selenium_scripts/selenium/META-INF/maven/org.seleniumhq.selenium.core
- trunk/testing/selenium_scripts/selenium/META-INF/maven/org.seleniumhq.selenium.core/selenium-core
- trunk/testing/selenium_scripts/selenium/core
- trunk/testing/selenium_scripts/selenium/core/icons
- trunk/testing/selenium_scripts/selenium/core/lib
- trunk/testing/selenium_scripts/selenium/core/lib/cssQuery
- trunk/testing/selenium_scripts/selenium/core/lib/cssQuery/src
- trunk/testing/selenium_scripts/selenium/core/lib/scriptaculous
- trunk/testing/selenium_scripts/selenium/core/scripts
- trunk/testing/selenium_scripts/selenium/core/xpath
- trunk/testing/selenium_scripts/selenium/doctool
- trunk/testing/selenium_scripts/selenium/jsunit
- trunk/testing/selenium_scripts/selenium/jsunit/app
- trunk/testing/selenium_scripts/selenium/jsunit/app/css
- trunk/testing/selenium_scripts/selenium/jsunit/css
- trunk/testing/selenium_scripts/selenium/jsunit/images
- trunk/testing/selenium_scripts/selenium/jsunit/licenses
- trunk/testing/selenium_scripts/selenium/strands
- trunk/testing/selenium_scripts/selenium/tests
- trunk/testing/selenium_scripts/selenium/tests/dogfood
- trunk/testing/selenium_scripts/selenium/tests/dogfood/aut
- trunk/testing/selenium_scripts/selenium/tests/dogfood/aut/html
- trunk/testing/selenium_scripts/selenium/tests/events
- trunk/testing/selenium_scripts/selenium/tests/html
- trunk/testing/selenium_scripts/selenium/tests/html/ajax
- trunk/testing/selenium_scripts/selenium/tests/html/basicAuth
- trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini
- trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini/src
- trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini/src/dnd
- trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini/src/event
- trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini/src/html
- trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini/src/html/images
- trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini/src/lang
- trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini/src/lang/timing
- trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini/tests
- trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini/tests/dnd
- trunk/testing/selenium_scripts/selenium/tests/html/path1
- trunk/testing/selenium_scripts/selenium/tests/html/path2
- trunk/testing/selenium_scripts/selenium/tests/html/slider
- trunk/testing/selenium_scripts/selenium/tests/html/slider/example_files
- trunk/testing/selenium_scripts/selenium/tests/html/slider/example_files/img
- trunk/testing/selenium_scripts/selenium/unittest
- trunk/testing/selenium_scripts/selenium/unittest/jsmock
- files modified:
- trunk/INSTALL
expand all
collapse all
added
removed
trunk/testing/selenium_scripts/selenium/core/icons/all.png
trunk/testing/selenium_scripts/selenium/core/icons/continue.png
trunk/testing/selenium_scripts/selenium/core/icons/continue_disabled.png
trunk/testing/selenium_scripts/selenium/core/icons/pause.png
trunk/testing/selenium_scripts/selenium/core/icons/pause_disabled.png
trunk/testing/selenium_scripts/selenium/core/icons/selected.png
trunk/testing/selenium_scripts/selenium/core/icons/step.png
trunk/testing/selenium_scripts/selenium/core/icons/step_disabled.png
trunk/testing/selenium_scripts/selenium/core/selenium-logo.png
trunk/testing/selenium_scripts/selenium/jsunit/images/green.gif
trunk/testing/selenium_scripts/selenium/jsunit/images/logo_jsunit.gif
trunk/testing/selenium_scripts/selenium/jsunit/images/powerby-transparent.gif
trunk/testing/selenium_scripts/selenium/jsunit/images/red.gif
trunk/testing/selenium_scripts/selenium/tests/dogfood/aut/html/banner.gif
trunk/testing/selenium_scripts/selenium/tests/html/banner.gif
trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini/src/html/images/shadowB.png
trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini/src/html/images/shadowBL.png
trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini/src/html/images/shadowBR.png
trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini/src/html/images/shadowL.png
trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini/src/html/images/shadowR.png
trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini/src/html/images/shadowT.png
trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini/src/html/images/shadowTL.png
trunk/testing/selenium_scripts/selenium/tests/html/dojo-0.4.0-mini/src/html/images/shadowTR.png
trunk/testing/selenium_scripts/selenium/tests/html/slider/example_files/img/bg.png
trunk/testing/selenium_scripts/selenium/tests/html/slider/example_files/img/left.png
trunk/testing/selenium_scripts/selenium/tests/html/slider/example_files/img/right.png
trunk/testing/selenium_scripts/selenium/tests/html/slider/example_files/knob.png
trunk/testing/selenium_scripts/selenium/tests/html/slider/example_files/knob2.png
