tyler.durden/opensupports
1
0
Fork 0
mirror of https://github.com/opensupports/opensupports.git synced 2025-07-27 15:54:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,595 Commits 77 Branches 19 Tags
Commit Graph

1595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Diaz
3e94369f6b Fix languages key duplications 2019-03-03 15:11:46 -03:00
Ivan Diaz
600ea95b16 Merge remote-tracking branch 'origin/master' 
Conflicts:
	client/src/data/languages/de.js
	client/src/data/languages/es.js
	client/src/data/languages/fr.js
	client/src/data/languages/gr.js
 2019-03-03 13:27:40 -03:00
Ivan Diaz
a89973d366 Fix frontend tests with connect function 2019-03-03 13:24:07 -03:00
Ivan Diaz
f99767e884 Fix ticket not showing issue 2019-03-03 12:14:24 -03:00
Ivan Diaz
223a39ace9 Fix languages format 2019-03-03 11:53:32 -03:00
Ivan Diaz
19a083996c wip languages 2019-03-01 20:10:35 -03:00
Ivan Diaz
a355fc30da
Merge pull request #479 from ivandiazwm/guillermo-master 
Guillermo master
 2019-03-01 02:46:28 -03:00
Ivan Diaz
3918bdcd61 Merge branch 'master' of https://github.com/guillegiu/opensupports into guillermo-master 2019-03-01 02:43:24 -03:00
Ivan Diaz
5d3a805285 Fix styling of custom tags 2019-03-01 01:15:03 -03:00
Ivan Diaz
3b84142004
Merge pull request #478 from ivandiazwm/master 
Bug fixing
 2019-02-28 23:41:22 -03:00
Ivan Diaz
9cce0ccc84
Fix mocha version for travis ci 2019-02-28 23:39:02 -03:00
Ivan Diaz
30dcca3ea3
Fix variable name 2019-02-28 23:31:01 -03:00
Ivan Diaz
133d59e4a7
Remove debbungig console.log 2019-02-28 23:27:03 -03:00
7JuanCruz7
56f6aabd01
Merge pull request #436 from florisvdk/patch-1 
Fix dutch translation
 2019-02-28 23:14:48 -03:00
7JuanCruz7
2b0f71d158
Merge pull request #443 from dustynjcollins/master 
Update en.js
 2019-02-28 23:14:15 -03:00
7JuanCruz7
1f97a63983
Merge pull request #416 from kenlog/patch-1 
Update it.js
 2019-02-28 23:12:06 -03:00
Ivan Diaz
d96e8b44b1 create custom tag admin editor 2019-02-27 17:38:45 -03:00
Guillermo
36d09ec919 tag tests ruby 2019-02-25 13:34:22 -03:00
Guillermo Giuliana
1d3d18b345
Merge pull request #6 from ivandiazwm/guillermo-master 
add-tag path
 2019-02-24 22:32:37 -03:00
Ivan Diaz
5bf8ff94bc display tags in frontend 2019-02-22 18:26:06 -03:00
Ivan Diaz
fad0e8eafb remove tag path 2019-02-22 14:08:49 -03:00
Ivan Diaz
7092d19c27 Merge remote-tracking branch 'guillermo/master' into guillermo-master 2019-02-21 19:38:28 -03:00
Ivan Diaz
c970c9923f API path AddTag for tickets 2019-02-21 19:37:53 -03:00
Ivan Diaz
4627405242 Merge branch 'custom-tags' into guillermo-master 
Conflicts:
	server/libs/validations/dataStoreId.php
	tests/init.rb
 2019-02-21 17:32:10 -03:00
Ivan Diaz
4b80a9b397 Fix #460 issue: Unable to edit email templates with two text fields 2019-02-20 14:18:14 -03:00
Ivan Diaz
eed0fdce03 Fix frontend fixtures 2019-02-20 13:16:04 -03:00
Guillermo Giuliana
a43829c288
Merge pull request #5 from ivandiazwm/guillermo-master 
tag selector styling
 2019-02-20 11:10:25 -03:00
Ivan Diaz
956dac1600 User dropdown for tag selector 2019-02-20 03:03:29 -03:00
Ivan Diaz
e35e843a29 tag selector styling 2019-02-19 19:06:19 -03:00
Guillermo
ba5750a20d tag selector component pt1 2019-02-19 11:41:11 -03:00
Ivan Diaz
9a116c5c29
Merge pull request #458 from ivandiazwm/master 
Custom field tests
 2019-02-15 22:33:59 -03:00
Ivan Diaz
28f26d0956 Fix custom tags tests errors 2019-02-14 19:45:52 -03:00
Ivan Diaz
ef023d139b Fix custom field description 2019-02-13 20:17:19 -03:00
Ivan Diaz
f6f8262880 Add custom fields test 2019-02-13 19:21:59 -03:00
Ivan Diaz
673a92c196 Remove file uploading from email polling 2019-02-10 20:52:42 -03:00
Guillermo
fcf6b887db Merge branch 'master' of https://github.com/opensupports/opensupports into customFieldsTests 2019-02-05 17:13:24 -03:00
Ivan Diaz
a4c44fb9ab
Merge pull request #452 from ivandiazwm/master 
Custom fields feature
 2019-02-03 18:37:35 -02:00
Ivan Diaz
623a81b51d Add Custom Fields feature 2019-02-03 16:47:29 -03:00
dustynjcollins
8a195f829b
Update en.js 
Spelling error, Typo 'for' changed to 'to'
 2019-01-24 11:26:09 -05:00
Ivan Diaz
58c6f2e63f wip 2019-01-18 20:58:30 -03:00
Guillermo
57feafd453 frontend 1part 2019-01-15 20:44:21 -03:00
Ivan Diaz
0339ef366f
Merge pull request #439 from ivandiazwm/master 
Email Polling feature
 2019-01-15 16:15:52 -03:00
Ivan Diaz
08a6f7b8d0 Add email polling deletion 2019-01-12 04:49:25 -03:00
Ivan Diaz
2ceb73edd7 Remove email host values from ruby test 2019-01-12 04:43:02 -03:00
Ivan Diaz
466c37cfeb Fix email fields 2019-01-12 04:36:33 -03:00
Ivan Diaz
17e2dabeae Update installation email settings, add languages 2019-01-12 01:28:23 -03:00
Ivan Diaz
c7f489d988 Add fronted email configuration 2019-01-12 00:38:33 -03:00
Floris Van der krieken
5c03a29f3a
Fix dutch translation 
There was a translation that was not dutch.
 2019-01-02 20:11:43 +01:00
Ivan Diaz
429796aee8 Email feature - wip 2018-12-23 21:44:59 -03:00
Guillermo
a85386a162 Merge branch 'master' of https://github.com/opensupports/opensupports into feature146 2018-12-18 23:59:36 -03:00