Commit Graph

8369 Commits

Author SHA1 Message Date
jennylee
e7913d95d9 BUG_14693 Some functionalities inside the BPMN designer are not working.
Hiding the Maintenance settings menu from ADMIN.
2014-04-29 13:14:11 -04:00
jennylee
2daaee325a Deleting changes is Oauth model. 2014-04-29 12:28:16 -04:00
jennylee
821ea63d02 BUG_14693 Some functionalities inside the BPMN designer are not working.
I move the Insert of the Oauth client id to the install class. This apply in the installation and in the creation of a new workspace.
2014-04-29 12:22:48 -04:00
jennylee
ec643d4aac Merge remote branch 'upstream/master' 2014-04-29 12:22:37 -04:00
Erik Amaru Ortiz
618555d9d0 Merged in darojas/processmaker (pull request #434)
Se modifica add y remove flow para start event de Case Scheduler y Web Entry
2014-04-29 10:39:16 -04:00
Erik Amaru Ortiz
a39209df4d Merged in cochalo/processmaker (pull request #435)
Correccion de FLOWS con ARTIFACT
2014-04-29 10:31:30 -04:00
Brayan Osmar Pereyra Suxo
df167b9527 Correccion de FLOWS con ARTIFACT 2014-04-29 10:23:30 -04:00
Daniel Rojas
0336b34dd4 Se modifica add y remove flow para start event de Case Scheduler y Web Entry 2014-04-29 10:22:32 -04:00
Erik Amaru Ortiz
740fc849f3 Merged in cochalo/processmaker (pull request #433)
Adicion de ARTIFACTS en FLOWS
2014-04-29 10:17:21 -04:00
Erik Amaru Ortiz
0b0ca8a8c2 Merged in darojas/processmaker (pull request #432)
Se modifica la funcionalidad de start event para Case Scheduler y Web Entry
2014-04-29 10:11:30 -04:00
Brayan Osmar Pereyra Suxo
170536ab6f Adicion de ARTIFACTS en FLOWS 2014-04-29 10:00:23 -04:00
Daniel Rojas
c264ec6207 Se modifica la funcionalidad de start event para Case Scheduler y Web Entry 2014-04-29 09:54:46 -04:00
Erik Amaru Ortiz
d656818753 Merged in cochalo/processmaker (pull request #431)
Correccion de nivel de array en PMTABLE
2014-04-29 09:29:37 -04:00
Brayan Osmar Pereyra Suxo
9007a2188d Correccion de nivel de array en PMTABLE 2014-04-29 08:57:50 -04:00
Daniel Rojas
bb086cba3b Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-29 08:52:52 -04:00
Daniel Rojas
d78ee38df3 Se modifica la funcionalidad de start event para Case Scheduler y Web Entry (remove flow) 2014-04-28 17:15:27 -04:00
Erik Amaru Ortiz
e7360a767f little fix, when default record does not exist of pm oauth client 2014-04-28 17:14:34 -04:00
Daniel Rojas
517924b38a Se modifica la funcionalidad de start event para Case Scheduler y Web Entry (remove event, add flow) 2014-04-28 16:55:12 -04:00
jennylee
e49590557c BUG_14693 Some functionalities inside the BPMN designer are not working
An automatic registration was added when the user login for the first time into a new workspace.
2014-04-28 15:59:46 -04:00
jennylee
b3a1cc3532 BUG_14693 Some functionalities inside the BPMN designer are not working if using a a new workspace.
An automatic registration was added when the user login for the first time into a new workspace.
2014-04-28 15:50:53 -04:00
Erik Amaru Ortiz
231fee13d5 removing debug code 2014-04-28 15:37:01 -04:00
Daniel Rojas
71b36966ed Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-28 15:28:23 -04:00
Daniel Rojas
065183ba5c Se modifica la funcionalidad de start event para Case Scheduler y Web Entry (remove event, add flow) 2014-04-28 15:22:53 -04:00
Erik Amaru Ortiz
ddeb5f7078 Merged in darojas/processmaker (pull request #426)
Se modifica la funcionalidad de start event para Case Scheduler y Web Entry (add)
2014-04-28 12:47:56 -04:00
Erik Amaru Ortiz
cb8e2b7614 BUG, Fix Circular references on rbac classes, this occurs on most new php versions. 2014-04-28 12:42:14 -04:00
Erik Amaru Ortiz
194c67d371 Merged in cochalo/processmaker (pull request #427)
Correccion de PMTABLES
2014-04-28 12:31:01 -04:00
Brayan Osmar Pereyra Suxo
a0d520e9f5 Correccion de PMTABLES 2014-04-28 12:15:48 -04:00
Daniel Rojas
c0813f669e Se modifica la funcionalidad de start event para Case Scheduler y Web Entry (add) 2014-04-28 12:05:08 -04:00
Daniel Rojas
c15f36d0ef Se modifica la funcionalidad de start event para Case Scheduler y Web Entry (add) 2014-04-28 11:49:51 -04:00
Erik Amaru Ortiz
21e1423c33 Merged in darojas/processmaker (pull request #424)
Se agrega la funcionalidad de start event para Case Scheduler y Web Entry (add)
2014-04-28 11:00:11 -04:00
Daniel Rojas
eaeac5372a Se agrega la funcionalidad de start event para Case Scheduler y Web Entry (add) 2014-04-28 10:48:34 -04:00
jennylee
11f872e536 Merge remote branch 'upstream/master' 2014-04-28 10:45:48 -04:00
Erik Amaru Ortiz
fcae629cee Merged in darojas/processmaker (pull request #423)
Fix code style (remove backticks).
2014-04-28 10:20:03 -04:00
Daniel Rojas
91b7f50556 Fix code style (remove backticks). 2014-04-28 10:10:59 -04:00
Erik Amaru Ortiz
b54b361585 Merged in wnestor/processmaker (pull request #422)
Solucion de conflicto en web entry negative
2014-04-25 16:42:26 -04:00
Wendy Nestor
60cef94b2c Solucion de conflicto en web entry negative 2014-04-25 16:24:27 -04:00
Wendy Nestor
35e563cdcc Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-25 16:11:15 -04:00
Erik Amaru Ortiz
e3f63451b7 Merged in cochalo/processmaker (pull request #420)
Adicion de POST y DELETE en PROJECT
2014-04-25 15:59:44 -04:00
Julio Cesar Laura Avendaño
a179e4a7a0 Merged in julceslau/processmaker (pull request #421)
BUG 13974 merged from Github code
2014-04-25 15:17:04 -04:00
Julio Cesar Laura
d1131d9060 BUG 13974 merged from Github code 2014-04-25 15:14:31 -04:00
Erik Amaru Ortiz
ba0e08aa7d little fix, adding @url to match url matter for PUT /project/{prj_uid} 2014-04-25 14:47:37 -04:00
Fernando Ontiveros
ac24e70ae2 changing composer.json, we are using composer-public.colosa.net again 2014-04-25 14:41:25 -04:00
jennylee
e6da05fb66 Merge remote branch 'upstream/master' 2014-04-25 13:52:52 -04:00
Erik Amaru Ortiz
cbae382d0f Adding flush cache command 2014-04-25 13:35:59 -04:00
Brayan Osmar Pereyra Suxo
4cdd749d72 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-25 12:03:45 -04:00
Brayan Osmar Pereyra Suxo
14a3afce33 Adicion de POST y PUT en PROJECT 2014-04-25 11:38:53 -04:00
Erik Amaru Ortiz
69916a0808 little fix to match a request with an api url pattern 2014-04-25 11:32:13 -04:00
jennylee
909351fa88 Merge remote branch 'upstream/master' 2014-04-25 09:54:15 -04:00
Brayan Osmar Pereyra Suxo
80d92d10ac Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-25 08:28:03 -04:00
Wendy Nestor
b6cd6ccb92 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-04-24 22:41:14 -04:00