Garret Wassermann
e20b2362ae
Merge remote-tracking branch 'upstream/master'
2020-06-08 06:19:43 -04:00
Garret Wassermann
a0e77533fc
Ensure at least Django 2.2.13 to address security vulnerabilities
2020-06-08 06:19:00 -04:00
Garret Wassermann
fd1afb1307
Merge pull request #833 from Benbb96/0.2.x
...
Update email templates fixtures
2020-06-05 11:25:30 -04:00
bbe
812f711da7
Fix HTML format error in french templates.
...
Change the date format.
Replace Unknown by Inconnu.
Remove extra whitespace.
Correct some french translations.
Correct an error in the "closed_cc" template for every languages.
2020-06-05 11:26:41 +02:00
bbe
8981282793
Change the date format.
...
Replace Unknown by Inconnu.
Remove extra whitespace.
Correct some french translations.
Correct an error in the "closed_cc" template for every languages.
2020-06-04 17:09:38 +02:00
bbe
cf103763b0
Fix html format error in french email templates
2020-06-03 15:00:51 +02:00
Garret Wassermann
bc74237e6f
Merge pull request #830 from Bukowskaii/feature/dashboard_pagination
...
Feature/dashboard pagination
2020-06-02 00:44:05 -04:00
Tom Bernens
7dcbe69090
missing a couple "
2020-06-01 17:52:20 -07:00
Tom Bernens
041f707dba
forgot end with
2020-06-01 17:50:42 -07:00
Tom Bernens
5f910a72e0
forgot an add
2020-06-01 17:49:50 -07:00
Tom Bernens
1ea2a9cba9
no message
2020-06-01 17:49:10 -07:00
Tom Bernens
9461705591
I was over thinking that
2020-06-01 17:47:54 -07:00
Tom Bernens
a85223e7a5
only create the control if the page number is in the paginator range
2020-06-01 17:20:11 -07:00
Tom Bernens
c854ff764a
add -5?
2020-06-01 17:11:33 -07:00
Tom Bernens
b1914bad14
template language arithmatic
2020-06-01 17:08:30 -07:00
Tom Bernens
df6a8a3778
add first and last page controls
2020-06-01 17:06:44 -07:00
Tom Bernens
d9cb76d491
django template syntax (as instead of =)
2020-06-01 16:50:20 -07:00
Tom Bernens
050a65e6df
reduce this to only ever show 11 pages (5 before and 5 after the current + the current))
2020-06-01 16:49:13 -07:00
Tom Bernens
e1b9906fd0
forgot some '%' cause im a big 'ol dummy
2020-06-01 16:22:16 -07:00
Tom Bernens
e10ffce24a
more safely get the user setting for tickets per page
2020-06-01 16:20:33 -07:00
Tom Bernens
03760a921e
initial commit
...
staff.py changes:
import django core paginator libs
get user setting for tickets per page
get http GET variables for page selection on three tables
use django paginator to get current page tickets only, and pass those to dashboard.html instead of all tickets
dashboard.html changes:
assign the correct HTTP GET argument to each table
tickets.html changes:
add pagination controls below table div, and pass HTTP GET args back to the URL when clicked
2020-06-01 16:14:55 -07:00
Garret Wassermann
2ef9da7c19
Merge pull request #822 from DevonDF/patch-1
...
Fixing typo in install.rst
2020-05-07 15:58:12 -04:00
Devon Findlay
eb38c7dee4
Fixing type in install.rst
...
pinax.inviations -> pinax.invitations
Small typo fixed
2020-05-07 20:17:16 +01:00
Garret Wassermann
3ab599d141
Merge pull request #816 from kajala/feature/l10n-fi
...
Finnish (fi) translation
2020-04-22 07:08:44 -04:00
Garret Wassermann
ccee1bc7a5
Merge pull request #817 from kajala/bugfix/i18n-templates-2020-04-21
...
"Overview" not translated in templates
2020-04-22 02:17:24 -04:00
Jani Kajala
96f631f1c5
"Overview" not using trans in templates dashboard.html, kb_index.html, ticket_list.html
2020-04-21 16:25:26 -05:00
Jani Kajala
dcf5b8acf9
Finnish (fi) email templates to emailtemplate.json
2020-04-21 16:04:13 -05:00
Jani Kajala
272768d2c8
Finnish (fi) .po localization
2020-04-21 16:03:49 -05:00
Garret Wassermann
8a521d563b
Fix pycodestyle error
2020-04-15 07:42:52 -04:00
Garret Wassermann
5ad0743722
Merge in 0.2.21 bugfix
2020-04-15 07:38:52 -04:00
Garret Wassermann
2041430cd3
Update to 0.2.21
2020-04-15 06:59:06 -04:00
Garret Wassermann
19895921a5
Merge pull request #805 from nitr0man/0.2.x
...
Fill followup user field if authenticated user submits ticket
2020-04-15 06:46:55 -04:00
Garret Wassermann
9838144637
Merge pull request #813 from ilikerobots/tz_unpack_fix
...
fix for unpack requires a string argument of length 44 on py27
2020-04-15 06:43:07 -04:00
Garret Wassermann
3b4a9891c0
Merge remote-tracking branch 'upstream/master'
2020-04-15 05:48:11 -04:00
Garret Wassermann
547a57ca4e
Merge 0.2.20 bugfixes
2020-04-15 05:47:12 -04:00
Garret Wassermann
a6f75ada9c
Update to 0.2.20
2020-04-15 05:39:27 -04:00
Garret Wassermann
20f99484ea
Update quicktest configuration for Python 2 tests, to address #813
2020-04-15 05:18:37 -04:00
Garret Wassermann
c71d8879ec
Update copyright year in README
2020-04-15 05:17:08 -04:00
Garret Wassermann
b9933a8c9c
Merge pull request #808 from ilikerobots/patch-2
...
Fix for 'NoneType' object has no attribute 'email'
2020-04-15 05:10:41 -04:00
ilikerobots
4fbcdfe08b
fix for unpack requires a string argument of length 44 on py27
2020-04-15 10:42:15 +03:00
Mike Hoolehan
266775dbf6
Update get_email.py
2020-03-18 09:11:48 +02:00
Garret Wassermann
0e9358e61b
Merge pull request #803 from auto-mat/teams
...
Add Teams functionality, using pinax-teams
2020-03-04 01:02:40 -05:00
Andrew Denisenko
2f4d91c22d
Fill followup user field if authenticated user submits ticket
2020-03-03 23:39:02 +02:00
Timothy Hobbs
4acbb32ef5
Merge pull request #1 from auto-mat/kb_forms
...
Vylepšení znalostní báze pro DPNK 2020
2020-02-27 11:19:11 +00:00
Petr Dlouhý
81f835b77b
fix KBItem choose form
2020-02-27 11:54:04 +01:00
Petr Dlouhý
29e73158b4
make question stronger
2020-02-26 10:49:28 +01:00
Petr Dlouhý
782dd86680
add doctype to iframes
2020-02-26 10:49:28 +01:00
Petr Dlouhý
64db14148f
add KBCategory.public in admin list_display
2020-02-26 10:49:28 +01:00
Petr Dlouhý
e448491bf1
more blocks to the KB_category_base template, HTML validity fixes
2020-02-26 10:23:11 +01:00
Petr Dlouhý
93e82f5469
allow KBItems to be disabled for users
2020-02-25 14:46:21 +01:00