1729 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Guillermo	aa795c3099	Revert "Delete edit-topic.php" ... This reverts commit 80934ff3f85e891e69b7114c6b45483e8ed53397.	2018-11-26 22:47:39 -03:00
Guillermo Giuliana	80934ff3f8	Delete edit-topic.php	2018-11-26 17:08:56 -03:00
Guillermo	50818d162d	Merge branch 'master' of https://github.com/guillegiu/opensupports	2018-11-26 17:02:55 -03:00
Guillermo	d2b6f1cc30	fix tst	2018-11-26 15:09:34 -03:00
Guillermo	1bc30240bd	fix test	2018-11-26 02:43:37 -03:00
Ivan Diaz	cbdda1e1dc	Merge branch 'master' of github.com:opensupports/opensupports	2018-11-25 18:39:35 -03:00
Ivan Diaz	de47dea0c7	Merge branch 'master' into master	2018-11-25 18:31:42 -03:00
Ivan Diaz	7fcfe6a283	Merge pull request #391 from guillegiu/articles-331 ... Articles 331	2018-11-25 18:20:05 -03:00
Guillermo	f9e74d8758	test	2018-11-24 23:04:12 -03:00
Guillermo	ba1d72d004	Merge branch 'master' of https://github.com/opensupports/opensupports into articles-331	2018-11-24 02:36:01 -03:00
Guillermo	6596e29d9c	fix test	2018-11-23 22:44:40 -03:00
Guillermo Giuliana	80b6bcea8a	Merge branch 'master' into master	2018-11-23 21:36:40 -03:00
Guillermo	79569fcfde	tests	2018-11-23 20:43:06 -03:00
Guillermo	b4dc92b8f1	features #340	2018-11-23 19:44:10 -03:00
Ivan Diaz	540a91ccd5	Merge pull request #401 from mredigonda/mentions-parser ... Fixes mentions-parser to ignore alphabetic characters	2018-11-23 17:54:02 -03:00
Ivan Diaz	ca80e3ed1f	Use custom exception on response	2018-11-22 16:00:40 -03:00
Ivan Diaz	fb3f1a9c16	Merge pull request #398 from Mte90/patch-1 ... image will fit the comment container	2018-11-22 15:51:44 -03:00
Maxi Redigonda	e28e1bbeb1	Fixes mentions-parser to ignore alphabetic characters	2018-11-20 20:10:35 -03:00
Ivan Diaz	ace895a4a2	Use own exception class	2018-11-20 19:41:21 -03:00
Daniele Scasciafratte	b2f9663001	image will fit the container	2018-11-19 17:41:23 +01:00
Sam Mousa	1a5f38f6de	Improved singleton implementation	2018-11-19 14:27:42 +01:00
Sam Mousa	5c88c8ac2a	Make constructor protected	2018-11-19 14:14:27 +01:00
Sam Mousa	245254fa57	Merge branch 'master' into singleton-trait	2018-11-19 14:04:44 +01:00
Ivan Diaz	4cfa152164	Merge pull request #395 from ivandiazwm/master ... Fix login with rememberToken	2018-11-18 16:58:53 -03:00
Ivan Diaz	77a388e225	Merge branch 'master' of github.com:opensupports/opensupports	2018-11-17 13:21:09 -03:00
Ivan Diaz	54cc704dc6	fix tests	2018-11-17 13:20:47 -03:00
Ivan Diaz	7dd88a8f82	Merge pull request #389 from mredigonda/mentions-parser ... Mentions parser	2018-11-17 13:13:48 -03:00
Maxi Redigonda	e1dffaef16	Parses ticket comments to create links for mentioned tickets	2018-11-17 12:30:52 -03:00
Maxi Redigonda	b56ff24a7d	Parses text from the content of a ticket to add links to mentioned tickets	2018-11-17 12:21:07 -03:00
Ivan Diaz	4251e3b5e7	Fix login with rememberToken	2018-11-16 19:34:07 -03:00
Ivan Diaz	59d59b6a7e	Merge pull request #390 from ivandiazwm/master ... Email Templates refactor / Ticket listing pagination	2018-11-16 17:45:01 -03:00
Ivan Diaz	048d18e3cb	Add php7.2 to travis ci	2018-11-16 17:44:44 -03:00
Ivan Diaz	85eced56ff	Fix mailtemplate tests	2018-11-16 17:24:43 -03:00
Ivan Diaz	a187e06ce3	Solve merge conflicts	2018-11-16 16:53:40 -03:00
Ivan Diaz	1533331e1d	Merge pull request #384 from SamMousa/use-composer-autoloader ... Use composer autoloader for source files (except tests)	2018-11-16 15:44:37 -03:00
Ivan Diaz	a756ac7210	Remove LCG from file uploading	2018-11-16 15:12:15 -03:00
Guillermo	7d949c0719	minor changes feature #331	2018-11-15 23:52:46 -03:00
Guillermo	e855966561	Merge branch 'master' of https://github.com/guillegiu/opensupports	2018-11-15 20:53:10 -03:00
Guillermo	e9dfbfb97b	wip	2018-11-15 20:51:44 -03:00
Ivan Diaz	e8848d898e	Paginate all ticket list request, avoid returting too much data	2018-11-15 20:33:08 -03:00
Ivan Diaz	5f0996f243	solve merge conflics with languages	2018-11-15 17:09:10 -03:00
Ivan Diaz	221fee715d	Delete main.py	2018-11-15 16:33:02 -03:00
Ivan Diaz	4d2d0eac31	Merge pull request #342 from mredigonda/closed-tickets-filter ... Adds a button to filter opened/closed tickets	2018-11-15 16:32:06 -03:00
Maxi Redigonda	0657857981	Deleting files uploaded by mistake :'(	2018-11-15 16:22:35 -03:00
Maxi Redigonda	886d372f38	Merge branch 'closed-tickets-filter' of https://github.com/mredigonda/opensupports into closed-tickets-filter	2018-11-15 16:20:13 -03:00
Ivan Diaz	c436365c07	Merge pull request #379 from ivandiazwm/v4.3.1 ... Fix ticket number collision #378	2018-11-15 16:19:11 -03:00
Ivan Diaz	aa86fd9763	Retrieve tickets individually for users	2018-11-15 16:15:46 -03:00
Ivan Diaz	a2e505c33d	Fix custom responses #388	2018-11-15 12:53:23 -03:00
Ivan Diaz	9d67a19c35	Fix #388 email templates langauge selection	2018-11-15 10:39:11 -03:00
Maxi Redigonda	e8c1ffeea7	Adds parsing of mentions in articles from the admin panel	2018-11-15 10:05:39 -03:00