AntonyAntonio
|
35ac87ab88
|
Merge branch 'master' into OS156-Disable-user-system
Conflicts:
server/controllers/system.php
tests/init.rb
|
2017-01-17 15:03:48 -03:00 |
|
AntonyAntonio
|
1c0c16f7f6
|
Merge branch 'master' into OS156-Disable-user-system
Conflicts:
server/controllers/system.php
server/controllers/system/init-settings.php
server/data/ERRORS.php
server/libs/Controller.php
tests/init.rb
|
2017-01-16 16:13:40 -03:00 |
|
AntonyAntonio
|
fdd35ed2c1
|
Guillermo - disable-user-system [skip ci]
|
2017-01-16 16:07:53 -03:00 |
|
AntonyAntonio
|
565c60c198
|
Guillermo - csv import [skip ci]
|
2017-01-15 17:33:33 -03:00 |
|
AntonyAntonio
|
8f2310f855
|
Merge branch 'master' into OS154-CSV-Import
Conflicts:
server/controllers/system.php
|
2017-01-15 17:08:07 -03:00 |
|
AntonyAntonio
|
6eae5f9299
|
Guillermo - csv import [skip ci]
|
2017-01-14 18:19:21 -03:00 |
ivan
|
71984384cc
|
Ivan - Add validations before download and upload on comment [skip ci]
|
2017-01-12 20:31:12 -03:00 |
|
ivan
|
2703f82253
|
Ivan - Fix master issues. Improve error handling
|
2016-11-24 18:02:18 -03:00 |
|
ivan
|
cc7c5bfb3d
|
Ivan - STAFF LOGIN - Add Staff login to backend [skip ci]
|
2016-09-25 01:16:10 -03:00 |
|
ivan
|
830e2115a3
|
Ivan - Add ruby api testing for comment/create
|
2016-08-04 15:41:22 -03:00 |
|
ivan
|
265b0c9bc2
|
Ivan - Implement respect/validation for validation [skip ci]
|
2016-07-04 15:57:00 -03:00 |
|
Ivan Diaz
|
993c618c9f
|
[Ivan Diaz] - Move folder architecture
|
2016-04-17 18:44:24 -03:00 |
|
Ivan Diaz
|
b9eefa3213
|
[Ivan Diaz] - Remaname server folder to api
|
2016-01-27 13:40:25 -03:00 |
|
Ivan Diaz
|
ce19284159
|
[Ivan Diaz] - Create libraries Controller and Session
|
2016-01-14 23:45:22 -03:00 |