Commit Graph

643 Commits

Author SHA1 Message Date
Maxi Redigonda 8418eeb872 Merge remote-tracking branch 'github/revert-122-master' 2018-06-29 09:26:06 -03:00
ivan 2e5c5ac9e0 Fix #75 Allow text alignment on text editor 2018-06-13 21:17:19 -03:00
ivan 7076d01a24 Fix #65 default language not set 2018-06-12 19:19:17 -03:00
ivan c26faaa902 Fix default language issue on creating ticket 2018-06-12 18:52:59 -03:00
ivan 1b8444ae18 resolve merge conflicts package.json 2018-06-12 16:45:34 -03:00
Maximiliano Redigonda d62b50dc23
Merge pull request #212 from mredigonda/remove-jquery
Replaces JQuery ajax requests with Axios requests
2018-06-11 21:53:26 -03:00
Maxi Redigonda a58c36c9b4 Replaced mockjax with axios-mock-request 2018-06-11 21:00:43 -03:00
ivan ad7051f2e0 Remove htmlentities, use html-to-text 2018-06-11 18:28:36 -03:00
Guillermo Giuliana 5f07b85975
Merge pull request #218 from ivandiazwm/master
Fix react editor, email links, smtp password being deleted
2018-06-06 02:40:49 -03:00
ivan 7ec6f96879 Fix removal of smtp password when updating settings 2018-06-05 22:05:38 -03:00
Guillermo 9c8052439c Synchronize beckend title lenght validator 2018-06-02 02:10:31 -03:00
ivan 84f213454a Fix TextEditor CSS 2018-05-25 21:13:38 -03:00
Ivan Diaz 7ec01b43c8
Merge pull request #178 from mredigonda/mred-2018-03-22
Fixes #177 by setting loading states in topic and article edits
2018-05-18 16:53:50 -03:00
Maxi Redigonda 4fe9676318 Replaces JQuery ajax requests with Axios requests 2018-05-18 14:32:18 -03:00
Thiago Alves Cavalcante b915f28a59
Brazillian Portuguese translation file
Translated and revised Brazillian Portuguese file
2018-05-01 19:04:48 -03:00
Ivan Diaz ce3d2a249b
Merge pull request #183 from ivandiazwm/master
Add docker and make support
2018-04-26 21:47:55 -03:00
ivan 635ccea020 Use mysql port from env variable 2018-04-26 21:34:28 -03:00
ivan d29f379ff6 Update dbPort ducumentation, set default port 2018-04-26 17:42:59 -03:00
Maximiliano Redigonda d05a398ea8
Merge pull request #159 from mredigonda/gulp-sass-fix
Fixes gulp-sass crashes when saving sass files with syntactic errors
2018-04-24 09:57:07 -03:00
Maximiliano Redigonda 8bf8ed5223
Merge pull request #141 from mredigonda/issue-108
Fixes minimum size of titles.
2018-04-24 09:56:26 -03:00
Ivan Diaz 0c0e9c3e59 Add docker and make support 2018-03-27 23:30:18 -03:00
Maxi Redigonda bc5968126d Sets loading state in form when an user edits a topic 2018-03-22 12:10:07 -03:00
Maxi Redigonda 23f9fb7833 Sets loading state in the form when the user presses SAVE 2018-03-22 11:57:33 -03:00
Ivan Diaz 695149c497 Merge branch 'master' of github.com:opensupports/opensupports 2018-02-25 15:11:43 -03:00
Ivan Diaz 7134f82b5f Add IE compatibility 2018-02-25 12:33:38 -03:00
Maximiliano Redigonda 66de1f176d
Merge pull request #119 from mredigonda/master
Minor fixes
2018-02-20 16:10:45 -03:00
Maxi Redigonda d19443d94d Fixes gulp-sass crashes when saving sass files with syntactic errors 2018-02-19 19:43:05 -03:00
Ivan Diaz 266e0b23f5
Merge pull request #137 from flokX/patch-1
Improve german translation
2018-02-10 11:32:14 -03:00
Maxi Redigonda 9e3b6ef47f Renames validation-factory to validator-factory and updates 2018-02-08 12:11:19 -03:00
Maxi Redigonda 5460e5ad49 Modifies the export of validations-factory, so that it now matches the import from form.js 2018-01-18 20:35:56 -03:00
Maxi Redigonda f0e1afc1ac Fixes title validations 2018-01-18 20:11:49 -03:00
ivan 8e750dbad5 Revert "Revert "Fix #125 Maintenance mode""
This reverts commit a68aa76b2f.
2018-01-18 17:25:02 -03:00
Maxi Redigonda e088114b17 Merge branch 'master' of https://github.com/opensupports/opensupports 2018-01-17 00:54:52 -03:00
Florian 824aecd501
Improve german translation 2018-01-13 11:10:40 +01:00
ivan a68aa76b2f Revert "Fix #125 Maintenance mode"
This reverts commit 0837754ffb.
2018-01-11 18:51:54 -03:00
ivan 2d83116520 [HOTFIX] - Fix check-requirements to check files folder correctly 2018-01-11 18:51:07 -03:00
ivan f227c9a9fa Merge branch 'master' of https://github.com/opensupports/opensupports 2018-01-11 18:16:42 -03:00
Ivan Diaz 4b45a45a23
Update package.json 2018-01-08 18:16:57 -03:00
ivan 0837754ffb Fix #125 Maintenance mode 2018-01-03 20:08:04 -03:00
Maxi Redigonda fc05f9b905 Minor fix to en.js 2017-12-26 18:33:31 -03:00
Paraskevas Leivadaros bb48dd234a
Add files via upload 2017-12-22 13:43:36 +02:00
ivan 64986a70e1 update version docs 2017-12-06 20:58:28 -03:00
Ivan Diaz 5e0d42ea03 Merge pull request #82 from mredigonda/master
Max Red - Solves issue #40 about last login
2017-10-24 00:45:15 -03:00
Maxi Redigonda a93bf5f3e7 Max Red - Solves issue #40 about last login when the staff member has never logged in 2017-10-21 21:49:50 -03:00
srishti 052f4dc62a corrected errors part-1 2017-09-02 20:49:03 +08:00
Adrian 199a7f3339 Update de.js
adjusted several translations that looked weird to me while installing and first using the system. Still needs some updates - am happy to contribute
2017-09-01 10:36:56 +02:00
ivan 46610ad336 Ivan - Fix frontend tests 2017-06-28 10:06:21 -03:00
ivan 989c2e35f8 Ivan - OpenSupports v4.1.0 release changes 2017-06-28 10:02:54 -03:00
ivan 0a060bd825 Ivan - Send url to backend api when installing 2017-06-28 07:59:48 -03:00
ivan 70fb338de5 Ivan - Fix SMTP installation bug, 2017-06-28 06:55:03 -03:00
ivan 094218aca0 Ivan - Fix installation layout 2017-06-28 04:49:10 -03:00
ivan 427af9f1b0 Ivan - Add default language as only supported language at the beginning, fix text display issue in japanese 2017-06-28 04:37:25 -03:00
ivan 2e54fda1e3 Ivan - Fix custom responses not being retrieved bug. 2017-06-28 04:28:04 -03:00
ivan 8e7694db0f Ivan - Frontend minimum title length should be the same as backend. 2017-06-28 04:17:29 -03:00
ivan c152679711 Ivan - Add new i18n key all languages (for installation steps) 2017-06-28 04:14:11 -03:00
ivan d14aeaeabc Ivan - Add #37 changes: redirect to admin when install, add link to documentation in admin panel 2017-06-28 02:55:32 -03:00
ivan fdbcbd62c4 Ivan - Avoid english language as default 2017-06-27 23:34:38 -03:00
ivan 36bac5d275 Ivan - Add Italian language #17 (thanks to @fabio82g) 2017-06-27 23:32:43 -03:00
ivan ee8f55f4bf Ivan - Update languages 2017-06-27 14:31:32 -03:00
ivan 00801f3b61 Ivan - Fix issue #27, fix frontend<->backend data flow with staff editor, add 403 response 2017-06-25 19:03:56 -03:00
Maxi Redigonda 0f13341339 Max Red - Solves bug #21 about language problems, removes hardcoded language settings, fix typo in spanish language 2017-06-24 15:00:56 -03:00
Maxi Redigonda 0d8b005115 Max Red - Correct tests to match new prefix in localStorage 2017-06-24 01:56:48 -03:00
Maxi Redigonda b451561d6f Max Red - Add translations of new added text 2017-06-24 01:36:20 -03:00
Maxi Redigonda 07fcaa1363 Max Red - Add send email on new ticket button in my account view 2017-06-23 23:55:35 -03:00
Maxi Redigonda 33bfc9b2bc [Max Red] - Add prefix to localStorage 2017-06-23 20:16:19 -03:00
ivan c2454ba1c3 Merge branch 'master' of https://github.com/ivandiazwm/opensupports 2017-06-20 15:16:10 -03:00
ivan 9ca2005516 Ivan - Fix Alignment issue #18 2017-06-20 15:15:19 -03:00
Ivan Diaz 91fe65fa24 Merge branch 'master' of https://github.com/opensupports/opensupports 2017-06-17 22:17:50 -03:00
Ivan Diaz e2db3611d4 Ivan - Use production enviroment when building the frontend with 'prod' 2017-06-17 22:17:24 -03:00
ivan d48d7ad875 Ivan - Add SMTP configuration to installation 2017-06-13 18:12:10 -03:00
Ivan Diaz 094bd24982 WIP 2017-06-11 21:00:31 -03:00
ivan 4d7ac557c7 Ivan - Add SMTP improvements WIP 2017-06-10 04:17:54 -03:00
ivan 4d5ff5449d Merge branch 'development' of https://github.com/ivandiazwm/opensupports into development 2017-06-08 17:13:33 -03:00
ivan cf1490711a Guillermo - fix bug #11 2017-06-07 14:18:58 -03:00
Ivan Diaz 172d19c57f Merge branch 'master' of https://github.com/opensupports/opensupports into development
Conflicts:
	server/controllers/system/init-settings.php
2017-06-07 02:32:39 -03:00
Ivan Diaz 858add6443 Ivan - Create install step 5 WIP 2017-06-07 02:29:25 -03:00
Kallys bd88239c7c Fix #22 2017-05-19 20:08:45 +02:00
Guillermo Giuliana 51dc76b386 Update de.js
algunas cosas tenian que malir sal
2017-05-08 01:34:01 -03:00
Kallys c5292fc432 Fix typo 2017-05-05 15:42:56 +02:00
Kallys 2557748410 Update french translation 2017-05-05 15:37:29 +02:00
ivan 81d97fa271 Ivan - Reset configuration 2017-04-21 02:20:42 -03:00
ivan e8ee0427d0 Ivan - Fix some issues [skip ci] 2017-04-21 01:43:06 -03:00
ivan 7b8226f579 Ivan - Fix StaffEditor issues [skip ci] 2017-04-20 21:54:04 -03:00
ivan bd52d7b680 Ivan - Fix hindi language, fix installation error response, fix responsive issues with other languages, fix topic delete bug [skip ci] 2017-04-20 21:50:52 -03:00
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
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