AntonyAntonio
|
38f71212a6
|
Guillermo - disable-user-system [skip ci] chinese
|
2017-02-07 03:55:54 -03:00 |
AntonyAntonio
|
6057c40f4a
|
Guillermo - disable-user-system [skip ci] chinese
|
2017-01-31 22:59:02 -03:00 |
AntonyAntonio
|
72d556549e
|
Guillermo - disable-user-system [skip ci] chinese
|
2017-01-29 00:15:23 -03:00 |
AntonyAntonio
|
85f1bef0b3
|
Guillermo - disable-user-system [skip ci] パスワ
|
2017-01-25 01:14:33 -03:00 |
Ivan Diaz
|
d3ecbacf2d
|
Merged in os-146-add-stats-component (pull request #124)
Os 146 add stats component
|
2017-01-17 16:54:04 -03:00 |
ivan
|
bce56d7b05
|
Max Red - make toggle list unselectable and not able to change cursor view [skip ci]
|
2017-01-17 15:53:43 -03:00 |
ivan
|
26d26320c9
|
Max Red - deleted console.logs from system-fixtures [skip ci]
|
2017-01-17 15:52:12 -03:00 |
ivan
|
f1c82dc384
|
Max Red - beautified code a little bit more replacing another for for another map [skip ci]
|
2017-01-17 15:50:33 -03:00 |
ivan
|
fda6e798a0
|
Max Red - problems with displaying stats in admin-panel-my-account view, Ivan fixed it [skip ci]
|
2017-01-17 15:26:18 -03:00 |
ivan
|
4fb1c32cbc
|
Max Red - beautified code by replacing a for for a map (: [skip ci]
|
2017-01-17 15:09:00 -03:00 |
ivan
|
a40121111e
|
Max Red - modified registration setting in fixtures [skip ci]
|
2017-01-17 14:58:28 -03:00 |
ivan
|
a70778db9c
|
Max Red - disable registration and fixed a message in en.js[skip ci]
|
2017-01-16 16:06:19 -03:00 |
ivan
|
1019b4ff96
|
Max Red - Delete redundant css [skip ci]
|
2017-01-16 12:39:07 -03:00 |
ivan
|
9fbf53d586
|
Max Red - Beautify code, replacing another for using .map [skip ci]
|
2017-01-16 12:20:22 -03:00 |
ivan
|
7c19ef1716
|
Max Red - Beautify code, replacing a for using .map [skip ci]
|
2017-01-16 12:04:47 -03:00 |
ivan
|
8584be0924
|
Max Red - Changed colors [skip ci]
|
2017-01-15 20:10:02 -03:00 |
ivan
|
371b7973b2
|
Max Red - Ivan changed some things (problems with userId in my-account) and I kept abstacting the component, and applied it to staff-editor [skip ci]
|
2017-01-15 19:46:08 -03:00 |
ivan
|
da928f9b6f
|
Max Red - Added abstraction to the component in order to work in view-staff page [skip ci]
|
2017-01-15 18:33:00 -03:00 |
ivan
|
ebb3516df3
|
Max Red - Starting refactoring of component stats [skip ci]
|
2017-01-15 17:20:48 -03:00 |
ivan
|
30f1526f1c
|
Max Red - Added even even more more basic scss [skip ci]
|
2017-01-15 15:47:13 -03:00 |
ivan
|
0500666174
|
Max Red - Added even more basic scss [skip ci]
|
2017-01-15 15:07:07 -03:00 |
ivan
|
1f6e3ae028
|
Max Red - Added basic scss [skip ci]
|
2017-01-15 00:07:02 -03:00 |
Ivan Diaz
|
35d9a166cf
|
Ivan - Add file download component [skip ci]
|
2017-01-14 21:44:20 -03:00 |
ivan
|
fd2c20ac9f
|
Max Red - Added all functionality to the component [skip ci]
|
2017-01-14 21:31:02 -03:00 |
ivan
|
19f25657ef
|
Max Red - Corrected to work even if the response of system/get-stats is not the full week/month/year etc.. [skip ci]
|
2017-01-14 18:47:04 -03:00 |
ivan
|
9861bfb023
|
Max Red - Added functionality to dropdown [skip ci]
|
2017-01-14 18:41:19 -03:00 |
ivan
|
7022dfeabf
|
Max Red - Showing real data in graph taken from fixtures [skip ci]
|
2017-01-14 17:20:04 -03:00 |
Ivan Diaz
|
d575882bf2
|
Ivan - Add file uploader component [skip ci]
|
2017-01-14 16:39:22 -03:00 |
ivan
|
8c50cc97c9
|
Max Red - Create stats state, and display correct values in the toggle list [skip ci]
|
2017-01-14 15:15:26 -03:00 |
ivan
|
1e69e6f4f8
|
Max Red - Finished StatsChart component, started full component [skip ci]
|
2017-01-14 14:17:35 -03:00 |
ivan
|
d12194cd34
|
Max Red - beautify code and add functionality [skip ci]
|
2017-01-14 14:00:02 -03:00 |
ivan
|
4f7118c2e5
|
Max Red - Abstracting StatsChart, modified demo page [skip ci]
|
2017-01-14 01:45:21 -03:00 |
ivan
|
8221a06048
|
Max Red - WIP second layout [skip ci]
|
2017-01-13 17:06:52 -03:00 |
ivan
|
1944f7109d
|
Merge branch 'master' into os-146-add-stats-component
# Conflicts:
# client/src/data/languages/en.js
|
2017-01-13 15:19:39 -03:00 |
ivan
|
6a22ba711e
|
Max Red - WIP first layout [skip ci]
|
2017-01-13 15:17:43 -03:00 |
Ivan Diaz
|
3743ec5e67
|
Merged in os-145-toggle-list (pull request #117)
Os 145 toggle list
|
2017-01-13 12:06:28 -03:00 |
ivan
|
139a474693
|
Max Red - beautify code and set default selected indices to an empty array [skip ci]
|
2017-01-13 10:33:17 -03:00 |
Ivan Diaz
|
3299c3dd8d
|
Ivan - Deploy changes [skip ci]
|
2017-01-11 00:21:27 -03:00 |
ivan
|
6fc460d4b6
|
Max Red - Modified some things, I don't know which [skip ci]
|
2017-01-10 18:27:53 -03:00 |
Ivan Diaz
|
42c1e81fbc
|
Ivan - Fix login test
|
2017-01-10 17:10:28 -03:00 |
Ivan Diaz
|
1ca57e1b76
|
Ivan - Add deploy on dev 3 changes and fixes [skip ci]
|
2017-01-10 17:07:49 -03:00 |
ivan
|
b75660ec1d
|
Max Red - Created first layout and functionality of ToggleList component [skip ci]
|
2017-01-10 16:45:58 -03:00 |
Ivan Diaz
|
c248c8d486
|
Ivan - Add verification for admin view [skip ci]
|
2017-01-10 13:34:16 -03:00 |
Ivan Diaz
|
ae946a7397
|
Ivan - Add verification token for frontend user view [skip ci]
|
2017-01-10 13:14:35 -03:00 |
Ivan Diaz
|
e9854341f0
|
Merged in 184-add-info-tooltip-form-fields (pull request #113)
184 add info tooltip form fields
|
2017-01-06 16:36:37 -03:00 |
ivan
|
4213c77e6e
|
Ivan Diaz - Fix activity list minor issues [skip ci]
|
2017-01-05 21:31:43 -03:00 |
Ivan Diaz
|
9288067958
|
Ivan - Add language list validation [skip ci]
|
2017-01-05 18:22:36 -03:00 |
ivan
|
5ea4137e41
|
Max Red - Finally we did it! [skip ci]
|
2017-01-05 18:01:56 -03:00 |
Ivan Diaz
|
e78808eb6c
|
Ivan - Language selection for system preferences [skip ci]
|
2017-01-05 17:15:20 -03:00 |
ivan
|
1465a53616
|
Merge branch 'master' into os-143-last-activity
# Conflicts:
# client/src/data/languages/en.js
|
2017-01-05 16:27:19 -03:00 |