Commit Graph

972 Commits

Author SHA1 Message Date
ivan fdfcb751d3 Ivan - Add nice styling to emails [skip ci] 2017-03-16 18:29:39 -03:00
ivan 475d11ccac Ivan - Fix PHPMailer configurations, improve user system install [skip ci] 2017-03-16 16:11:27 -03:00
ivan 05f0d453e1 Ivan - Fix smtp server [skip ci] 2017-03-15 17:28:23 -03:00
ivan 2a4590df2d Ivan - Fix installation tests [skip ci] 2017-03-15 16:17:06 -03:00
ivan 339a36e260 Ivan - Add default config [skip ci] 2017-03-15 02:20:18 -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 Diaz d14873d85f Merged in OS-158-Installation (pull request #136)
OS-158 Installation Frontend
2017-03-12 00:21:18 +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 Diaz 751876bd11 Merged in fixes-deploy-bloque-3 (pull request #134)
Fixes deploy bloque 3
2017-03-04 22:08:53 +00:00
ivan 9d8c1a6225 Ivan - Fix dates [skip ci] 2017-03-04 19:07:14 -03: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 3de5196dd5 Ivan - Add XSS protection backend [skip ci] 2017-03-02 02:56:42 -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
ivan 7f1047b311 Ivan - Fix test issues [skip ci] 2017-02-25 03:42:10 -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 8d0da0e451 Ivan - Fix ruby tests 2017-02-18 15:55:09 -03:00
ivan d4263d4b94 Ivan - Fix uploading of files 2017-02-18 15:28:23 -03:00
ivan f9ad440bf2 Ivan - Fix download get 2017-02-15 16:14:27 -03:00
ivan 8d1ab2ee91 Merge remote-tracking branch 'origin/master' 2017-02-15 03:09:00 -03:00
ivan 222dbdea04 Ivan - Fix download get 2017-02-15 03:08:48 -03:00
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