Daniel Camargo
|
bbf7bc7046
|
partial #2969 - setup and notifications
|
2014-05-19 11:01:58 -03:00 |
|
Daniel Camargo
|
1324571bd8
|
partial #2969 - actions stuff
|
2014-05-19 10:32:20 -03:00 |
|
Daniel Camargo
|
3cfea1b793
|
partial #2969
|
2014-05-19 08:20:08 -03:00 |
|
Daniel Camargo
|
82ce1741ce
|
partial #2969 - onboarding public form - for drivers
|
2014-05-16 11:59:59 -03:00 |
|
Daniel Camargo
|
c9fcf9a569
|
Merge branch 'refs/heads/master' into Driver_Onboarding_2969
Conflicts:
include/controllers/default/cockpit2/api/driver/orders/index.php
|
2014-05-15 17:50:22 -03:00 |
|
Daniel Camargo
|
eae9b5056d
|
partial #2969 - driver setup screen
|
2014-05-15 17:48:32 -03:00 |
|
Daniel Camargo
|
c5ec5b216f
|
partial #2969
delete old files
started setup screen
|
2014-05-15 14:51:23 -03:00 |
|
arzynik
|
fb869b8810
|
added restaccount class to pages that need to be logged in for
|
2014-05-15 10:04:02 -07:00 |
|
Daniel Camargo
|
0483561c0f
|
partial #2969 - driver's notifications / status
|
2014-05-15 12:59:42 -03:00 |
|
Daniel Camargo
|
f9252cb9ba
|
partial #2969
|
2014-05-15 12:15:24 -03:00 |
|
Daniel Camargo
|
28ffe4c2c2
|
merges and fixes
|
2014-05-15 09:32:26 -03:00 |
|
Daniel Camargo
|
be4e6e74ae
|
Merge branch 'refs/heads/master' into Driver_Onboarding_2969
Conflicts:
include/controllers/default/cockpit2/api/driver/index.php
include/controllers/default/cockpit2/api/driver/orders/index.php
include/controllers/default/cockpit2/api/driver/shifts/index.php
include/views/default/cockpit2/bundle/js.phtml
www/assets/cockpit/js/cockpit.js
|
2014-05-15 09:17:13 -03:00 |
|
arzynik
|
8856ab2d26
|
fixes #3201
|
2014-05-14 13:50:33 -07:00 |
|
Daniel Camargo
|
6b0fdbfe9d
|
partial #2969 - pagination / search
|
2014-05-14 17:12:35 -03:00 |
|
Daniel Camargo
|
93db9ba839
|
Merge branch 'refs/heads/master' into Driver_Onboarding_2969
Conflicts:
www/assets/cockpit/scss/cockpit.scss
|
2014-05-14 15:48:43 -03:00 |
|
Daniel Camargo
|
47d2e8e840
|
partial #2969 - upload docs form
|
2014-05-14 14:48:00 -03:00 |
|
Daniel Camargo
|
2c453db126
|
Merge branch 'refs/heads/master' into Driver_Onboarding_2969
|
2014-05-13 17:45:42 -03:00 |
|
Daniel Camargo
|
ea38c5133e
|
partial #2969
|
2014-05-13 17:45:05 -03:00 |
|