1. 31 Oct, 2014 1 commit
  2. 30 Oct, 2014 1 commit
  3. 29 Oct, 2014 1 commit
  4. 28 Oct, 2014 1 commit
  5. 27 Oct, 2014 4 commits
  6. 24 Oct, 2014 10 commits
  7. 23 Oct, 2014 3 commits
  8. 22 Oct, 2014 10 commits
  9. 21 Oct, 2014 4 commits
  10. 20 Oct, 2014 4 commits
  11. 17 Oct, 2014 1 commit
    • Romain Bioteau's avatar
      Merge remote-tracking branch 'origin/master' into MasterBugFixing · 51f187dc
      Romain Bioteau authored
      Conflicts:
      	bundles/plugins/org.bonitasoft.studio-models/process.history
      	bundles/plugins/org.bonitasoft.studio.common/src-test/java/org/bonitasoft/studio/common/emf/tools/ExpressionHelperTest.java
      	bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/NamingUtils.java
      	bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/emf/tools/ExpressionHelper.java
      	bundles/plugins/org.bonitasoft.studio.connectors/messages.properties
      	bundles/plugins/org.bonitasoft.studio.data/src/org/bonitasoft/studio/data/provider/DocumentReferenceExpressionProvider.java
      	bundles/plugins/org.bonitasoft.studio.document/src/org/bonitasoft/studio/document/ui/DocumentWizardPage.java
      	bundles/plugins/org.bonitasoft.studio.engine/src-test/java/org/bonitasoft/studio/engine/export/EngineExpressionUtilTest.java
      	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/operation/OperationReturnTypesValidator.java
      	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/operation/OperationViewer.java
      	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/operation/OperationsComposite.java
      	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/viewer/ExpressionViewer.java
      	bundles/plugins/org.bonitasoft.studio.properties/src/org/bonitasoft/studio/properties/sections/document/DocumentPropertySection.java
      	tests/org.bonitasoft.studio.importer.bar.tests/src/org/bonitasoft/studio/importer/bar/tests/TestSimpleMigrationUseCase.java
      	tests/org.bonitasoft.studio.test.swtbot.util/src/org/bonitasoft/studio/test/swtbot/util/SWTBotTestUtil.java
      	tests/org.bonitasoft.studio.tests/META-INF/MANIFEST.MF
      	translations/de/org.bonitasoft.studio.connectors.nl_de/messages_de.properties
      	translations/es/org.bonitasoft.studio.common.nl_es/messages_es.properties
      	translations/es/org.bonitasoft.studio.connectors.nl_es/messages_es.properties
      	translations/es/org.bonitasoft.studio.data.nl_es/messages_es.properties
      	translations/fr/org.bonitasoft.studio.connectors.nl_fr/messages_fr.properties
      	translations/it/org.bonitasoft.studio.connectors.nl_it/messages_it.properties
      	translations/pt/org.bonitasoft.studio.connectors.nl_pt/messages_pt.properties
      51f187dc