Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial OpenCATS running on Symfony + Codeception test framework #256

Open
wants to merge 181 commits into
base: develop
Choose a base branch
from

Conversation

mlespiau
Copy link
Contributor

Wiki draft: https://github.com/opencats/OpenCATS/wiki/Dev-Guide-to-migrate-Legacy-to-Symfony
Changes:

  • Add symfony project to github repo
  • Ignore symfony dynamic files in .gitignore
  • Create a Symfony Controller (LegacyController) to bridge OpenCATS and Symfony. Now all requests go through Symfony and are routed to "legacy" OpenCATS code.
  • Enabled opcache in docker image (required for Symfony performance)
  • Use legacy session management in symfony to make it compatible with "legacy" OpenCATS
  • Move all static assets (css, js, images) to web folder
  • Add toolbar UI support for OpenCATS chrome extension
  • Replace whole testing tooling with Codeception and updated all test code to work with it
  • Use a new simple docker image with php + nginx + application code

mlespiau and others added 30 commits December 5, 2016 17:33
Add Toolbar UI to support OpenCATS chrome extension
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
# Conflicts:
#	ajax.php
#	index.php
#	lib/TemplateUtility.php
#	modules/candidates/SendEmail.tpl
#	modules/import/ImportResumes.tpl
#	modules/queue/tasks.php
#	modules/queue/tasks/Sphinx.php
#	modules/settings/AspDownloads.tpl
#	modules/toolbar/ToolbarUI.php
… from two containers to a single container for php + nginx)
@skrchnavy
Copy link
Contributor

@mlespiau This PR shall have dependency on #257 and #260, when those PRs merged to develop, then develop shall be merged to this PR's branch (conflict solved using mine - to use symfony branch code)

Then we can concentrate on review of real changes.

