Richard Yujra
efe034d790
Merge remote branch 'upstream/master'
2014-03-06 13:07:50 -04:00
Richard Yujra
8afa6bae3c
Merged colosa/processmaker into master
2014-03-06 13:03:11 -04:00
Freddy Daniel Rojas Valda
a569ba1a0b
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-06 12:55:00 -04:00
Freddy Daniel Rojas Valda
d3b6b4eabc
Se modifica la creacion y eliminacion de folders, se corrigen nombres de variables para los mensajes de error en FILEMANAGER
2014-03-06 12:53:27 -04:00
Erik Amaru Ortiz
f1cb7170d8
Completing UI integration for new Export methods and fixing some details
2014-03-06 12:39:16 -04:00
erik ao
9dbc0796ea
Merged in wnestor/processmaker (pull request #276 )
...
Mejoras y avance de los feature case scheduler, file manager, trigger wizards y steps
2014-03-06 12:12:52 -04:00
erik ao
191a7d640f
Merged in cochalo/processmaker (pull request #277 )
...
Correcion de DEPARTAMENTS a DEPARTMENTS
2014-03-06 12:12:02 -04:00
Erik Amaru Ortiz
07533e7940
Fix for HttpStream class, updating old scheme to updater return value using pathinfo() func.
2014-03-06 12:10:00 -04:00
Brayan Osmar Pereyra Suxo
7d67ceded8
Correcion de DEPARTAMENTSs a DEPARTMENTS
2014-03-06 10:40:50 -04:00
Erik Amaru Ortiz
cf0881302b
Adding Support t return versions like: 1.1 or 2.4.9 for Util\Common::getLastVersion(...) and its unit test
2014-03-06 10:16:14 -04:00
Wendy Nestor
effae6efba
arreglos en file manager y step
2014-03-06 09:48:06 -04:00
Wendy Nestor
42f8e30e35
Mejoras y avance de los feature case scheduler, file manager, trigger wizards
2014-03-06 09:28:34 -04:00
Marco Antonio Nina
ebb3c7c2a7
Merge remote branch 'upstream/master'
2014-03-06 08:37:08 -04:00
Erik Amaru Ortiz
2e80216aa0
FIX typing error on __constructor declaration
2014-03-05 20:19:25 -04:00
Erik Amaru Ortiz
611073ab90
Integrating new class Util\HttpStream for export mehods, bpmn and old projects.
2014-03-05 20:15:53 -04:00
Erik Amaru Ortiz
6f385257ea
Adding ProcessMaker\Util\IO\HttpStream class to handle and send http streams from file ot string
2014-03-05 20:14:32 -04:00
Erik Amaru Ortiz
f455310070
Adding ProcessMaker\Util\Common class utility and unit test
2014-03-05 20:12:21 -04:00
Erik Amaru Ortiz
234f112323
Updating Exporter and XmlExporter classes
2014-03-05 20:10:34 -04:00
Erik Amaru Ortiz
ebd13d10ba
Adding exists() function for BpmnProject model class
2014-03-05 20:09:36 -04:00
Erik Amaru Ortiz
f18f96f6b4
adding processes class into autoloading process
...
- setting as static function to g::streamFile(...)
2014-03-05 20:05:33 -04:00
erik ao
cb66859ce7
Merged in darojas/processmaker (pull request #274 )
...
Se aumenta end point para borrar folders en FILESMANAGER (incluido BEHAT). Se agrega listado de InputDocuments con WS (no es la version final)
2014-03-05 16:41:41 -04:00
erik ao
78bc1c7ff5
Merged in cochalo/processmaker (pull request #275 )
...
Adicion de DEPARTAMENTS
2014-03-05 16:40:49 -04:00
Brayan Osmar Pereyra Suxo
469bf2f6fb
Adicion de DEPARTAMENTS
2014-03-05 16:28:21 -04:00
Freddy Daniel Rojas Valda
af7299e1f8
Se aumenta end point para borrar folders en FILESMANAGER (incluido BEHAT). Se agrega listado de InputDocuments con WS (no es la version final)
2014-03-05 16:02:35 -04:00
Fernando Ontiveros
69cc51ad9a
fixing error,... part II
2014-03-05 12:04:54 -05:00
erik ao
25e123065f
Merged in wnestor/processmaker (pull request #273 )
...
Modificacion de nombre
2014-03-05 12:11:51 -04:00
erik ao
002ff4cec5
Merged in darojas/processmaker (pull request #272 )
...
Se corrigen label de mensaje 404 (Victor-Features).
2014-03-05 12:11:21 -04:00
erik ao
35dda41b30
Merged in cochalo/processmaker (pull request #271 )
...
Correcion de labels 404
2014-03-05 12:10:08 -04:00
Wendy Nestor
7b9be87e0d
Modificacion de nombre
2014-03-05 11:49:52 -04:00
Marco Antonio Nina
eb03f728bc
Merge remote branch 'upstream/master'
2014-03-05 11:28:30 -04:00
Freddy Daniel Rojas Valda
cff175ff90
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-05 11:23:19 -04:00
Freddy Daniel Rojas Valda
3dec0d0964
Se corrigen label de mensaje 404 (Victor-Features).
2014-03-05 11:17:44 -04:00
Brayan Osmar Pereyra Suxo
6114f83fed
Correcion de labels 404
2014-03-05 11:07:40 -04:00
erik ao
8715520967
Merged in darojas/processmaker (pull request #270 )
...
Se corrigen label de mensaje 404.
2014-03-05 11:00:06 -04:00
erik ao
91538baaf3
Merged in wnestor/processmaker (pull request #268 )
...
Avance features trigger, feature file manager y correccion en el archivo rest debido a las variables de la respuesta json no estaban presentes como cuando se hace POST, tambien se hizo modificaciones a los features activity, trigger wizard
2014-03-05 10:55:48 -04:00
Freddy Daniel Rojas Valda
92eaf8b53e
Se corrigen label de mensaje 404.
2014-03-05 10:31:03 -04:00
Richard Yujra
09c403c931
Merge remote branch 'upstream/master'
2014-03-05 10:19:46 -04:00
Richard Yujra
26694e03d3
Merged colosa/processmaker into master
2014-03-05 10:19:14 -04:00
Fernando Ontiveros
180d7c9267
Merged in sucaomar/processmaker (pull request #269 )
...
index.html updated, some classes were added also the resizeFrame function was implemented on the body event
2014-03-05 09:18:30 -05:00
Richard Yujra
1d3ec3c809
Merged colosa/processmaker into master
2014-03-05 10:18:26 -04:00
Omar
95de259f48
index.html updated, some classes were added also the resizeFrame function was implemented on the body event
2014-03-05 10:15:14 -04:00
Wendy Nestor
807cd6fbbc
Avance del feature file manager y correccion en el archivo rest debido a las variables de la respuesta json no estaban presentes como cuando se hace POST, tambien se hizo modificaciones a los features activity, trigger wizard
2014-03-05 09:58:35 -04:00
Wendy Nestor
2a9097a35c
Merge branch 'master' of bitbucket.org:colosa/processmaker
2014-03-05 09:53:42 -04:00
Wendy Nestor
6fe0bcda84
Merge branch 'master' of bitbucket.org:colosa/processmaker
...
Conflicts:
features/backend/activity/negative_tests_activity.feature
2014-03-05 09:52:59 -04:00
Marco Antonio Nina
8010d22d24
Merge remote branch 'upstream/master'
2014-03-05 08:19:32 -04:00
Erik Amaru Ortiz
6a4b9218aa
Adding Exporter for BPMN Projects (2nd commit)- removing debug code
2014-02-28 19:47:45 -04:00
Erik Amaru Ortiz
1c46a002f3
Adding Exporter for BPMN Projects (2nd commit)
2014-02-28 19:46:29 -04:00
erik ao
22d5f1bc35
Merged in victorsl/processmaker (pull request #265 )
...
ProcessMaker "Category & Calendar (PHPUnit)"
2014-02-28 19:12:54 -04:00
erik ao
bf37382aa0
Merged in cochalo/processmaker (pull request #267 )
...
Eliminiacion de validacion para tipo EXTERNAL en STEP
2014-02-28 19:12:04 -04:00
Erik Amaru Ortiz
1a4d3b0a21
Adding Exporter for BPMN Projects (1st commit)
2014-02-28 19:11:34 -04:00
