ivan
|
892e1536a2
|
Ivan - Fix installation in subfolder and file permissions
|
2017-04-10 22:30:39 -03:00 |
|
ivan
|
491fc901a8
|
Ivan - Add icon
|
2017-04-07 18:48:15 -03:00 |
|
ivan
|
2218fee003
|
Ivan - Fix es language
|
2017-03-31 00:55:42 -03:00 |
|
ivan
|
5475133b9e
|
Merge branch 'idioma_espanol'
# Conflicts:
# client/src/data/languages/es.js
|
2017-03-31 00:54:25 -03:00 |
|
ivan
|
c691c6b578
|
Ivan - Fix all languages
|
2017-03-31 00:49:25 -03:00 |
Maximiliano Redigonda
|
e739282287
|
Max Red - Review until 'VIEW DESCRIPTIONS'
|
2017-03-30 23:56:33 -03:00 |
|
ivan
|
ef5a9b41bf
|
Merge branch 'idioma_espanol'
# Conflicts:
# client/src/data/languages/es.js
|
2017-03-30 22:41:13 -03:00 |
|
ivan
|
db79be846d
|
Ivan - Improve client builder
|
2017-03-30 22:37:00 -03:00 |
|
ivan
|
d10de13626
|
Ivan - Fix installation issues [skip ci]
|
2017-03-30 20:37:55 -03:00 |
|
ivan
|
92efd93ea4
|
Merge branch 'master' into actualitation-language
# Conflicts:
# client/src/data/languages/cn.js
# client/src/data/languages/de.js
# client/src/data/languages/es.js
# client/src/data/languages/fr.js
# client/src/data/languages/in.js
# client/src/data/languages/jp.js
# client/src/data/languages/pt.js
# client/src/data/languages/ru.js
# client/src/data/languages/tr.js
|
2017-03-29 19:29:09 -03:00 |
|
ivan
|
48614fcc00
|
Ivan - Fix Installation issues [skip ci]
|
2017-03-29 18:46:26 -03:00 |
AntonyAntonio
|
eb5b0b2c19
|
Guillermo - idioma s [skip ci] ya ta
|
2017-03-22 16:48:41 -03:00 |
|
ivan
|
3047831864
|
Ivan - Fix language translations [skip ci]
|
2017-03-20 17:21:22 -03:00 |
|
ivan
|
0d74e5dd39
|
Ivan - Fix stats toggle button colors [skip ci]
|
2017-03-19 19:29:15 -03:00 |
|
ivan
|
e286c20085
|
Ivan - Fix email templates editor [skip ci]
|
2017-03-17 15:10:03 -03:00 |
|
ivan
|
a244a58ebc
|
Ivan - Add all mail templates [skip ci]
|
2017-03-16 20:00:21 -03:00 |
|
ivan
|
475d11ccac
|
Ivan - Fix PHPMailer configurations, improve user system install [skip ci]
|
2017-03-16 16:11:27 -03:00 |
|
ivan
|
46e3e65a0b
|
Ivan - Add installation service backend [skip ci]
|
2017-03-15 02:17:16 -03:00 |
Ponzio Juan Cruz
|
66dc9b415f
|
Merged in 7JuAnCrUz7/esjs-edited-online-with-bitbucket-skip-c-1489298360933 (pull request #137)
es.js edited online with Bitbucket [skip ci]
|
2017-03-12 05:59:56 +00:00 |
|
Ponzio Juan Cruz
|
2beaa810e5
|
es.js edited online with Bitbucket [skip ci]
|
2017-03-12 05:58:09 +00:00 |
|
Ponzio Juan Cruz
|
a9e096cec4
|
en.js edited online with Bitbucket
|
2017-03-12 05:51:49 +00:00 |
|
ivan
|
a183d1ed79
|
Ivan - Add redirection to completed if install is already done [skip ci]
|
2017-03-11 03:52:43 -03:00 |
|
ivan
|
01192aaeb7
|
Ivan - Add all install steps [skip ci]
|
2017-03-11 02:19:02 -03:00 |
|
ivan
|
d6f33a7b32
|
Ivan - Add first and second step to installation [skip ci]
|
2017-03-09 00:32:35 -03:00 |
|
ivan
|
2b478befa0
|
Ivan - Create installation base layout [skip ci]
|
2017-03-07 01:33:30 -03:00 |
|
ivan
|
57955cc5eb
|
Ivan - Fix gulp deploy [skip ci]
|
2017-03-05 19:09:00 -03:00 |
|
ivan
|
62f5354b6c
|
Ivan - Fix dates [skip ci]
|
2017-03-04 19:20:44 -03:00 |
|
Ivan Diaz
|
9f692b7047
|
Merged in idioma_espanol (pull request #135)
Idioma espanol
|
2017-03-04 22:10:26 +00:00 |
|
Antonio Stark
|
711af35877
|
Merged in OS4infinity-addLanguage (pull request #131)
OS4infinity addLanguage
Approved-by: Antonio Stark
Approved-by: max red
|
2017-03-04 22:09:06 +00:00 |
|
ivan
|
661e9c396b
|
Ivan - Update error debugging csv import [skip ci]
|
2017-03-04 18:42:17 -03:00 |
|
ivan
|
8c138b481c
|
Ivan - Fix csv import, remove sql import, add i18h keys for advanced settings [skip ci]
|
2017-03-04 18:38:49 -03:00 |
|
Ivan Diaz
|
484bfd4e99
|
Ivan - Fix enabling user system [skip ci]
|
2017-03-04 02:57:51 -03:00 |
|
ivan
|
6bff8e1493
|
Ivan - Add new logo, fix user system disabled architecture [skip ci]
|
2017-03-03 21:39:59 -03:00 |
|
ivan
|
f175669dc0
|
Ivan - Allow international characters improve text editor [skip ci]
|
2017-03-02 00:00:45 -03:00 |
|
Ivan Diaz
|
c1d95b0417
|
Merged master into idioma_espanol [skip ci]
|
2017-02-26 21:17:42 -03:00 |
|
ivan
|
9e545ff110
|
Ivan - Fix session [skip ci]
|
2017-02-25 16:50:54 -03:00 |
|
ivan
|
a60f6e9cd9
|
Ivan - Fix session [skip ci]
|
2017-02-25 16:16:58 -03:00 |
|
Antonio Stark
|
de05c8e8ce
|
pt.js edited online with Bitbucket
|
2017-02-24 08:25:52 +00:00 |
|
Antonio Stark
|
74cb619fef
|
pt.js edited online with Bitbucket
|
2017-02-24 08:23:59 +00:00 |
|
Antonio Stark
|
4cf5cc950c
|
de.js edited online with Bitbucket
|
2017-02-24 08:22:37 +00:00 |
|
Antonio Stark
|
09bb72b646
|
de.js edited online with Bitbucket
|
2017-02-24 08:21:49 +00:00 |
|
Antonio Stark
|
c3f8f759de
|
de.js edited online with Bitbucket
|
2017-02-24 08:21:02 +00:00 |
|
Antonio Stark
|
b0ac238bbe
|
de.js edited online with Bitbucket
|
2017-02-24 08:20:30 +00:00 |
|
Antonio Stark
|
b6c043854f
|
de.js edited online with Bitbucket
|
2017-02-24 08:19:13 +00:00 |
|
Antonio Stark
|
4db122728f
|
de.js edited online with Bitbucket
|
2017-02-24 08:18:26 +00:00 |
|
Antonio Stark
|
d6f5153822
|
de.js edited online with Bitbucket
|
2017-02-24 08:16:50 +00:00 |
|
ivan
|
5126b40538
|
Ivan - Fix AreYouSure design, fix stats, rename get-api-keys, use allow-attachment, fix login verificationToken, fix deletion, fix ticket view permission, fix last events when empty, fix configuration in frontend, fix system preferences and my account
|
2017-02-24 03:56:25 -03:00 |
|
Ivan Diaz
|
3d27415041
|
Ivan - Fix stats
|
2017-02-18 20:58:31 -03:00 |
|
Ivan Diaz
|
2189c18a3c
|
Ivan - Fix some staff edition issues [skip ci]
|
2017-02-18 19:47:19 -03:00 |
|
Ivan Diaz
|
3a56a5410e
|
Merged in os-135-full-width (pull request #133)
Os 135 full width
|
2017-02-18 19:23:04 +00:00 |
|
ivan
|
d4263d4b94
|
Ivan - Fix uploading of files
|
2017-02-18 15:28:23 -03: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 |
|
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 |
|
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 |
|
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
|
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
|
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
|
ee5ba9dfad
|
Max Red - WIP [skip ci]
|
2017-01-17 14:55:00 -03:00 |
|
ivan
|
577ce49d6f
|
Max Red - Created top bars [skip ci]
|
2017-01-16 20:07:41 -03:00 |
|
ivan
|
e32717a1a6
|
Max Red - Added toggle buttons [skip ci]
|
2017-01-16 18:05:07 -03:00 |
|
ivan
|
bcb9b5b7ac
|
Max Red - deleted filters and custom fields [skip ci]
|
2017-01-16 17:00:48 -03:00 |
|
ivan
|
73c8d94626
|
Max Red - renamed user-system to advanced-settings [skip ci]
|
2017-01-16 16:58:46 -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 |