# Conflicts:
#	QueueCLI.php
#	ajax.php
#	ajax/getCandidateIdByEmail.php
#	code/src/AppBundle/tests/unit/AJAXInterfaceTest.php
#	code/src/AppBundle/tests/unit/AddressParserTest.php
#	code/src/AppBundle/tests/unit/ArrayUtilityTest.php
#	code/src/AppBundle/tests/unit/BrowserDetectionTest.php
#	code/src/AppBundle/tests/unit/CompanyRepositoryTest.php
#	code/src/AppBundle/tests/unit/DatabaseSearchTest.php
#	code/src/AppBundle/tests/unit/DatabaseTestCase.php
#	code/src/AppBundle/tests/unit/DateUtilityTest.php
#	code/src/AppBundle/tests/unit/FileUtilityTest.php
#	code/src/AppBundle/tests/unit/ResultSetUtilityTest.php
#	code/src/AppBundle/tests/unit/StringUtilityTest.php
#	code/src/AppBundle/tests/unit/VCardTest.php
#	index.php
#	installtest.php
#	lib/CATSUtility.php
#	lib/Dashboard.php
#	lib/ModuleUtility.php
#	lib/TemplateUtility.php
#	modules/candidates/CandidatesUI.php
#	modules/install/ajax/attachmentsReindex.php
#	modules/install/ajax/attachmentsToThreeDirectory.php
#	modules/install/ajax/ui.php
#	modules/queue/tasks.php
#	modules/queue/tasks/Sphinx.php
#	modules/settings/AspDownloads.tpl
#	modules/tests/waitForDb.php
#	scripts/makeBackup.php
#	test/config.php
#	test/features/bootstrap/FeatureContext.php
# Conflicts:
#	code/web/ckeditor/.htaccess
#	code/web/ckeditor/CHANGES.html
#	code/web/ckeditor/CHANGES.md
#	code/web/ckeditor/INSTALL.html
#	code/web/ckeditor/LICENSE.html
#	code/web/ckeditor/LICENSE.md
#	code/web/ckeditor/README.md
#	code/web/ckeditor/adapters/jquery.js
#	code/web/ckeditor/build-config.js
#	code/web/ckeditor/ckeditor.js
#	code/web/ckeditor/ckeditor.pack
#	code/web/ckeditor/ckeditor.php
#	code/web/ckeditor/ckeditor_basic.js
#	code/web/ckeditor/ckeditor_basic_source.js
#	code/web/ckeditor/ckeditor_php4.php
#	code/web/ckeditor/ckeditor_php5.php
#	code/web/ckeditor/ckeditor_source.js
#	code/web/ckeditor/config.js
#	code/web/ckeditor/contents.css
#	code/web/ckeditor/lang/af.js
#	code/web/ckeditor/lang/ar.js
#	code/web/ckeditor/lang/bg.js
#	code/web/ckeditor/lang/bn.js
#	code/web/ckeditor/lang/bs.js
#	code/web/ckeditor/lang/ca.js
#	code/web/ckeditor/lang/cs.js
#	code/web/ckeditor/lang/cy.js
#	code/web/ckeditor/lang/da.js
#	code/web/ckeditor/lang/de-ch.js
#	code/web/ckeditor/lang/de.js
#	code/web/ckeditor/lang/el.js
#	code/web/ckeditor/lang/en-au.js
#	code/web/ckeditor/lang/en-ca.js
#	code/web/ckeditor/lang/en-gb.js
#	code/web/ckeditor/lang/en.js
#	code/web/ckeditor/lang/eo.js
#	code/web/ckeditor/lang/es.js
#	code/web/ckeditor/lang/et.js
#	code/web/ckeditor/lang/eu.js
#	code/web/ckeditor/lang/fa.js
#	code/web/ckeditor/lang/fi.js
#	code/web/ckeditor/lang/fo.js
#	code/web/ckeditor/lang/fr-ca.js
#	code/web/ckeditor/lang/fr.js
#	code/web/ckeditor/lang/gl.js
#	code/web/ckeditor/lang/gu.js
#	code/web/ckeditor/lang/he.js
#	code/web/ckeditor/lang/hi.js
#	code/web/ckeditor/lang/hr.js
#	code/web/ckeditor/lang/hu.js
#	code/web/ckeditor/lang/id.js
#	code/web/ckeditor/lang/is.js
#	code/web/ckeditor/lang/it.js
#	code/web/ckeditor/lang/ja.js
#	code/web/ckeditor/lang/ka.js
#	code/web/ckeditor/lang/km.js
#	code/web/ckeditor/lang/ko.js
#	code/web/ckeditor/lang/ku.js
#	code/web/ckeditor/lang/lt.js
#	code/web/ckeditor/lang/lv.js
#	code/web/ckeditor/lang/mk.js
#	code/web/ckeditor/lang/mn.js
#	code/web/ckeditor/lang/ms.js
#	code/web/ckeditor/lang/nb.js
#	code/web/ckeditor/lang/nl.js
#	code/web/ckeditor/lang/no.js
#	code/web/ckeditor/lang/pl.js
#	code/web/ckeditor/lang/pt-br.js
#	code/web/ckeditor/lang/pt.js
#	code/web/ckeditor/lang/ro.js
#	code/web/ckeditor/lang/ru.js
#	code/web/ckeditor/lang/si.js
#	code/web/ckeditor/lang/sk.js
#	code/web/ckeditor/lang/sl.js
#	code/web/ckeditor/lang/sq.js
#	code/web/ckeditor/lang/sr-latn.js
#	code/web/ckeditor/lang/sr.js
#	code/web/ckeditor/lang/sv.js
#	code/web/ckeditor/lang/th.js
#	code/web/ckeditor/lang/tr.js
#	code/web/ckeditor/lang/tt.js
#	code/web/ckeditor/lang/ug.js
#	code/web/ckeditor/lang/uk.js
#	code/web/ckeditor/lang/vi.js
#	code/web/ckeditor/lang/zh-cn.js
#	code/web/ckeditor/lang/zh.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
#	code/web/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
#	code/web/ckeditor/plugins/about/dialogs/about.js
#	code/web/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png
#	code/web/ckeditor/plugins/about/dialogs/logo_ckeditor.png
#	code/web/ckeditor/plugins/clipboard/dialogs/paste.js
#	code/web/ckeditor/plugins/dialog/dialogDefinition.js
#	code/web/ckeditor/plugins/font/lang/af.js
#	code/web/ckeditor/plugins/font/lang/ar.js
#	code/web/ckeditor/plugins/font/lang/bg.js
#	code/web/ckeditor/plugins/font/lang/bn.js
#	code/web/ckeditor/plugins/font/lang/bs.js
#	code/web/ckeditor/plugins/font/lang/ca.js
#	code/web/ckeditor/plugins/font/lang/cs.js
#	code/web/ckeditor/plugins/font/lang/cy.js
#	code/web/ckeditor/plugins/font/lang/da.js
#	code/web/ckeditor/plugins/font/lang/de-ch.js
#	code/web/ckeditor/plugins/font/lang/de.js
#	code/web/ckeditor/plugins/font/lang/el.js
#	code/web/ckeditor/plugins/font/lang/en-au.js
#	code/web/ckeditor/plugins/font/lang/en-ca.js
#	code/web/ckeditor/plugins/font/lang/en-gb.js
#	code/web/ckeditor/plugins/font/lang/en.js
#	code/web/ckeditor/plugins/font/lang/eo.js
#	code/web/ckeditor/plugins/font/lang/es.js
#	code/web/ckeditor/plugins/font/lang/et.js
#	code/web/ckeditor/plugins/font/lang/eu.js
#	code/web/ckeditor/plugins/font/lang/fa.js
#	code/web/ckeditor/plugins/font/lang/fi.js
#	code/web/ckeditor/plugins/font/lang/fo.js
#	code/web/ckeditor/plugins/font/lang/fr-ca.js
#	code/web/ckeditor/plugins/font/lang/fr.js
#	code/web/ckeditor/plugins/font/lang/gl.js
#	code/web/ckeditor/plugins/font/lang/gu.js
#	code/web/ckeditor/plugins/font/lang/he.js
#	code/web/ckeditor/plugins/font/lang/hi.js
#	code/web/ckeditor/plugins/font/lang/hr.js
#	code/web/ckeditor/plugins/font/lang/hu.js
#	code/web/ckeditor/plugins/font/lang/id.js
#	code/web/ckeditor/plugins/font/lang/is.js
#	code/web/ckeditor/plugins/font/lang/it.js
#	code/web/ckeditor/plugins/font/lang/ja.js
#	code/web/ckeditor/plugins/font/lang/ka.js
#	code/web/ckeditor/plugins/font/lang/km.js
#	code/web/ckeditor/plugins/font/lang/ko.js
#	code/web/ckeditor/plugins/font/lang/ku.js
#	code/web/ckeditor/plugins/font/lang/lt.js
#	code/web/ckeditor/plugins/font/lang/lv.js
#	code/web/ckeditor/plugins/font/lang/mk.js
#	code/web/ckeditor/plugins/font/lang/mn.js
#	code/web/ckeditor/plugins/font/lang/ms.js
#	code/web/ckeditor/plugins/font/lang/nb.js
#	code/web/ckeditor/plugins/font/lang/nl.js
#	code/web/ckeditor/plugins/font/lang/no.js
#	code/web/ckeditor/plugins/font/lang/oc.js
#	code/web/ckeditor/plugins/font/lang/pl.js
#	code/web/ckeditor/plugins/font/lang/pt-br.js
#	code/web/ckeditor/plugins/font/lang/pt.js
#	code/web/ckeditor/plugins/font/lang/ro.js
#	code/web/ckeditor/plugins/font/lang/ru.js
#	code/web/ckeditor/plugins/font/lang/si.js
#	code/web/ckeditor/plugins/font/lang/sk.js
#	code/web/ckeditor/plugins/font/lang/sl.js
#	code/web/ckeditor/plugins/font/lang/sq.js
#	code/web/ckeditor/plugins/font/lang/sr-latn.js
#	code/web/ckeditor/plugins/font/lang/sr.js
#	code/web/ckeditor/plugins/font/lang/sv.js
#	code/web/ckeditor/plugins/font/lang/th.js
#	code/web/ckeditor/plugins/font/lang/tr.js
#	code/web/ckeditor/plugins/font/lang/tt.js
#	code/web/ckeditor/plugins/font/lang/ug.js
#	code/web/ckeditor/plugins/font/lang/uk.js
#	code/web/ckeditor/plugins/font/lang/vi.js
#	code/web/ckeditor/plugins/font/lang/zh-cn.js
#	code/web/ckeditor/plugins/font/lang/zh.js
#	code/web/ckeditor/plugins/font/plugin.js
#	code/web/ckeditor/plugins/icons.png
#	code/web/ckeditor/plugins/icons_hidpi.png
#	code/web/ckeditor/plugins/image/dialogs/image.js
#	code/web/ckeditor/plugins/image/images/noimage.png
#	code/web/ckeditor/plugins/link/dialogs/anchor.js
#	code/web/ckeditor/plugins/link/dialogs/link.js
#	code/web/ckeditor/plugins/link/images/anchor.png
#	code/web/ckeditor/plugins/link/images/hidpi/anchor.png
#	code/web/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png
#	code/web/ckeditor/plugins/magicline/images/hidpi/icon.png
#	code/web/ckeditor/plugins/magicline/images/icon-rtl.png
#	code/web/ckeditor/plugins/magicline/images/icon.png
#	code/web/ckeditor/plugins/pastefromword/filter/default.js
#	code/web/ckeditor/plugins/scayt/CHANGELOG.md
#	code/web/ckeditor/plugins/scayt/LICENSE.md
#	code/web/ckeditor/plugins/scayt/README.md
#	code/web/ckeditor/plugins/scayt/dialogs/options.js
#	code/web/ckeditor/plugins/scayt/dialogs/toolbar.css
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/af.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/ar.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/bg.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/ca.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/cs.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/cy.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/da.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/de.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/el.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/en.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/eo.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/es.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/et.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/eu.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/fa.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/fi.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/fr.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/gl.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/he.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/hr.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/hu.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/id.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/it.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/ja.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/km.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/ko.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/ku.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/lt.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/lv.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/nb.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/nl.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/no.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/pl.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/pt.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/ru.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/si.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/sk.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/sl.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/sq.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/sv.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/th.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/tr.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/tt.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/ug.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/uk.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/vi.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
#	code/web/ckeditor/plugins/specialchar/dialogs/lang/zh.js
#	code/web/ckeditor/plugins/specialchar/dialogs/specialchar.js
#	code/web/ckeditor/plugins/table/dialogs/table.js
#	code/web/ckeditor/plugins/tabletools/dialogs/tableCell.js
#	code/web/ckeditor/plugins/wsc/LICENSE.md
#	code/web/ckeditor/plugins/wsc/README.md
#	code/web/ckeditor/plugins/wsc/dialogs/ciframe.html
#	code/web/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
#	code/web/ckeditor/plugins/wsc/dialogs/wsc.css
#	code/web/ckeditor/plugins/wsc/dialogs/wsc.js
#	code/web/ckeditor/plugins/wsc/dialogs/wsc_ie.js
#	code/web/ckeditor/samples/css/samples.css
#	code/web/ckeditor/samples/img/github-top.png
#	code/web/ckeditor/samples/img/header-bg.png
#	code/web/ckeditor/samples/img/header-separator.png
#	code/web/ckeditor/samples/img/logo.png
#	code/web/ckeditor/samples/img/navigation-tip.png
#	code/web/ckeditor/samples/index.html
#	code/web/ckeditor/samples/js/sample.js
#	code/web/ckeditor/samples/js/sf.js
#	code/web/ckeditor/samples/old/ajax.html
#	code/web/ckeditor/samples/old/api.html
#	code/web/ckeditor/samples/old/appendto.html
#	code/web/ckeditor/samples/old/assets/inlineall/logo.png
#	code/web/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
#	code/web/ckeditor/samples/old/assets/posteddata.php
#	code/web/ckeditor/samples/old/assets/sample.jpg
#	code/web/ckeditor/samples/old/assets/uilanguages/languages.js
#	code/web/ckeditor/samples/old/datafiltering.html
#	code/web/ckeditor/samples/old/dialog/assets/my_dialog.js
#	code/web/ckeditor/samples/old/dialog/dialog.html
#	code/web/ckeditor/samples/old/divreplace.html
#	code/web/ckeditor/samples/old/enterkey/enterkey.html
#	code/web/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla
#	code/web/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf
#	code/web/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js
#	code/web/ckeditor/samples/old/htmlwriter/outputforflash.html
#	code/web/ckeditor/samples/old/htmlwriter/outputhtml.html
#	code/web/ckeditor/samples/old/index.html
#	code/web/ckeditor/samples/old/inlineall.html
#	code/web/ckeditor/samples/old/inlinebycode.html
#	code/web/ckeditor/samples/old/inlinetextarea.html
#	code/web/ckeditor/samples/old/jquery.html
#	code/web/ckeditor/samples/old/magicline/magicline.html
#	code/web/ckeditor/samples/old/readonly.html
#	code/web/ckeditor/samples/old/replacebyclass.html
#	code/web/ckeditor/samples/old/replacebycode.html
#	code/web/ckeditor/samples/old/sample.css
#	code/web/ckeditor/samples/old/sample.js
#	code/web/ckeditor/samples/old/sample_posteddata.php
#	code/web/ckeditor/samples/old/tabindex.html
#	code/web/ckeditor/samples/old/toolbar/toolbar.html
#	code/web/ckeditor/samples/old/uicolor.html
#	code/web/ckeditor/samples/old/uilanguages.html
#	code/web/ckeditor/samples/old/wysiwygarea/fullpage.html
#	code/web/ckeditor/samples/old/xhtmlstyle.html
#	code/web/ckeditor/samples/toolbarconfigurator/css/fontello.css
#	code/web/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt
#	code/web/ckeditor/samples/toolbarconfigurator/font/config.json
#	code/web/ckeditor/samples/toolbarconfigurator/font/fontello.eot
#	code/web/ckeditor/samples/toolbarconfigurator/font/fontello.svg
#	code/web/ckeditor/samples/toolbarconfigurator/font/fontello.ttf
#	code/web/ckeditor/samples/toolbarconfigurator/font/fontello.woff
#	code/web/ckeditor/samples/toolbarconfigurator/index.html
#	code/web/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
#	code/web/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js
#	code/web/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js
#	code/web/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js
#	code/web/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE
#	code/web/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css
#	code/web/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js
#	code/web/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js
#	code/web/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css
#	code/web/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css
#	code/web/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js
#	code/web/ckeditor/skins/moono/editor_ie7.css
#	code/web/ckeditor/skins/moono/icons.png
#	code/web/ckeditor/skins/moono/icons_hidpi.png
#	code/web/ckeditor/skins/moono/images/arrow.png
#	code/web/ckeditor/skins/moono/images/close.png
#	code/web/ckeditor/skins/moono/images/hidpi/close.png
#	code/web/ckeditor/skins/moono/images/hidpi/lock-open.png
#	code/web/ckeditor/skins/moono/images/hidpi/lock.png
#	code/web/ckeditor/skins/moono/images/hidpi/refresh.png
#	code/web/ckeditor/skins/moono/images/lock-open.png
#	code/web/ckeditor/skins/moono/images/lock.png
#	code/web/ckeditor/skins/moono/images/refresh.png
#	code/web/ckeditor/skins/moono/images/spinner.gif
#	code/web/ckeditor/skins/moono/readme.md
#	code/web/ckeditor/styles.js
#	composer.json
#	composer.lock
#	index.php
#	modules/candidates/SendEmail.tpl
#	modules/joborders/Add.tpl
#	modules/joborders/Edit.tpl
@mlespiau mlespiau changed the base branch from develop to master May 12, 2017 08:48
@mlespiau mlespiau changed the base branch from master to develop May 12, 2017 08:48
@mlespiau mlespiau changed the base branch from develop to master May 12, 2017 08:50
@mlespiau mlespiau changed the base branch from master to develop May 12, 2017 08:50
@skrchnavy skrchnavy changed the base branch from develop to master May 12, 2017 18:15
@skrchnavy skrchnavy changed the base branch from master to develop May 12, 2017 18:15
@skrchnavy skrchnavy changed the base branch from develop to master May 12, 2017 18:17
@skrchnavy skrchnavy changed the base branch from master to develop May 12, 2017 18:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants