Ivan Diaz
|
b25a91b433
|
Merged in os-188-profile-pic (pull request #132)
Os 188 profile pic
|
2017-02-15 05:53:19 +00:00 |
|
ivan
|
d85d76f20e
|
Ivan - Add responsive style and full-width mode [skip ci]
|
2017-02-15 02:52:14 -03:00 |
|
ivan
|
dbfbd0cf80
|
Ivan - WIP [skip ci]
|
2017-02-13 15:45:43 -03:00 |
|
ivan
|
dcb04f7927
|
Ivan - Improve last events animations [skip ci]
|
2017-02-09 21:12:38 -03:00 |
|
ivan
|
8f02a08018
|
Ivan - Update profile pic upload [skip ci]
|
2017-02-09 17:05:59 -03:00 |
|
ivan
|
6f1638e5fe
|
Ivan - Update backend methods [skip ci]
|
2017-02-08 15:09:15 -03:00 |
AntonyAntonio
|
aad2561b6a
|
Guillermo - idioma [skip ci] frances como tu hermana
|
2017-02-08 00:40:42 -03:00 |
|
AntonyAntonio
|
bfd10541a3
|
Guillermo - idioma [skip ci] indio como tu abuela
|
2017-02-07 20:57:09 -03:00 |
|
AntonyAntonio
|
73a4a9bd47
|
Guillermo - idioma [skip ci] aleman como tu vieja
|
2017-02-07 18:13:13 -03:00 |
|
AntonyAntonio
|
38f71212a6
|
Guillermo - disable-user-system [skip ci] chinese
|
2017-02-07 03:55:54 -03:00 |
|
Ivan Diaz
|
b2ad2c10ef
|
Merged in os-152-add-advanced-settings (pull request #130)
Os 152 add advanced settings
|
2017-02-05 05:46:18 +00: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 |
Ponzio Juan Cruz
|
c40dbebecf
|
es.js edited online with Bitbucket
|
2017-01-29 00:58:10 +00:00 |
|
Ivan Diaz
|
9c8605fef4
|
Merge branch 'master' into os-152-add-advanced-settings
Conflicts:
client/src/data/fixtures/system-fixtures.js
client/src/data/languages/en.js
|
2017-01-26 17:35:49 -03:00 |
|
Ivan Diaz
|
5dbbcdc114
|
Merged in os-157-disable-user-system-views (pull request #129)
Os 157 disable user system views
|
2017-01-26 20:29:03 +00:00 |
|
AntonyAntonio
|
85f1bef0b3
|
Guillermo - disable-user-system [skip ci] パスワ
|
2017-01-25 01:14:33 -03:00 |
|
Ivan Diaz
|
5e51536f25
|
Ivan - Add api keys [skip ci]
|
2017-01-22 06:52:03 -03:00 |
|
ivan
|
796571c8a1
|
Ivan - Update some texts [skip ci]
|
2017-01-21 19:06:13 -03:00 |
|
ivan
|
09c6453d46
|
Ivan - Fix some issues related to no user system [skip ci]
|
2017-01-21 02:00:04 -03:00 |
|
ivan
|
c18142f2ba
|
Ivan - Add home link and english keys for no user system [skip ci]
|
2017-01-21 01:54:13 -03:00 |
|
ivan
|
6109e1ac73
|
Ivan - Add article list for no user system [skip ci]
|
2017-01-21 01:42:48 -03:00 |
|
ivan
|
0bd07ef211
|
Ivan - Add token ticket for backend [skip ci]
|
2017-01-21 01:17:28 -03:00 |
|
ivan
|
eff51acc90
|
Merge branch 'master' into os-157-disable-user-system-views
# Conflicts:
# client/src/data/languages/en.js
|
2017-01-21 00:34:45 -03:00 |
|
ivan
|
9db530f2dd
|
Ivan - Add ticket view page for no user system[skip ci]
|
2017-01-21 00:20:25 -03:00 |
|
Ivan Diaz
|
4e0669c4ae
|
Ivan - WIP [skip ci]
|
2017-01-20 22:01:18 -03:00 |
|
Ivan Diaz
|
ec18363058
|
Ivan - Add check ticket page [skip ci]
|
2017-01-19 19:48:55 -03:00 |
|
Ivan Diaz
|
4119509cc4
|
Ivan - Add create ticket for no user system [skip ci]
|
2017-01-19 17:37:51 -03:00 |
|
ivan
|
cf7dbffbf3
|
Max Red - WIP [skip ci]
|
2017-01-17 23:51:22 -03:00 |
|
ivan
|
18b736dea7
|
Max Red - add items from fixtures to registration api keys [skip ci]
|
2017-01-17 21:39:16 -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 Diaz
|
e20760e8bb
|
Ivan - Update home page for user system disabled [skip ci]
|
2017-01-17 16:27:46 -03:00 |
|
ivan
|
e04d967c14
|
Max Red - space things up adding some css [skip ci]
|
2017-01-17 16:12:49 -03:00 |
|
Ivan Diaz
|
585159e84c
|
Merged in OS156-Disable-user-system (pull request #126)
Os156 disable user system
|
2017-01-17 15:58:50 -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 |
|
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 |
|
Ivan Diaz
|
0e88a9715a
|
Merged in os-153-disable-registration (pull request #125)
Max Red - disable registration and fixed a message in en.js
|
2017-01-17 14:59:39 -03:00 |
|
ivan
|
a40121111e
|
Max Red - modified registration setting in fixtures [skip ci]
|
2017-01-17 14:58:28 -03:00 |
|
ivan
|
ee5ba9dfad
|
Max Red - WIP [skip ci]
|
2017-01-17 14:55:00 -03:00 |
|
Ivan Diaz
|
90d04d9444
|
Merged in OS154-CSV-Import (pull request #128)
Ivan - Add csv file
|
2017-01-16 22:07:22 -03:00 |
|
AntonyAntonio
|
6ff0dbdf6b
|
Guillermo - Add user system test [skip ci]
|
2017-01-16 21:05:11 -03:00 |
|
ivan
|
577ce49d6f
|
Max Red - Created top bars [skip ci]
|
2017-01-16 20:07:41 -03:00 |
|
AntonyAntonio
|
e44792c3de
|
Ivan - Add csv file [skip ci]
|
2017-01-16 20:06:22 -03:00 |
|
Ivan Diaz
|
ebc2800698
|
Merged in OS154-CSV-Import (pull request #127)
Os154 csv import
|
2017-01-16 19:00:07 -03:00 |
|
AntonyAntonio
|
78a98b9d0e
|
Guillermo - disable-user-system [skip ci]
|
2017-01-16 18:15:28 -03:00 |
|
ivan
|
e32717a1a6
|
Max Red - Added toggle buttons [skip ci]
|
2017-01-16 18:05:07 -03:00 |