|
|
15f30b16e9
|
Merge branch 'branches/MultiDB_and_SingleProj' into branches/MovimentiContabili
# Conflicts:
# ems-contabil/.settings/org.eclipse.jdt.core.prefs
# ems-core/src/main/java/it/integry/ems/sync/SyncManager.java
# ems-engine/pom.xml
# ems-engine/src/main/java/it/integry/ems/controller/EmsController.java
# ems-model/src/main/java/it/integry/ems/base/EntityBase.java
# ems-model/src/main/java/it/integry/ems/coollection/Coollection.java
# ems-model/src/main/java/it/integry/ems/coollection/matcher/Matcher.java
# ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Contains.java
# ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Equals.java
# ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/GreaterThan.java
# ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/IsNull.java
# ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/LessThan.java
# ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Not.java
# ems-model/src/main/java/it/integry/ems/coollection/query/Query.java
# ems-model/src/main/java/it/integry/ems/coollection/query/criteria/Criteria.java
# ems-model/src/main/java/it/integry/ems/coollection/query/criteria/CriteriaList.java
# ems-model/src/main/java/it/integry/ems/coollection/query/order/Order.java
# ems-model/src/main/java/it/integry/ems/coollection/query/order/OrderComparator.java
# ems-model/src/main/java/it/integry/ems/coollection/query/order/OrderCriteria.java
# ems-model/src/main/java/it/integry/ems/coollection/query/specification/Specification.java
# ems-model/src/main/java/it/integry/ems/coollection/query/specification/custom/AndSpecification.java
# ems-model/src/main/java/it/integry/ems/coollection/query/specification/custom/OrSpecification.java
# ems-model/src/main/java/it/integry/ems/coollection/reflection/Phanton.java
|
2017-03-17 12:48:16 +01:00 |
|
|
|
4c8b1a66b8
|
Aggiunta regola su cartella target gitignore
|
2017-03-13 16:27:25 +01:00 |
|
|
|
977ff932d2
|
Applicato gitignore
|
2017-03-13 13:06:31 +01:00 |
|
|
|
8aa1920236
|
Merge branch 'develop' into branches/MultiDB_and_SingleProj
# Conflicts:
# .gitignore
|
2017-03-13 12:54:41 +01:00 |
|
MinaR
|
74e0044fc2
|
MultiDbTransaction
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/MultiDB_and_SingleProj@5713 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-03-13 10:28:38 +00:00 |
|
AntonellaD
|
488228ca16
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5709 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-03-10 16:52:08 +00:00 |
|
GiuseppeS
|
c0175b6d1e
|
Rimossi file nella cartella target e modificata la cartella con una all'esterno della repository.
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/MultiDB_and_SingleProj@5705 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-03-09 14:52:01 +00:00 |
|
MinaR
|
37c65d608b
|
Merge branch 'trunk' into branches/MultiDB_and_SingleProj
# Conflicts:
# ems-common/.classpath
# ems-core/src/main/java/it/integry/ems/datasource/DataSource.java
# ems-core/src/main/java/it/integry/ems/rules/completing/OrdWebRules.java
# ems-core/src/main/resources/rules/post_calc.drl
# ems-document/.classpath
# ems-model/.classpath
# ems-product/.classpath
# ems-system/.classpath
# ems-utility/.classpath
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/MultiDB_and_SingleProj@5697 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-03-08 09:29:48 +00:00 |
|
MinaR
|
562aef99cd
|
Importazione inventario Slim2k + nuova regola su inventari
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5694 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-03-08 08:46:50 +00:00 |
|
MinaR
|
483f47269e
|
Aggiunto campo flag_attivo su vtbConcorrenti
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5690 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-03-07 15:27:36 +00:00 |
|
AntonellaD
|
d04df96e9d
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5679 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-03-03 08:29:08 +00:00 |
|
GiuseppeS
|
83c936bcf0
|
Aggiunto FTPFileSharer
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/MultiDB_and_SingleProj@5671 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-28 08:32:42 +00:00 |
|
GiuseppeS
|
749d5b3c3f
|
Creato IFileSharer con EmailSharer.
Creato servizio di prova testEmailSender in SystemController.
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/MultiDB_and_SingleProj@5660 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-27 08:28:02 +00:00 |
|
MinaR
|
f61e0e4f01
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/MultiDB_and_SingleProj@5650 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-22 16:42:37 +00:00 |
|
GiuseppeS
|
2866e932aa
|
Aggiornato profile nel pom
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/MultiDB_and_SingleProj@5649 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-22 11:49:05 +00:00 |
|
GiuseppeS
|
1441e8da22
|
Aggiunto .gitignore
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/MultiDB_and_SingleProj@5640 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-21 12:08:49 +00:00 |
|
GiuseppeS
|
132b8abb18
|
Completata pagina web
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/MultiDB_and_SingleProj@5635 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-21 08:58:29 +00:00 |
|
MinaR
|
2968e04527
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/MovimentiContabili@5633 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-20 14:27:11 +00:00 |
|
MinaR
|
3889a6574a
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/MovimentiContabili@5630 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-20 11:34:07 +00:00 |
|
GiuseppeS
|
bbd8e26504
|
Fixata path serializzazione drools per Linux
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/MultiDB_and_SingleProj@5625 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-20 09:09:16 +00:00 |
|
GiuseppeS
|
07387392aa
|
Creato nuovo manager per le sincronizzazioni tra multi DB
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/MultiDB_and_SingleProj@5613 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-16 10:04:25 +00:00 |
|
GiuseppeS
|
fc4027664d
|
Fix path di serializzazione drools. Aggiunto progetto intellij
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/MultiDB_and_SingleProj@5612 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-16 10:04:16 +00:00 |
|
GiuseppeS
|
628a562c17
|
Completata build con profili su netbeans
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/MultiDB_and_SingleProj@5611 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-16 10:04:08 +00:00 |
|
GiuseppeS
|
dbf6bbcd06
|
Prima versione funzionante con Netbeans
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/MultiDB_and_SingleProj@5610 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-16 10:03:49 +00:00 |
|
RosannaR
|
de225a0982
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5600 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-14 15:26:30 +00:00 |
|
RosannaR
|
9c5e8c06b4
|
Sostituzione del Double con BigDecimal nella entity degli ordini Web e riorganizzazione delle regole
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5590 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-10 18:17:54 +00:00 |
|
RosannaR
|
15b52d408e
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5578 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-08 09:33:45 +00:00 |
|
MinaR
|
a054a48b95
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5569 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-07 13:21:44 +00:00 |
|
MinaR
|
00608f4456
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5562 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-03 16:57:20 +00:00 |
|
MinaR
|
29e5da2e39
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5561 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-03 16:52:34 +00:00 |
|
FabioN
|
eeb0d4a837
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5558 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-02-03 16:33:54 +00:00 |
|
RosannaR
|
0237cba4cc
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5542 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-01-31 09:09:30 +00:00 |
|
GiuseppeS
|
7c7cda9e46
|
Implementata serializzazione dell'istanza attuale di Drools in modo da poter caricare le regole già compilate al posto di compilarle ad ogni avvio di Tomcat
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5538 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-01-30 14:39:36 +00:00 |
|
AntonellaD
|
60067be237
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5531 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-01-27 17:33:26 +00:00 |
|
FabioN
|
44994dfeb4
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5477 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-01-20 12:09:10 +00:00 |
|
RosannaR
|
676d51aaf2
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5475 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-01-20 11:35:07 +00:00 |
|
GiuseppeS
|
fab1a73256
|
Merge branch 'trunk' into branches/EntityPeppe
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/EntityPeppe@5468 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-01-20 08:40:30 +00:00 |
|
GiuseppeS
|
f70f7d898f
|
Merge branch 'trunk' into branches/EntityPeppe
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/EntityPeppe@5466 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-01-20 08:38:49 +00:00 |
|
GiuseppeS
|
23e183649b
|
Servizi per terminalino e servizio per ExcelGantt
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/EntityPeppe@5465 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-01-20 08:38:36 +00:00 |
|
MinaR
|
4c386dac28
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5457 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-01-18 07:42:08 +00:00 |
|
MinaR
|
916798cabc
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5456 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-01-17 18:40:28 +00:00 |
|
AntonellaD
|
f64be234d1
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5437 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-01-17 09:57:57 +00:00 |
|
MinaR
|
6257e1f871
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5434 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-01-17 09:02:20 +00:00 |
|
FabioN
|
5e83616432
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5418 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-01-16 10:54:38 +00:00 |
|
MinaR
|
1556de2066
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5399 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-01-11 10:51:10 +00:00 |
|
RosannaR
|
7a55832e1e
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5391 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-01-04 13:57:12 +00:00 |
|
FabioN
|
4b9fb6beb0
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5382 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2017-01-03 10:39:44 +00:00 |
|
MinaR
|
4927cce538
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5373 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2016-12-30 16:58:05 +00:00 |
|
AntonellaD
|
7059faf3fc
|
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/trunk@5369 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2016-12-28 16:42:00 +00:00 |
|
tirocinio
|
5605e02a50
|
Entity Utenti
git-svn-id: https://serverad.studio-ml.local/svn/repo/projects/IntegryManagmentSystem/branches/EntityPeppe@5351 7169d44f-50de-5945-979c-d5cbc11e8a2d
|
2016-12-21 10:11:42 +00:00 |
|
