Commits · 65a48327fcf0fc54a01f7bf4b8aff38db9886ce6 · bonita / bonita-studio

13 Nov, 2014 1 commit
- [TRANSLATION] Get latest translation from Crowdin, 74 modified lines · 65a48327
  Bonita CI authored Nov 13, 2014
  
  65a48327
12 Nov, 2014 2 commits
- Merge branch 'BS-9216_LivingAppMenu_v2' into 'master' · 20e0a28c
  Bonita CI authored Nov 12, 2014
  
  20e0a28c
- Merge branch 'master' into 'BS-9216_LivingAppMenu_v2' · 9c199df1
  Bonita CI authored Nov 12, 2014
  
  9c199df1
11 Nov, 2014 4 commits
- Revert trunk snapshot version · ea2d0d75
  Bonita CI authored Nov 11, 2014
  
  ea2d0d75
- Tag bos-studio-6.4.0.alpha-01-201411111900 from ci · c9101e4b
  Bonita CI authored Nov 11, 2014
  
  c9101e4b
- Revert trunk snapshot version · f977878e
  Bonita CI authored Nov 11, 2014
  
  f977878e
- Tag bos-studio-6.4.0_TEST-201411111540 from ci · 13dc8374
  Bonita CI authored Nov 11, 2014
  
  13dc8374
10 Nov, 2014 16 commits
- Merge branch 'master' into 'BS-9216_LivingAppMenu_v2' · aee0732e
  Bonita CI authored Nov 10, 2014
  
  aee0732e
- Merge branch 'BS-10568_DM_Rest_API' into 'master' · 71b63a47
  Bonita CI authored Nov 10, 2014
  
  71b63a47
- Merge branch 'master' into 'BS-10568_DM_Rest_API' · 71705e95
  Bonita CI authored Nov 10, 2014
  
  71705e95
- Merge branch 'BS-10568_DM_Rest_API' into 'master' · de678a96
  Bonita CI authored Nov 10, 2014
  
  de678a96
- Merge branch 'master' into 'BS-10568_DM_Rest_API' · b29b2e29
  Bonita CI authored Nov 10, 2014
  
  b29b2e29
- Merge branch 'BS-11016_ProcessMonitoring-ErrorManagement' into 'master' · 441e1633
  Bonita CI authored Nov 10, 2014
  
  441e1633
- Merge branch 'master' into 'BS-11016_ProcessMonitoring-ErrorManagement' · 3b21c3ce
  Bonita CI authored Nov 10, 2014
  
  3b21c3ce
- Merge branch 'BS-9319_DevCollabImprSVN' into 'master' · 18665d30
  Bonita CI authored Nov 10, 2014
  
  18665d30
- Merge branch 'master' into 'BS-11016_ProcessMonitoring-ErrorManagement' · 0257aac3
  Bonita CI authored Nov 10, 2014
  
  0257aac3
- Merge branch 'master' into 'BS-9319_DevCollabImprSVN' · 40985458
  Bonita CI authored Nov 10, 2014
  
  40985458
- fix open diagram refresh button · bac0deb6
  Romain Bioteau authored Nov 10, 2014
  
  bac0deb6
- Use the correct resource to load. Will avoid random NPE. · 2065f91e
  apupier authored Nov 10, 2014
  
  2065f91e
- Merge branch 'master' into 'BS-10568_DM_Rest_API' · 13da24f5
  Bonita CI authored Nov 10, 2014
  
  13da24f5
- Merge branch 'master' into 'BS-11016_ProcessMonitoring-ErrorManagement' · c596e1b0
  Bonita CI authored Nov 10, 2014
  
  c596e1b0
- Merge branch 'master' into 'BS-9319_DevCollabImprSVN' · 2c1301f7
  Bonita CI authored Nov 10, 2014
  
  2c1301f7
- fix import · 8192ff61
  Romain Bioteau authored Nov 10, 2014
  
  8192ff61
08 Nov, 2014 17 commits
- Merge branch 'master' into 'BS-9319_DevCollabImprSVN' · 6e8ff421
  Bonita CI authored Nov 08, 2014
  
  6e8ff421
- On import, fix when there are several subfolders which correspond to · 3c881fa2
  apupier authored Nov 08, 2014
```
different repository stores due to previous refactoring code commit 
```
  3c881fa2
- Merge branch 'master' into 'BS-11016_ProcessMonitoring-ErrorManagement' · 69d70a86
  Bonita CI authored Nov 08, 2014
  
  69d70a86
- Fix case of no MANIFEST in .bos to import which was broken with previous · c315a787
  apupier authored Nov 08, 2014
```
refactor
```
  c315a787
- Merge branch 'master' into 'BS-11016_ProcessMonitoring-ErrorManagement' · 46d1a781
  Bonita CI authored Nov 08, 2014
  
  46d1a781
- Merge remote-tracking branch 'origin/master' into · f8a0bd1a
  apupier authored Nov 08, 2014
```
BS-9319_DevCollabImprSVN

Conflicts:
	bundles/plugins/org.bonitasoft.studio.condition.ui/src/org/bonitasoft/studio/condition/ui/expression/ComparisonExpressionValidator.java
	bundles/plugins/org.bonitasoft.studio.diagram.custom/src/org/bonitasoft/studio/diagram/custom/repository/DiagramFileStore.java
	bundles/plugins/org.bonitasoft.studio.migration/src-test/java/org/bonitasoft/studio/migration/custom/migration/form/FileWidgetDocumentMigrationTest.java
	bundles/plugins/org.bonitasoft.studio.migration/src/org/bonitasoft/studio/migration/custom/migration/form/FileWidgetDocumentMigration.java
```
  f8a0bd1a
- Merge branch 'MasterBugFixing' into 'master' · aeb27e94
  Bonita CI authored Nov 08, 2014
  
  aeb27e94
- BS-11266 · e99e7c4d
  Romain Bioteau authored Nov 08, 2014
```
Fix + restore default value
```
  e99e7c4d
- Try to make complexity of code lower · 5fcb243b
  Florine Boudin authored Nov 08, 2014
  
  5fcb243b
- refactor import bos operation · 90ab777d
  Romain Bioteau authored Nov 08, 2014
  
  90ab777d
- fix messages · 7fad6a42
  Romain Bioteau authored Nov 08, 2014
  
  7fad6a42
- BS-11314 Add test on the migrationBefore · 585796ba
  Florine Boudin authored Nov 08, 2014
  
  585796ba
- BS-11264 Add tests, and modified getElements and getChildren to return · 55812c74
  Florine Boudin authored Nov 08, 2014
```
empty table instead of null.
```
  55812c74
- Merge branch 'master' into 'BS-9216_LivingAppMenu_v2' · 06b971ec
  Bonita CI authored Nov 08, 2014
  
  06b971ec
- remove invalid import · 803b691e
  Florine Boudin authored Nov 08, 2014
  
  803b691e
- BS-10578 · 4d100592
  Romain Bioteau authored Nov 08, 2014
```
Fix integration tests
```
  4d100592
- BS-8581 · 227c8270
  Romain Bioteau authored Nov 08, 2014
```
Add .ico with 256x256 resolution
```
  227c8270