1463 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Garret Wassermann	f6fe5a7834	Merge remote-tracking branch 'upstream/develop' into develop	2019-02-15 19:45:18 -05:00
Garret Wassermann	c97483deff	Merge 0.2.14 bugfixes	2019-02-15 19:44:41 -05:00
Garret Wassermann	cfd838b7f4	Bump to version 0.2.14	2019-02-15 19:39:43 -05:00
Garret Wassermann	64414141f7	Update ticket_cc_add template for bootstrap4	2019-02-15 19:37:46 -05:00
Garret Wassermann	d5929b8ff9	Merge pull request #716 from OpenGeoLabs/cs_translation ... Czech (cs) translation update	2019-02-15 17:04:06 -05:00
Garret Wassermann	a7505a1ecd	Merge pull request #720 from auto-mat/issue-700-fail ... Add failing test case for issue-700 emails without bodies	2019-02-15 17:01:38 -05:00
Timothy Hobbs	4e35082475	Add failing test case for issue-700 emails without bodies	2019-02-15 15:11:06 +01:00
Jachym Cepicky	d5aaea022a	czech translation	2019-02-06 22:07:12 +01:00
Jachym Cepicky	d02c8c818b	czech e-mail templates added	2019-02-06 11:58:32 +01:00
Garret Wassermann	8c4e094705	Merge pull request #715 from OpenGeoLabs/user-queues-develop ... Queues only visible to user with corresponding rights	2019-02-05 23:18:40 -05:00
Jachym Cepicky	8cc0ca47f8	display list of queues only for users with right permissions	2019-02-05 15:44:06 +01:00
Jachym Cepicky	305d669e71	adding e-mail templates for czech language	2019-02-05 14:43:50 +01:00
Garret Wassermann	d9ccaacee5	Fix typo in __setattr__ in migrations, for #712	2019-02-04 11:29:17 -05:00
Garret Wassermann	e9137cce73	Merge pull request #711 from OpenGeoLabs/fix_date_picker ... set date picker format to yy-mm-dd	2019-02-04 11:18:50 -05:00
Jachym Cepicky	d4dc1c9abe	fix date picker format	2019-02-04 17:00:16 +01:00
Garret Wassermann	9bdd7c60f7	Merge pull request #707 from JayTurnr/patch-1 ... AttributeError: 'Command' object has no attribute 'option_list'	2019-02-03 14:23:10 -05:00
Jay Turner	72d35232a1	Fix key errors ... KeyError: 'verboseescalation' comes up if the key isn't defined.	2019-02-03 18:03:27 +00:00
Jay Turner	d3c4d14a40	AttributeError: 'Command' object has no attribute 'option_list' ... There is a bug in the command in which option_list doesn't exist and thus, cannot be added to.	2019-02-03 17:59:17 +00:00
Garret Wassermann	c13f39aae4	Merge remote-tracking branch 'upstream/develop' into develop	2019-02-02 21:27:56 -05:00
Garret Wassermann	8bb43ee94e	Merge pull request #705 from auto-mat/set_owner ... Add pencil buttons to ticket view for easier assignment and priority …	2019-02-02 15:22:47 -05:00
Timothy Hobbs	c33d6d24d0	Add pencil buttons to ticket view for easier assignment and priority setting	2019-02-02 20:40:46 +01:00
Garret Wassermann	9c44375626	Update copyright and version info for docs/conf.py	2019-01-31 04:43:19 -05:00
Garret Wassermann	cd01b4bab1	Update license for 2019 copyright year	2019-01-31 04:39:02 -05:00
Garret Wassermann	7699c48a7f	Merge pull request #699 from auto-mat/datatables-fix ... Fix links to tickets in datatables ticket list	2019-01-30 11:06:37 -05:00
Timothy Hobbs	782aec649d	Fix links to tickets in datatables ticket list	2019-01-30 15:24:05 +01:00
Garret Wassermann	17fef846e2	Merge pull request #694 from auto-mat/votes ... Set voted_by to read only in knowledge base admin	2019-01-26 21:19:00 -05:00
Timothy Hobbs	bd070f3bec	Set voted_by to read only in knowledge base admin	2019-01-22 18:29:32 +01:00
Garret Wassermann	d7a8cb0de7	Merge 0.2.13 polish email templates	2019-01-17 09:17:54 -05:00
Garret Wassermann	5f59e9a5a7	Bump version to 0.2.13 for polish email template translations	2019-01-17 09:14:29 -05:00
Garret Wassermann	2918ed1dda	Merge pull request #692 from wojtekszymala/master ... Adding Polish translation for notification templates sending by email	2019-01-17 09:05:39 -05:00
Wojciech Szymała	88a3b0502a	Adding Polish translation for notification templates sending by email	2019-01-17 09:25:12 +01:00
Garret Wassermann	e1f9fc03ce	PEP-8 fixes for lib.py	2019-01-02 20:08:55 -05:00
Garret Wassermann	6cfc1ca75c	Fix API changes to python-akismet, #687	2019-01-02 19:17:19 -05:00
Garret Wassermann	f779e8b5ce	Merge master from 0.2.12	2019-01-02 18:55:34 -05:00
Garret Wassermann	3b46eb6793	Bump to 0.2.12 for re-release, remove broken migration in 0.2.11	2019-01-02 18:52:13 -05:00
Garret Wassermann	393076be90	Update travis for latest django	2019-01-01 19:59:16 -05:00
Garret Wassermann	760c9d64dd	Remove bundled akismet in favor of pypi package dependency, for #687	2019-01-01 19:55:08 -05:00
Garret Wassermann	eaaaad8391	Remove py2 commands from makefile, update README copyright for (C) 2019 (happy new year everyone)	2019-01-01 18:12:11 -05:00
Garret Wassermann	a5a679512c	Merge Polish translations from 0.2.11	2018-12-31 04:01:18 -05:00
Garret Wassermann	a60b0acc92	Bump to 0.2.11	2018-12-31 03:58:03 -05:00
Garret Wassermann	f0ca645261	Update Polish (pl) translation	2018-12-31 03:55:44 -05:00
Garret Wassermann	43ed3ac773	PEP-8 fixes for mail threading merge	2018-12-28 11:32:49 -05:00
Garret Wassermann	5f0d22a692	Merge brunotikami/master for user and email threading, for #385 and #375	2018-12-28 10:53:28 -05:00
Garret Wassermann	7dbede6c28	More bootstrap css updates for ticket pages	2018-12-28 04:53:09 -05:00
Garret Wassermann	e9d2b5ced3	Remove duplicate buttons from nav header, use sidebar instead	2018-12-28 03:50:30 -05:00
Garret Wassermann	96e37b9730	Use small font in sidebar saved query list	2018-12-28 03:29:42 -05:00
Garret Wassermann	4e1257c68e	Split sidebar button into All Tickets and Saved Queries	2018-12-28 03:28:20 -05:00
Garret Wassermann	696d10db12	Remove old python2/six code	2018-12-28 03:13:52 -05:00
Garret Wassermann	41d71e9062	Missing breadcrumps on settings and rss pages	2018-12-28 02:41:31 -05:00
Garret Wassermann	6d3964d16c	Fix broken javascript in the ticket page	2018-12-28 02:30:13 -05:00