From bf120839010f54f10bf3a509739c1b520e31ccad Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Wed, 29 Jun 2022 02:14:23 +1000
Subject: [PATCH 01/46] Initial conversion started

---
 traq-ui/ticket-listing/TicketFilters.vue      | 10 ++
 traq-ui/ticket-listing/TicketListing.vue      | 95 +++++++++++++++++++
 traq-ui/ticket-listing/ticket-listing.ts      |  5 +
 vendor/traq/controllers/tickets.php           | 51 ++--------
 vendor/traq/views/default/layouts/_head.phtml |  7 ++
 vendor/traq/views/default/tickets/index.phtml | 44 +--------
 6 files changed, 125 insertions(+), 87 deletions(-)
 create mode 100644 traq-ui/ticket-listing/TicketFilters.vue
 create mode 100644 traq-ui/ticket-listing/TicketListing.vue
 create mode 100644 traq-ui/ticket-listing/ticket-listing.ts

diff --git a/traq-ui/ticket-listing/TicketFilters.vue b/traq-ui/ticket-listing/TicketFilters.vue
new file mode 100644
index 000000000..f8615c0b6
--- /dev/null
+++ b/traq-ui/ticket-listing/TicketFilters.vue
@@ -0,0 +1,10 @@
+<template>
+  <fieldset id="ticket_filters">
+    <legend><a href="#">Filters</a></legend>
+    <div id="ticket_filters_content">
+      <table>
+        <tbody></tbody>
+      </table>
+    </div>
+  </fieldset>
+</template>
diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
new file mode 100644
index 000000000..1cbd1ac35
--- /dev/null
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -0,0 +1,95 @@
+<script lang="ts">
+import axios from "axios"
+import TicketFilters from "./TicketFilters.vue"
+
+export default {
+  components: { TicketFilters },
+  data() {
+    return {
+      tickets: [],
+      page: 1,
+      total_pages: 1,
+      sort_by: null,
+      sort_order: "desc",
+    }
+  },
+  methods: {
+    getTickets() {
+      let ticketsUrl =
+        window.traq.base + window.traq.project_slug + "/tickets.json"
+      if (this.sort_by) {
+        ticketsUrl = `${ticketsUrl}?order_by=${this.sort_by}.${this.sort_order}`
+      }
+      axios.get(ticketsUrl).then((resp) => {
+        this.tickets = resp.data.tickets
+        this.page = resp.data.page
+        this.total_pages = resp.data.total_pages
+      })
+    },
+    sortTickets(column) {
+      this.sort_order =
+        column !== this.sort_by || this.sort_order === "desc" ? "asc" : "desc"
+      this.sort_by = column
+      this.getTickets()
+    },
+    ticketUrl(ticketId) {
+      return `${window.traq.base}${window.traq.project_slug}/tickets/${ticketId}`
+    },
+    userUrl(userId) {
+      return `${window.traq.base}users/${userId}`
+    },
+  },
+  mounted() {
+    this.getTickets()
+  },
+}
+</script>
+
+<template>
+  <div class="content">
+    <h2 id="page_title">Tickets</h2>
+    <TicketFilters />
+  </div>
+  <table id="tickets" class="ticket_listing list">
+    <thead>
+      <tr>
+        <th>
+          <a href="#" @click="sortTickets('ticket_id')">ID</a>
+        </th>
+        <th>
+          <a href="#" @click="sortTickets('summary')">Summary</a>
+        </th>
+        <th>
+          <a href="#" @click="sortTickets('status')">Status</a>
+        </th>
+        <th>
+          <a href="#" @click="sortTickets('user')">Owner</a>
+        </th>
+        <th>Type</th>
+        <th>Component</th>
+        <th>Milestone</th>
+      </tr>
+      <tr
+        v-for="ticket in tickets"
+        :key="ticket.id"
+        :class="'priority_' + ticket.priority.id"
+      >
+        <td>{{ ticket.id }}</td>
+        <td>
+          <a :href="ticketUrl(ticket.id)">
+            {{ ticket.summary }}
+          </a>
+        </td>
+        <td>{{ ticket.status.name }}</td>
+        <td>
+          <a :href="userUrl(ticket.user.id)">{{ ticket.user.name }}</a>
+        </td>
+        <td>{{ ticket.type.name }}</td>
+        <td>{{ ticket.component?.name ?? "-" }}</td>
+        <td>{{ ticket.milestone?.name ?? "-" }}</td>
+      </tr>
+    </thead>
+  </table>
+</template>
+
+<style></style>
diff --git a/traq-ui/ticket-listing/ticket-listing.ts b/traq-ui/ticket-listing/ticket-listing.ts
new file mode 100644
index 000000000..e679d28ca
--- /dev/null
+++ b/traq-ui/ticket-listing/ticket-listing.ts
@@ -0,0 +1,5 @@
+import { createApp } from "vue";
+import TicketListing from "./TicketListing.vue";
+
+const app = createApp(TicketListing);
+app.mount("#ticket-listing");
diff --git a/vendor/traq/controllers/tickets.php b/vendor/traq/controllers/tickets.php
index 0b0892f48..21f1b58c5 100644
--- a/vendor/traq/controllers/tickets.php
+++ b/vendor/traq/controllers/tickets.php
@@ -82,7 +82,9 @@ public function __construct()
     public function action_index()
     {
         // Atom feed
-        $this->feeds[] = array(Request::requestUri() . ".atom", l('x_ticket_feed', $this->project->name));
+        $this->feeds[] = [
+            Request::requestUri() . ".atom", l('x_ticket_feed', $this->project->name)
+        ];
 
         // Create ticket filter query
         $filter_query = new TicketFilterQuery($this->project);
@@ -97,8 +99,8 @@ public function action_index()
 
         // Any filters stored in the session?
         if (!count($filter_query->filters())
-        and isset($_SESSION['ticket_filters'])
-        and isset($_SESSION['ticket_filters'][$this->project->id])) {
+        && isset($_SESSION['ticket_filters'])
+        && isset($_SESSION['ticket_filters'][$this->project->id])) {
             foreach (explode('&', $_SESSION['ticket_filters'][$this->project->id]) as $filter_value) {
                 if (strpos($filter_value, '=')) {
                     $filter_value = explode('=', $filter_value);
@@ -116,7 +118,7 @@ public function action_index()
         View::set('filters', $filter_query->filters());
 
         // Fetch tickets
-        $tickets = array();
+        $tickets = [];
         $rows = $this->db->select('tickets.*')->from('tickets')->custom_sql($filter_query->sql());
 
         // Order by creation date for atom feed
@@ -184,47 +186,6 @@ public function action_index()
 
         // Send the tickets array to the view..
         View::set('tickets', $tickets);
-
-        // Columns
-        $this->get_columns();
-    }
-
-    private function get_columns()
-    {
-        $allowed_columns = ticketlist_allowed_columns();
-
-        // Add custom fields
-        foreach ($this->custom_fields as $field) {
-            $allowed_columns[] = $field->id;
-        }
-
-        // Set columns from form
-        if (Request::method() == 'post' and isset(Request::$post['update_columns'])) {
-            $new_columns = array();
-            foreach (Request::$post['columns'] as $column) {
-                $new_columns[] = $column;
-            }
-            $_SESSION['columns'] = Request::$request['columns'] = $new_columns;
-        }
-
-        // Get columns
-        $columns = array();
-        if (isset($_SESSION['columns']) or isset(Request::$request['columns'])) {
-            // Loop over customs from session or request
-            foreach ((isset($_SESSION['columns']) ? $_SESSION['columns'] : explode(',', Request::$request['columns'])) as $column) {
-                // Make sure it's a valid column
-                if (in_array($column, $allowed_columns)) {
-                    $columns[] = $column;
-                }
-            }
-        }
-        // Use default columns
-        else {
-            $columns = ticket_columns();
-        }
-
-        // Send columns to view
-        View::set('columns', $columns);
     }
 
     /**
diff --git a/vendor/traq/views/default/layouts/_head.phtml b/vendor/traq/views/default/layouts/_head.phtml
index fc7d4eb54..e83c8bf62 100644
--- a/vendor/traq/views/default/layouts/_head.phtml
+++ b/vendor/traq/views/default/layouts/_head.phtml
@@ -9,6 +9,13 @@
 		<?php echo HTML::js_inc('//code.jquery.com/ui/1.10.4/jquery-ui.min.js'); ?>
 		<?php echo HTML::js_inc(Request::base() . 'js.php?js=all'); ?>
 		<?php echo HTML::js_inc(Request::base('_js')); ?>
+
+		<?php if ($project): ?>
+			<script>
+				window.traq.project_slug = <?php echo json_encode($project->slug); ?>
+			</script>
+		<?php endif; ?>
+
 		<?php FishHook::run('template:layouts/global/head'); ?>
 <?php foreach ($app->feeds as $feed) { ?><link type="application/atom+xml" rel ="alternate" href="<?php echo $feed[0]; ?>">
 <?php } ?>
diff --git a/vendor/traq/views/default/tickets/index.phtml b/vendor/traq/views/default/tickets/index.phtml
index 96745675c..ffb0779a2 100644
--- a/vendor/traq/views/default/tickets/index.phtml
+++ b/vendor/traq/views/default/tickets/index.phtml
@@ -1,42 +1,2 @@
-<div class="content">
-	<h2 id="page_title"><?php echo l('tickets')?></h2>
-	<?php echo View::render('tickets/_filters'); ?>
-	<?php echo View::render('tickets/_columns'); ?>
-</div>
-<table id="tickets" class="ticket_listing list">
-	<thead>
-		<tr>
-<?php if (current_user()->permission($project->id, 'perform_mass_actions')) { ?>
-			<th class="mass_actions"><?php echo Form::checkbox('all_tickets', 1, array('id' => "select_all_tickets"))?></th>
-<?php } ?>
-	<?php foreach ($columns as $column) { ?>
-			<th>
-				<?php echo ticketlist_sort_indicator($column == 'ticket_id' ? 'id' : $column); ?>
-				<a href="<?php echo ticket_sort_url_for($column == 'ticket_id' ? 'id' : $column); ?>"><?php echo ticketlist_header($column)?></a>
-			</th>
-	<?php } ?>
-		</tr>
-	</thead>
-	<tbody>
-	<?php foreach ($tickets as $ticket) { ?>
-		<tr class="priority_<?php echo $ticket->priority_id; ?>">
-<?php if (current_user()->permission($project->id, 'perform_mass_actions')) { ?>
-				<td class="mass_actions"><?php echo Form::checkbox('tickets[]', $ticket->ticket_id, array('id' => "mass_action_ticket_{$ticket->ticket_id}"))?></td>
-<?php } ?>
-			<?php foreach ($columns as $column) { ?>
-				<?php if ($column == 'summary') { ?>
-				<td><?php echo HTML::link(htmlspecialchars($ticket->summary), "{$project->slug}/tickets/{$ticket->ticket_id}"); ?></td>
-				<?php } elseif ($column == 'owner') { ?>
-				<td><?php echo HTML::link(strshorten($ticket->user->name, 20), $ticket->user->href()); ?></td>
-				<?php } elseif ($column == 'assigned_to') { ?>
-				<td><?php echo ($ticket->assigned_to ? HTML::link(strshorten($ticket->assigned_to->name, 20), $ticket->assigned_to->href()) :'')?></td>
-				<?php } else { ?>
-				<td><?php echo ticketlist_data($column, $ticket); ?></td>
-				<?php } ?>
-			<?php } ?>
-		</tr>
-	<?php } ?>
-	</tbody>
-</table>
-<?php echo View::render('tickets/_mass_actions'); ?>
-<?php echo View::render('layouts/_pagination'); ?>
+<div id="ticket-listing"></div>
+<?php echo ui_package('ticket-listing'); ?>
\ No newline at end of file

From 85f74dcf494cb79124da75a0f0d4d319eae117c9 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Wed, 29 Jun 2022 18:32:23 +1000
Subject: [PATCH 02/46] PHP 8.0+

---
 README.md                                 |  2 +-
 dev/docker/{php73-apache => php80-apache} |  2 +-
 docker-compose.yml                        | 15 +--------------
 3 files changed, 3 insertions(+), 16 deletions(-)
 rename dev/docker/{php73-apache => php80-apache} (74%)

diff --git a/README.md b/README.md
index beeb323a9..70d0e35e0 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Traq is a PHP powered project manager, capable of tracking issues for multiple p
 Requirements
 ------------
 
-- PHP 7.4+
+- PHP 8.0+
 - MariaDB _(or MySQL)_
 - Apache mod_rewrite or server configured to use `index.php` as the 404 page.
 
diff --git a/dev/docker/php73-apache b/dev/docker/php80-apache
similarity index 74%
rename from dev/docker/php73-apache
rename to dev/docker/php80-apache
index d3f468fcd..7126e11de 100644
--- a/dev/docker/php73-apache
+++ b/dev/docker/php80-apache
@@ -1,4 +1,4 @@
-FROM php:7.3-apache
+FROM php:8.0-apache
 
 RUN docker-php-ext-install pdo_mysql
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 2e22db575..44078f4e7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     container_name: traq3_web
     build:
       context: .
-      dockerfile: dev/docker/php73-apache
+      dockerfile: dev/docker/php80-apache
     working_dir: /var/www/html
     volumes:
       - .:/var/www/html
@@ -14,19 +14,6 @@ services:
     links:
       - mysql:db
 
-  web56:
-    container_name: traq3_web56
-    build:
-      context: .
-      dockerfile: dev/docker/php56-apache
-    working_dir: /var/www/html
-    volumes:
-      - .:/var/www/html
-    ports:
-      - 3001:80
-    links:
-      - mysql:db
-
   mysql:
     container_name: traq3_db
     image: mariadb:10

From d61ebadddacaca063ba7bc230a51ad5fd6e8c4e3 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Thu, 30 Jun 2022 01:00:36 +1000
Subject: [PATCH 03/46] Tooling tweaks

---
 .eslintrc.cjs      |   1 +
 .prettierrc.json   |   9 +-
 package.json       |   5 +
 postcss.config.js  |   7 +
 tailwind.config.js |  25 ++++
 vite.config.ts     |   1 +
 yarn.lock          | 309 +++++++++++++++++++++++++++++++++++++++++++--
 7 files changed, 343 insertions(+), 14 deletions(-)
 create mode 100644 postcss.config.js
 create mode 100644 tailwind.config.js

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 2ec566d8c..a4b6b19bf 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -8,6 +8,7 @@ module.exports = {
     "eslint:recommended",
     "@vue/eslint-config-typescript/recommended",
   ],
+  parser: "vue-eslint-parser",
   rules: {
     "comma-dangle": ["error", "always-multiline"],
   },
diff --git a/.prettierrc.json b/.prettierrc.json
index 6879e2f5b..db1175caf 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -1,4 +1,11 @@
 {
+  "printWidth": 160,
+  "tabWidth": 2,
+  "endOfLine": "lf",
+  "tabs": false,
   "semi": false,
-  "trailingComma": "es5"
+  "trailingComma": "es5",
+  "quoteProps": "as-needed",
+  "bracketSpacing": true,
+  "arrowParens": "always"
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index e5c1c2abc..b2fdc80bd 100644
--- a/package.json
+++ b/package.json
@@ -24,11 +24,16 @@
     "@vue/eslint-config-typescript": "^11.0.0",
     "@vue/test-utils": "^2.0.0",
     "@vue/tsconfig": "^0.1.3",
+    "autoprefixer": "^10.4.7",
     "eslint": "^8.5.0",
     "eslint-plugin-vue": "^9.0.0",
     "jsdom": "^20.0.0",
     "npm-run-all": "^4.1.5",
+    "postcss": "^8.4.14",
+    "postcss-nesting": "^10.1.9",
     "prettier": "^2.5.1",
+    "sass": "^1.53.0",
+    "tailwindcss": "^3.1.4",
     "typescript": "~4.7.4",
     "vite": "^2.9.12",
     "vitest": "^0.15.1",
diff --git a/postcss.config.js b/postcss.config.js
new file mode 100644
index 000000000..2ac1a49b9
--- /dev/null
+++ b/postcss.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+  plugins: [
+    require("tailwindcss/nesting"),
+    require("tailwindcss"),
+    require("autoprefixer"),
+  ],
+}
diff --git a/tailwind.config.js b/tailwind.config.js
new file mode 100644
index 000000000..de4fa018a
--- /dev/null
+++ b/tailwind.config.js
@@ -0,0 +1,25 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  content: ["./traq-ui/**/*.{vue,js,ts,jsx,tsx}"],
+  theme: {
+    extend: {
+      colors: {
+        brand: {
+          100: "#d6e4ee",
+          200: "#aec9dd",
+          300: "#85aecc",
+          400: "#5d93bb",
+          500: "#3478aa",
+          600: "#2a6088",
+          700: "#1f4866",
+          800: "#153044",
+          900: "#0a1822",
+        },
+      },
+    },
+  },
+  plugins: [],
+  corePlugins: {
+    preflight: false,
+  },
+}
diff --git a/vite.config.ts b/vite.config.ts
index a63d0795f..80667396c 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -19,6 +19,7 @@ export default defineConfig({
     manifest: true,
     rollupOptions: {
       input: {
+        main: resolve(__dirname, "traq-ui/main.ts"),
         "ticket-listing": resolve(
           __dirname,
           "traq-ui/ticket-listing/ticket-listing.ts"
diff --git a/yarn.lock b/yarn.lock
index 56c915dcc..e31e7c130 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7,6 +7,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.6.tgz#845338edecad65ebffef058d3be851f1d28a63bc"
   integrity sha512-uQVSa9jJUe/G/304lXspfWVpKpK4euFLgGiMQFOCpM/bgcAdeoHwi/OQz23O9GK2osz26ZiXRRV9aV+Yl1O8tw==
 
+"@csstools/selector-specificity@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.1.tgz#b6b8d81780b9a9f6459f4bfe9226ac6aefaefe87"
+  integrity sha512-aG20vknL4/YjQF9BSV7ts4EWm/yrjagAN7OWBNmlbEOUiu0llj4OGrFoOKK3g2vey4/p2omKCoHrWtPxSwV3HA==
+
 "@eslint/eslintrc@^1.3.0":
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f"
@@ -372,12 +377,21 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^7.1.1:
+acorn-node@^1.8.2:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8"
+  integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==
+  dependencies:
+    acorn "^7.0.0"
+    acorn-walk "^7.0.0"
+    xtend "^4.0.2"
+
+acorn-walk@^7.0.0, acorn-walk@^7.1.1:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn@^7.1.1:
+acorn@^7.0.0, acorn@^7.1.1:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
@@ -423,6 +437,19 @@ ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
+anymatch@~3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
+arg@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
+  integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==
+
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -443,6 +470,18 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
+autoprefixer@^10.4.7:
+  version "10.4.7"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.7.tgz#1db8d195f41a52ca5069b7593be167618edbbedf"
+  integrity sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==
+  dependencies:
+    browserslist "^4.20.3"
+    caniuse-lite "^1.0.30001335"
+    fraction.js "^4.2.0"
+    normalize-range "^0.1.2"
+    picocolors "^1.0.0"
+    postcss-value-parser "^4.2.0"
+
 axios@^0.27.2:
   version "0.27.2"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
@@ -456,6 +495,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
 boolbase@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
@@ -469,7 +513,7 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^3.0.2:
+braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -481,6 +525,16 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
+browserslist@^4.20.3:
+  version "4.21.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.1.tgz#c9b9b0a54c7607e8dc3e01a0d311727188011a00"
+  integrity sha512-Nq8MFCSrnJXSc88yliwlzQe3qNe3VntIjhsArW9IJOEPSHNx23FalwApUVbzAWABLhYJJ7y8AynWI/XM8OdfjQ==
+  dependencies:
+    caniuse-lite "^1.0.30001359"
+    electron-to-chromium "^1.4.172"
+    node-releases "^2.0.5"
+    update-browserslist-db "^1.0.4"
+
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -494,6 +548,16 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
+camelcase-css@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
+  integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
+
+caniuse-lite@^1.0.30001335, caniuse-lite@^1.0.30001359:
+  version "1.0.30001361"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001361.tgz#ba2adb2527566fb96f3ac7c67698ae7fc495a28d"
+  integrity sha512-ybhCrjNtkFji1/Wto6SSJKkWk6kZgVQsDq5QI83SafsF6FXv2JB4df9eEdH6g8sdGgqTXrFLjAxqBGgYoU3azQ==
+
 chai@^4.3.6:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.6.tgz#ffe4ba2d9fa9d6680cc0b370adae709ec9011e9c"
@@ -529,6 +593,21 @@ check-error@^1.0.2:
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
   integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==
 
+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -548,7 +627,7 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
-color-name@~1.1.4:
+color-name@^1.1.4, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@@ -653,11 +732,30 @@ define-properties@^1.1.3, define-properties@^1.1.4:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
+defined@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+  integrity sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ==
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
+detective@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.1.tgz#6af01eeda11015acb0e73f933242b70f24f91034"
+  integrity sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==
+  dependencies:
+    acorn-node "^1.8.2"
+    defined "^1.0.0"
+    minimist "^1.2.6"
+
+didyoumean@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037"
+  integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==
+
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -665,6 +763,11 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
+dlv@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
+  integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
+
 doctrine@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
@@ -679,6 +782,11 @@ domexception@^4.0.0:
   dependencies:
     webidl-conversions "^7.0.0"
 
+electron-to-chromium@^1.4.172:
+  version "1.4.173"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.173.tgz#48f128dda49cd7f6317e65ac0085bd3a6b9b6e3b"
+  integrity sha512-Qo3LnVW6JRNhD32viSdPebxKI7K+3WeBDjU1+Q2yZS83zAh8C2LyPpzTimlciv6U74KpY9n/0ESAhUByRke0jw==
+
 entities@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.3.0.tgz#62915f08d67353bb4eb67e3d62641a4059aec656"
@@ -855,6 +963,11 @@ esbuild@^0.14.27:
     esbuild-windows-64 "0.14.47"
     esbuild-windows-arm64 "0.14.47"
 
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -1034,7 +1147,7 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
-fast-glob@^3.2.9:
+fast-glob@^3.2.11, fast-glob@^3.2.9:
   version "3.2.11"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
   integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
@@ -1103,6 +1216,11 @@ form-data@^4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+fraction.js@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
+  integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -1160,14 +1278,14 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
-glob-parent@^5.1.2:
+glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.1:
+glob-parent@^6.0.1, glob-parent@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@@ -1292,6 +1410,11 @@ ignore@^5.2.0:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
+immutable@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
+  integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==
+
 import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
@@ -1339,6 +1462,13 @@ is-bigint@^1.0.1:
   dependencies:
     has-bigints "^1.0.1"
 
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
 is-boolean-object@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
@@ -1371,7 +1501,7 @@ is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -1512,6 +1642,11 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+lilconfig@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.5.tgz#19e57fd06ccc3848fd1891655b5a447092225b25"
+  integrity sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==
+
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -1595,6 +1730,11 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimist@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -1615,6 +1755,11 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
+node-releases@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666"
+  integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==
+
 normalize-package-data@^2.3.2:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -1625,6 +1770,16 @@ normalize-package-data@^2.3.2:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+normalize-range@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
+
 npm-run-all@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
@@ -1652,6 +1807,11 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.1.tgz#10a9f268fbf4c461249ebcfe38e359aa36e2577c"
   integrity sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg==
 
+object-hash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
+  integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
+
 object-inspect@^1.12.0, object-inspect@^1.9.0:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
@@ -1767,7 +1927,7 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -1777,6 +1937,11 @@ pidtree@^0.3.0:
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
   integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==
 
+pify@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
+
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
@@ -1790,7 +1955,46 @@ pinia@^2.0.14:
     "@vue/devtools-api" "^6.1.4"
     vue-demi "*"
 
-postcss-selector-parser@^6.0.9:
+postcss-import@^14.1.0:
+  version "14.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.1.0.tgz#a7333ffe32f0b8795303ee9e40215dac922781f0"
+  integrity sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==
+  dependencies:
+    postcss-value-parser "^4.0.0"
+    read-cache "^1.0.0"
+    resolve "^1.1.7"
+
+postcss-js@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.0.tgz#31db79889531b80dc7bc9b0ad283e418dce0ac00"
+  integrity sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==
+  dependencies:
+    camelcase-css "^2.0.1"
+
+postcss-load-config@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855"
+  integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==
+  dependencies:
+    lilconfig "^2.0.5"
+    yaml "^1.10.2"
+
+postcss-nested@5.0.6:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc"
+  integrity sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==
+  dependencies:
+    postcss-selector-parser "^6.0.6"
+
+postcss-nesting@^10.1.9:
+  version "10.1.9"
+  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.1.9.tgz#2aef4e68f222857dc36c0f77a69bf4a900a7e304"
+  integrity sha512-WlnqQecNMT7eizBpWwAnQOIk7Zr0A+OZJccEwQoTwmcIsZCVdcjT1LjXj1hBk6zR3BDLZQYsb5KZj2HquZgvTw==
+  dependencies:
+    "@csstools/selector-specificity" "^2.0.0"
+    postcss-selector-parser "^6.0.10"
+
+postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9:
   version "6.0.10"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
   integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
@@ -1798,7 +2002,12 @@ postcss-selector-parser@^6.0.9:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss@^8.1.10, postcss@^8.4.13:
+postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
+  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
+
+postcss@^8.1.10, postcss@^8.4.13, postcss@^8.4.14:
   version "8.4.14"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf"
   integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
@@ -1844,6 +2053,18 @@ queue-microtask@^1.2.2:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
+quick-lru@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
+  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
+
+read-cache@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
+  integrity sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==
+  dependencies:
+    pify "^2.3.0"
+
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -1853,6 +2074,13 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+  dependencies:
+    picomatch "^2.2.1"
+
 regexp.prototype.flags@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
@@ -1872,7 +2100,7 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve@^1.10.0, resolve@^1.22.0:
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.22.0:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -1912,6 +2140,15 @@ run-parallel@^1.1.9:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
+sass@^1.53.0:
+  version "1.53.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.53.0.tgz#eab73a7baac045cc57ddc1d1ff501ad2659952eb"
+  integrity sha512-zb/oMirbKhUgRQ0/GFz8TSAwRq2IlR29vOUJZOx0l8sV+CkHUfHa4u5nqrG+1VceZp7Jfj59SVW9ogdhTvJDcQ==
+  dependencies:
+    chokidar ">=3.0.0 <4.0.0"
+    immutable "^4.0.0"
+    source-map-js ">=0.6.2 <2.0.0"
+
 saxes@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
@@ -1974,7 +2211,7 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-source-map-js@^1.0.2:
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
@@ -2083,6 +2320,34 @@ symbol-tree@^3.2.4:
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
+tailwindcss@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.1.4.tgz#64b09059805505902139fa805d97046080bd90b9"
+  integrity sha512-NrxbFV4tYsga/hpWbRyUfIaBrNMXDxx5BsHgBS4v5tlyjf+sDsgBg5m9OxjrXIqAS/uR9kicxLKP+bEHI7BSeQ==
+  dependencies:
+    arg "^5.0.2"
+    chokidar "^3.5.3"
+    color-name "^1.1.4"
+    detective "^5.2.1"
+    didyoumean "^1.2.2"
+    dlv "^1.1.3"
+    fast-glob "^3.2.11"
+    glob-parent "^6.0.2"
+    is-glob "^4.0.3"
+    lilconfig "^2.0.5"
+    normalize-path "^3.0.0"
+    object-hash "^3.0.0"
+    picocolors "^1.0.0"
+    postcss "^8.4.14"
+    postcss-import "^14.1.0"
+    postcss-js "^4.0.0"
+    postcss-load-config "^3.1.4"
+    postcss-nested "5.0.6"
+    postcss-selector-parser "^6.0.10"
+    postcss-value-parser "^4.2.0"
+    quick-lru "^5.1.1"
+    resolve "^1.22.0"
+
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -2177,6 +2442,14 @@ universalify@^0.1.2:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+update-browserslist-db@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz#dbfc5a789caa26b1db8990796c2c8ebbce304824"
+  integrity sha512-jnmO2BEGUjsMOe/Fg9u0oczOe/ppIDZPebzccl1yDWGLFP16Pa1/RM5wEoKYPG2zstNcDuAStejyxsOuKINdGA==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -2354,7 +2627,17 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
+xtend@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yaml@^1.10.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==

From c9fa2995127774a59087db4d72e4e6208233b6c0 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Thu, 30 Jun 2022 01:02:47 +1000
Subject: [PATCH 04/46] Minor theme improvements

---
 traq-ui/css/buttons.css                       | 37 ++++++++
 traq-ui/css/content.css                       | 26 ++++++
 traq-ui/css/header.css                        | 46 ++++++++++
 traq-ui/css/main.css                          |  3 +
 traq-ui/main.ts                               |  4 +
 vendor/traq/helpers/ui.php                    | 17 +++-
 vendor/traq/views/default/css/default.css     | 10 +--
 vendor/traq/views/default/css/default.css.map |  1 +
 vendor/traq/views/default/layouts/_head.phtml |  2 +
 .../views/default/layouts/_meta_nav.phtml     | 44 +++++-----
 .../traq/views/default/layouts/default.phtml  | 85 ++++++++++---------
 vendor/traq/views/default/tickets/index.phtml |  2 +-
 12 files changed, 208 insertions(+), 69 deletions(-)
 create mode 100644 traq-ui/css/buttons.css
 create mode 100644 traq-ui/css/content.css
 create mode 100644 traq-ui/css/header.css
 create mode 100644 traq-ui/css/main.css
 create mode 100644 traq-ui/main.ts
 create mode 100644 vendor/traq/views/default/css/default.css.map

diff --git a/traq-ui/css/buttons.css b/traq-ui/css/buttons.css
new file mode 100644
index 000000000..6cf1a5ae9
--- /dev/null
+++ b/traq-ui/css/buttons.css
@@ -0,0 +1,37 @@
+button,
+input[type="submit"],
+input[type="button"],
+input[type="reset"] {
+  @apply py-2 px-3;
+  @apply border-0 rounded;
+  @apply bg-gray-200 hover:bg-gray-300 active:bg-gray-400;
+  @apply focus:ring-2 ring-gray-500;
+  @apply transition-all;
+
+  &.primary {
+    @apply text-white;
+    @apply bg-brand-400;
+    @apply ring-brand-200;
+
+    &:hover {
+      @apply bg-brand-500;
+    }
+
+    &:active {
+      @apply bg-brand-600;
+    }
+  }
+
+  &.success {
+    @apply bg-emerald-400;
+    @apply ring-emerald-200;
+
+    &:hover {
+      @apply bg-emerald-500;
+    }
+
+    &:active {
+      @apply bg-emerald-600;
+    }
+  }
+}
diff --git a/traq-ui/css/content.css b/traq-ui/css/content.css
new file mode 100644
index 000000000..1c66fd05f
--- /dev/null
+++ b/traq-ui/css/content.css
@@ -0,0 +1,26 @@
+body {
+  /* background: #e9e9e9; */
+  @apply bg-gray-50;
+  @apply text-white;
+}
+
+#page_title {
+  line-height: 1;
+  @apply my-2;
+}
+
+#page {
+  @apply bg-white;
+  @apply text-black;
+  @apply shadow-sm;
+}
+
+.content {
+  padding: 10px;
+}
+
+#footer {
+  @apply mt-5;
+  @apply text-gray-400;
+  @apply text-center;
+}
diff --git a/traq-ui/css/header.css b/traq-ui/css/header.css
new file mode 100644
index 000000000..ee84d425e
--- /dev/null
+++ b/traq-ui/css/header.css
@@ -0,0 +1,46 @@
+#header,
+#nav {
+  /* background: #3478aa; */
+  @apply bg-brand-500;
+  @apply text-white;
+}
+
+#meta_nav {
+  /* background: #265f98; */
+  @apply bg-brand-600;
+
+  @apply text-xs;
+  @apply h-5;
+  padding: 2px 5px;
+
+  @apply flex;
+  @apply items-center;
+
+  & ul {
+    margin: 0;
+    padding: 0;
+
+    & li {
+      display: inline;
+      margin-right: 5px;
+
+      &:last-child {
+        margin-right: 0;
+      }
+    }
+  }
+
+  & a {
+    color: #fff;
+    text-decoration: none;
+  }
+
+  & li.active,
+  & a:hover {
+    text-decoration: underline;
+  }
+}
+
+#user_nav {
+  float: right;
+}
diff --git a/traq-ui/css/main.css b/traq-ui/css/main.css
new file mode 100644
index 000000000..b5c61c956
--- /dev/null
+++ b/traq-ui/css/main.css
@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
diff --git a/traq-ui/main.ts b/traq-ui/main.ts
new file mode 100644
index 000000000..0e55116d2
--- /dev/null
+++ b/traq-ui/main.ts
@@ -0,0 +1,4 @@
+import "./css/main.css"
+import "./css/header.css"
+import "./css/content.css"
+import "./css/buttons.css"
diff --git a/vendor/traq/helpers/ui.php b/vendor/traq/helpers/ui.php
index 25fff61d3..aef0b3003 100644
--- a/vendor/traq/helpers/ui.php
+++ b/vendor/traq/helpers/ui.php
@@ -32,10 +32,21 @@ function ui_package($entry) {
   $manifestPath = dirname(dirname(dirname(__DIR__))).'/assets/ui/manifest.json';
   $manifest = json_decode(file_get_contents($manifestPath), true);
 
-  $index = "traq-ui/${entry}/${entry}.ts";
+  $index = "traq-ui/${entry}.ts";
   if (isset($manifest[$index])) {
-    $file = $manifest[$index]['file'];
+    $info = $manifest[$index];
+    $file = $info['file'];
 
-    return HTML::js_inc(Request::base()."assets/ui/${file}");
+    $html = [];
+
+    if (isset($info['css'])) {
+      foreach ($info['css'] as $cssFile) {
+        $html[] = HTML::css_link(Request::base()."assets/ui/${cssFile}");
+      }
+    }
+
+    $html[] = HTML::js_inc(Request::base()."assets/ui/${file}");
+
+    return implode(PHP_EOL, $html);
   }
 }
\ No newline at end of file
diff --git a/vendor/traq/views/default/css/default.css b/vendor/traq/views/default/css/default.css
index 7beaf7f39..583ed20fb 100644
--- a/vendor/traq/views/default/css/default.css
+++ b/vendor/traq/views/default/css/default.css
@@ -1,7 +1,7 @@
 /*!
  * Traq
- * Copyright (C) 2009-2014 Jack Polgar
- * Copyright (C) 2012-2014 Traq.io
+ * Copyright (C) 2009-2022 Jack Polgar
+ * Copyright (C) 2012-2022 Traq.io
  * https://github.com/nirix
  * http://traq.io
  *
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with Traq. If not, see <http://www.gnu.org/licenses/>.
- */body{background:#e9e9e9;color:#fff}hr{margin-bottom:0}p{margin-bottom:10px}p:last-child{margin-bottom:0}h2{margin-bottom:0}h3{margin-bottom:5px}#page_title{line-height:1;margin-top:0}#header{background:#3478AA;color:#fff;padding:10px}#header h1{display:inline-block;color:#fff;margin:0}#header h1 a{color:#fff;text-decoration:none}#header #project_switcher_btn{display:none;position:absolute;margin-top:14px;margin-left:5px;height:10px;width:10px}#header #project_switcher_btn .arrow{display:inline-block;background:#fff;padding:5px;border-radius:4px}#header #project_switcher_btn .arrow em{display:block;border-left:3px solid transparent;border-right:3px solid transparent;border-top:5px solid #3478AA}#header .project_switcher{margin-top:12px;margin-left:2px}#search{float:right}#page{color:#000;background:#fff}.content{padding:10px}.box,.inline_box{background:#F6F6F6;border:1px solid #e4e4e4;padding:5px;margin-bottom:0}.box .box_title,.inline_box .box_title{margin-top:5px;margin-bottom:0}.tabular.section.box{margin-bottom:10px}.tabular.section.box:last-child{margin-bottom:0}.page_actions{float:right}.pagination .prev_link{float:left}.pagination .next_link{float:right}#footer{color:#000;padding:5px}code{background-color:#f8f8f8;border:1px solid #ccc;border-radius:3px;padding:2px}pre{background-color:#f8f8f8;border:1px solid #ccc;border-radius:3px;padding:2px;white-space:pre-wrap}pre code{background-color:transparent;border:0;border-radius:0;padding:0}.permissions.list .permission_section{background:#265F98;color:#fff}.permissions.list .permission_section:nth-child(even) td{background:inherit}.usercp.content #options,.usercp.content #info{padding:5px;width:48%}.usercp.content #info{float:left}.usercp.content #options{float:right}.changelog.content #changeset{margin-top:10px}.changelog.content #changeset ul{list-style:none;padding-left:5px}.changelog.content #changeset ul li:before{margin-right:8px;width:5px;text-align:center;display:inline-block}#nav{background:#3478AA;color:#000;height:20px;padding:0 5px}#nav ul{margin:0;padding:0;list-style:none}#nav li{display:inline}#nav a{color:#fff;padding:4px 10px;text-decoration:none}#nav a:hover,#nav a:focus,#nav a:active,#nav li.active a{background:#fff;color:#000}#meta_nav{font-size:11px;height:16px;padding:2px 5px;background:#265f98}#meta_nav ul{margin:0;padding:0}#meta_nav ul li{display:inline;margin-right:5px}#meta_nav ul li:last-child{margin-right:0}#meta_nav a{color:#fff;text-decoration:none}#meta_nav li.active,#meta_nav a:hover{text-decoration:underline}#user_nav{float:right}h3.list_title{font-size:15px}.list_title{margin-bottom:0}.list th.fixed_username,.list th.fixed_name{width:200px}.list th.actions,.list th.fixed_repo_slug{width:140px}table.list{margin:0}thead th{background:#3478AA;color:#fff}thead th a{color:#fff}thead th:hover,thead th a:hover{color:#fff}.tabs{height:24px;position:relative;overflow:hidden}.tabs ul{margin:0;position:absolute;padding-left:10px;width:2000px;border-bottom:1px solid #bbb;list-style:none}.tabs ul li{float:left;white-space:nowrap;margin-right:4px;position:relative;margin-bottom:-1px}.tabs ul li a{display:block;text-decoration:none;border:1px solid transparent;padding:2px 10px;border-radius:2px 2px 0 0;color:#8c8c8c;font-weight:bold}.tabs ul li a:hover{background:#f6f6f6}.tabs ul li.active a,.tabs ul li a:hover{border:1px solid #ccc}.tabs ul li.active a{background:#fff}.tabs ul li.active a{color:#000;border-bottom-color:#fff}.ui-autocomplete{position:absolute;cursor:default;border:1px solid #3478AA;background:#fff;box-shadow:0 2px 5px 1px rgba(0,0,0,0.5)}.ui-menu{list-style:none;padding:0px;margin:0;display:block;float:left}.ui-menu .ui-menu{margin-top:-3px}.ui-menu .ui-menu-item{margin:0;padding:0;float:left;clear:left;width:100%}.ui-menu .ui-menu-item a{text-decoration:none;display:block;padding:4px;line-height:1;color:#000}.ui-menu .ui-menu-item a.ui-state-focus,.ui-menu .ui-menu-item a.ui-state-active{background:#eee}.ui-helper-hidden-accessible{display:none}.ui-datepicker{position:absolute;border:1px solid #3478AA;background:#fff;box-shadow:0 2px 5px 1px rgba(0,0,0,0.5)}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{cursor:pointer;padding:0 0 10px 25px;background-position:center;background-repeat:no-repeat;text-indent:-9000px}.ui-datepicker .ui-datepicker-prev{float:left;margin-left:2px;background-image:url(":baseuri:assets/images/arrow_left.png")}.ui-datepicker .ui-datepicker-next{float:right;margin-right:2px;background-image:url(":baseuri:assets/images/arrow_right.png")}.ui-datepicker .ui-datepicker-title{text-align:center;color:#000}.ui-datepicker .ui-datepicker-calendar{margin:0}.ui-datepicker .ui-datepicker-calendar td{text-align:center;padding:3px}.ui-datepicker .ui-datepicker-current-day{background:#3478aa}.ui-datepicker .ui-datepicker-current-day a{color:#fff}/*!
+ */hr{margin-bottom:0}p{margin-bottom:10px}p:last-child{margin-bottom:0}h2{margin-bottom:0}h3{margin-bottom:5px}#header{color:#fff;padding:10px}#header h1{display:inline-block;color:#fff;margin:0}#header h1 a{color:#fff;text-decoration:none}#header #project_switcher_btn{display:none;position:absolute;margin-top:14px;margin-left:5px;height:10px;width:10px}#header #project_switcher_btn .arrow{display:inline-block;background:#fff;padding:5px;border-radius:4px}#header #project_switcher_btn .arrow em{display:block;border-left:3px solid rgba(0,0,0,0);border-right:3px solid rgba(0,0,0,0);border-top:5px solid #3478aa}#header .project_switcher{margin-top:12px;margin-left:2px}#search{float:right}.box,.inline_box{background:#f6f6f6;border:1px solid #e4e4e4;padding:5px;margin-bottom:0}.box .box_title,.inline_box .box_title{margin-top:5px;margin-bottom:0}.tabular.section.box{margin-bottom:10px}.tabular.section.box:last-child{margin-bottom:0}.page_actions{float:right}.pagination .prev_link{float:left}.pagination .next_link{float:right}#footer{color:#000;padding:5px}code{background-color:#f8f8f8;border:1px solid #ccc;border-radius:3px;padding:2px}pre{background-color:#f8f8f8;border:1px solid #ccc;border-radius:3px;padding:2px;white-space:pre-wrap}pre code{background-color:rgba(0,0,0,0);border:0;border-radius:0;padding:0}.permissions.list .permission_section{background:#265f98;color:#fff}.permissions.list .permission_section:nth-child(even) td{background:inherit}.usercp.content #options,.usercp.content #info{padding:5px;width:48%}.usercp.content #info{float:left}.usercp.content #options{float:right}.changelog.content #changeset{margin-top:10px}.changelog.content #changeset ul{list-style:none;padding-left:5px}.changelog.content #changeset ul li:before{margin-right:8px;width:5px;text-align:center;display:inline-block}#nav{height:20px;padding:0 5px}#nav ul{margin:0;padding:0;list-style:none}#nav li{display:inline}#nav a{color:#fff;padding:4px 10px;text-decoration:none}#nav a:hover,#nav a:focus,#nav a:active,#nav li.active a{background:#fff;color:#000}h3.list_title{font-size:15px}.list_title{margin-bottom:0}.list th.fixed_username,.list th.fixed_name{width:200px}.list th.actions,.list th.fixed_repo_slug{width:140px}table.list{margin:0}thead th{background:#3478aa;color:#fff}thead th a{color:#fff}thead th:hover,thead th a:hover{color:#fff}.tabs{height:24px;position:relative;overflow:hidden}.tabs ul{margin:0;position:absolute;padding-left:10px;width:2000px;border-bottom:1px solid #bbb;list-style:none}.tabs ul li{float:left;white-space:nowrap;margin-right:4px;position:relative;margin-bottom:-1px}.tabs ul li a{display:block;text-decoration:none;border:1px solid rgba(0,0,0,0);padding:2px 10px;border-radius:2px 2px 0 0;color:#8c8c8c;font-weight:bold}.tabs ul li a:hover{background:#f6f6f6}.tabs ul li.active a,.tabs ul li a:hover{border:1px solid #ccc}.tabs ul li.active a{background:#fff}.tabs ul li.active a{color:#000;border-bottom-color:#fff}.ui-autocomplete{position:absolute;cursor:default;border:1px solid #3478aa;background:#fff;box-shadow:0 2px 5px 1px rgba(0,0,0,.5)}.ui-menu{list-style:none;padding:0px;margin:0;display:block;float:left}.ui-menu .ui-menu{margin-top:-3px}.ui-menu .ui-menu-item{margin:0;padding:0;float:left;clear:left;width:100%}.ui-menu .ui-menu-item a{text-decoration:none;display:block;padding:4px;line-height:1;color:#000}.ui-menu .ui-menu-item a.ui-state-focus,.ui-menu .ui-menu-item a.ui-state-active{background:#eee}.ui-helper-hidden-accessible{display:none}.ui-datepicker{position:absolute;border:1px solid #3478aa;background:#fff;box-shadow:0 2px 5px 1px rgba(0,0,0,.5)}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{cursor:pointer;padding:0 0 10px 25px;background-position:center;background-repeat:no-repeat;text-indent:-9000px}.ui-datepicker .ui-datepicker-prev{float:left;margin-left:2px;background-image:url(":baseuri:assets/images/arrow_left.png")}.ui-datepicker .ui-datepicker-next{float:right;margin-right:2px;background-image:url(":baseuri:assets/images/arrow_right.png")}.ui-datepicker .ui-datepicker-title{text-align:center;color:#000}.ui-datepicker .ui-datepicker-calendar{margin:0}.ui-datepicker .ui-datepicker-calendar td{text-align:center;padding:3px}.ui-datepicker .ui-datepicker-current-day{background:#3478aa}.ui-datepicker .ui-datepicker-current-day a{color:#fff}/*!
  * Like a Boss
  * Copyright (c) 2012 Jack P.
  * All Rights Reserved
@@ -30,9 +30,9 @@
  * Copyright (c) 2012 Jack P.
  * All Rights Reserved
  * https://github.com/nirix
- */.popover{display:none;position:absolute;border-radius:4px;box-shadow:0 0 5px #444;z-index:2100;background:#fff;color:#000;padding:0;margin-top:5px}.popover .popover-content{padding:4px}.popover .popover-footer{background:#f4f4f4;padding:2px;text-align:center;border-radius:0 0 4px 4px}.popover ul,.popover ol{margin-bottom:0}.popover:before,.popover:after{bottom:100%;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}.popover:before{border-bottom-color:#444;opacity:0.3;border-width:6px;left:50%;margin-left:-6px}.popover:after{border-bottom-color:#fff;border-width:5px;left:50%;margin-left:-5px}#overlay{display:none;position:fixed;border-radius:4px;box-shadow:0 0 5px #444;z-index:2100;background:#fff;color:#000;padding:0}#overlay .content{padding:10px}#overlay h3{background:#3478AA;color:#fff;padding:4px 6px;border-radius:3px 3px 0 0;margin:0}#overlay .box{border:0;background:transparent;margin:0 5px}/*!
+ */.popover{display:none;position:absolute;border-radius:4px;box-shadow:0 0 5px #444;z-index:2100;background:#fff;color:#000;padding:0;margin-top:5px}.popover .popover-content{padding:4px}.popover .popover-footer{background:#f4f4f4;padding:2px;text-align:center;border-radius:0 0 4px 4px}.popover ul,.popover ol{margin-bottom:0}.popover:before,.popover:after{bottom:100%;border:solid rgba(0,0,0,0);content:" ";height:0;width:0;position:absolute;pointer-events:none}.popover:before{border-bottom-color:#444;opacity:.3;border-width:6px;left:50%;margin-left:-6px}.popover:after{border-bottom-color:#fff;border-width:5px;left:50%;margin-left:-5px}#overlay{display:none;position:fixed;border-radius:4px;box-shadow:0 0 5px #444;z-index:2100;background:#fff;color:#000;padding:0}#overlay .content{padding:10px}#overlay h3{background:#3478aa;color:#fff;padding:4px 6px;border-radius:3px 3px 0 0;margin:0}#overlay .box{border:0;background:rgba(0,0,0,0);margin:0 5px}/*!
  * SexyTooltips
  * Copyright (c) 2012 Jack P.
  * All Rights Reserved
  * https://github.com/nirix
- */#sexytooltip{display:none;position:absolute;border-radius:4px;z-index:2100;background:rgba(0,0,0,0.7);color:#fff;padding:4px;font-size:11px;max-width:300px}#sexytooltip code{background:#555;border-color:#a3a3a3}#sexytooltip.sexytooltip-right:before,#sexytooltip.sexytooltip-right:after{right:100%;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}#sexytooltip.sexytooltip-right:before{border-right-color:rgba(0,0,0,0.7);border-width:6px;top:50%;margin-top:-6px}#sexytooltip.sexytooltip-top:before,#sexytooltip.sexytooltip-top:after{top:100%;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}#sexytooltip.sexytooltip-top:before{border-top-color:rgba(0,0,0,0.7);border-width:6px;left:10px;margin-left:-6px}.admin.content h3{margin-bottom:0;line-height:1}.admin.content dl{margin:0}.admin.content dl:after{display:table;content:"";line-height:0;clear:both}.admin.content dl dt{float:left;clear:both}.admin.content dl dd{float:right}.admin.content #update{text-align:center}#traq_news{width:100%;margin-top:10px}#traq_news ul{margin:0;padding:0;list-style:none}#traq_news ul h4{margin:0;font-weight:bold;font-size:16px;display:inline-block;margin-right:10px}#traq_news .secure_alert{display:none}.button_new,.button_edit,.button_delete,.button_move,.btn_plugin_enable,.btn_plugin_disable,.btn_plugin_install,.btn_plugin_uninstall,.button_bug_new,.button_previous,.button_revisions{padding:1px 0 1px 20px;background-position:left center;background-repeat:no-repeat}.button_new.small,.button_edit.small,.button_delete.small,.button_move.small,.btn_plugin_enable.small,.btn_plugin_disable.small,.btn_plugin_install.small,.btn_plugin_uninstall.small,.button_bug_new.small,.button_previous.small,.button_revisions.small{background-position:center;padding:0;height:18px;width:18px;text-indent:-5000px;display:inline-block;margin:0}.button_next{padding:1px 20px 1px 0;background-position:right center;background-repeat:no-repeat}.button_new{background-image:url(":baseuri:assets/images/add.png")}.button_edit{background-image:url(":baseuri:assets/images/pencil.png")}.button_delete{background-image:url(":baseuri:assets/images/delete.png")}.btn_plugin_enable{background-image:url(":baseuri:assets/images/plug-connect.png")}.btn_plugin_disable{background-image:url(":baseuri:assets/images/plug-disconnect.png")}.btn_plugin_install{background-image:url(":baseuri:assets/images/plug-plus.png")}.btn_plugin_uninstall{background-image:url(":baseuri:assets/images/plug-minus.png")}.button_bug_new{background-image:url(":baseuri:assets/images/bug_add.png")}.button_move{background-image:url(":baseuri:assets/images/arrow_left.png")}.button_next{background-image:url(":baseuri:assets/images/arrow_right.png")}.button_previous{background-image:url(":baseuri:assets/images/arrow_left.png")}.button_revisions{background-image:url(":baseuri:assets/images/page_white_stack.png")}button.button_new,button.button_delete,.icon_only.button_new,.icon_only.button_delete{border:0;text-indent:-5000px;background-color:transparent;cursor:pointer}.icon_only span{display:none}.tabular .group{margin:0;padding:5px 0;padding-left:150px;clear:left}.tabular .group label:first-child{font-weight:bold;float:left;margin-left:-145px;text-align:right;width:135px}.tabular input{margin-top:0px;vertical-align:middle}.tabular select{margin-top:0}.usercp.content fieldset .tabular .group{padding-left:200px}.usercp.content fieldset .tabular .group label:first-child{margin-left:-200px;width:195px}form.horizontal .group{width:auto;padding:0 4px;display:table-cell;padding-right:15px}form.horizontal label{margin-right:5px}.error ul,.success ul,.notice ul,.info ul{margin-bottom:0}form .actions{text-align:center;padding:4px 0}form abbr{border-radius:15px;background:#d5edf8;color:#205791;border:1px solid #92cae4;padding:0 5px;cursor:help}form abbr.hint{background:transparent;border:0;border-bottom:1px dotted #666;padding:0;margin-left:4px;border-radius:0}form select{margin-top:0}form textarea{height:150px;width:98%}#register_form .box{margin-bottom:10px}input[type=text],input[type=password],input[type=email],input[type=url],textarea{padding:2px;font-size:12px}input[type=text]:focus,input[type=password]:focus,input[type=email]:focus,input[type=url]:focus,textarea:focus{border-color:#3478AA}input[type=text].error,input[type=password].error,input[type=email].error,input[type=url].error,textarea.error{color:#8a1f11;border:1px solid red;background-color:#fff;padding:2px}input[type=text],input[type=password],input[type=email],input[type=url]{width:200px}.overlay_thin input[type=text],.overlay_thin input[type=password],.overlay_thin input[type=email],.overlay_thin input[type=url]{width:120px}.tabular .summary input{width:300px}.tabular .properties .field{float:left;width:335px;min-height:27px}.tabular .properties .field button{margin:0;margin-bottom:0.5em}#overlay form{margin:0;width:600px}#overlay form textarea{width:95%}#overlay form.overlay_thin{width:100%;min-width:300px}#overlay form .actions,#overlay .overlay-actions{text-align:center;padding:4px 0;background-color:#f6f6f6;border-radius:0 0 4px 4px}#overlay #ticket_tasks_manager{padding:10px}#ticket_tasks_data{display:none}.popover_confirm{padding:5px;text-align:center}.progress_bar{width:400px;border:1px solid #d7d7d7;float:left;margin:2px 0;margin-right:5px}.progress_bar td{padding:0}.progress_bar .closed{background:#bae0ba}.progress_bar .open a,.progress_bar .closed a{display:block;padding:6px 0}.progress{margin-bottom:5px}.progress .percent_complete{margin:0 5px;font-size:12px;display:block}.progress .progress_info{font-style:italic}.progress .progress_info a{margin-right:5px;color:#aaa;text-decoration:none}.progress .progress_info a:hover{text-decoration:underline}.profile.content .span-16{width:665px}.profile.content .sidebar .box{margin-bottom:5px}.profile.content .sidebar .box:last-child{margin-bottom:0}.profile.content .sidebar .information dl{margin:0}.profile.content .sidebar .information dl dt{min-width:100px;text-align:right;margin:0;margin-right:2px;display:inline-block}.profile.content .sidebar .information dl dd{width:auto;min-width:50px;margin:0;display:inline-block}.profile.content #assigned_to table.list th.project{width:90px}.profile.content #assigned_to table.list th.owner{width:85px}.profile.content #assigned_to table.list th.status{width:75px}.profile.content #assigned_to table.list th.created,.profile.content #assigned_to table.list th.updated{width:90px}#project_list{margin:0;padding:0;list-style:none}#project_list li h3{margin:0;margin-top:10px}#project_list li h3 em{font-size:14px}#project_list li nav ul{list-style:none;padding:0;margin:0}#project_list li nav ul li{display:inline;margin-right:4px}.project_info{margin-top:10px}#project_wiki_nav{padding-top:5px}.roadmap #milestones{margin:0;padding:0;list-style:none;margin-top:15px}.roadmap #milestones li.milestone{margin-top:15px}.roadmap #milestones li.milestone:first-child{margin-top:0px}.roadmap #milestones li.milestone p{margin-bottom:5px}.roadmap #milestones h3{font-weight:bold}.roadmap #milestones h3 a{text-decoration:none}#ticket_filters,#ticket_columns{padding:0;margin:0}#ticket_filters legend,#ticket_columns legend{color:#999;margin:0 5px;padding:0 2px}#ticket_filters table,#ticket_columns table{margin:0}#ticket_filters table td,#ticket_columns table td{vertical-align:top}#ticket_filters table td.label,#ticket_columns table td.label{font-weight:bold;text-align:right;width:100px}#ticket_filters table td.condition,#ticket_columns table td.condition{width:120px}#ticket_filters table td.value .multiselect,#ticket_columns table td.value .multiselect{width:200px}#ticket_filters table td.ticket_filter_action,#ticket_columns table td.ticket_filter_action{text-align:right}#ticket_filters table #ticket_filter_actions,#ticket_columns table #ticket_filter_actions{text-align:right}#ticket_columns{margin-top:10px}#ticket_columns_content{padding:10px;display:none}#ticket_columns_content .actions{text-align:left;padding-top:5px;padding-bottom:0}#ticket_info{background:#ffffdd;border-bottom:2px solid #dddd99;padding:5px}#ticket_info .ticket_actions{float:right}#ticket_info .properties .property{width:227px;margin-right:10px;float:left;border-bottom:1px solid #dd9}#ticket_info .properties .property label{color:#663}#ticket_info .properties .property div.value,#ticket_info .properties .property span.value,#ticket_info .properties .property ul.value{float:right}#ticket_info .properties .property:nth-child(4n){margin-right:0px}#ticket_info .properties .property ul{display:inline-block;margin:0;padding:0;list-style-type:none}#ticket_info .properties .property ul li{display:inline}#ticket_info #description h3,#ticket_info #attachments h3,#ticket_info #tasks h3{margin-top:5px;display:block;font-weight:bold;color:#663;border-bottom:1px solid #dd9;padding-bottom:2px}#ticket_info #attachments ul,#ticket_info #tasks ul{margin:0}#ticket_info #tasks ul{list-style:none;padding:0}#ticket_info #tasks label{font-weight:normal}#ticket_summary{margin:0;font-size:20px}#ticket_info h3{border-bottom:1px solid #dddd99;color:#666633;margin:0;margin-bottom:5px;font-size:100%;font-weight:normal}#ticket_history{border-bottom:1px solid #3478AA;margin-bottom:5px}#ticket_history h3{margin-top:5px;padding:10px;padding-bottom:0}#ticket_history .update h4{background:#3478AA;color:#fff;padding:4px 15px;margin:0;margin-top:10px;margin-bottom:10px;font-weight:bold}#ticket_history .update h4 a{color:#fff}#ticket_history .update .changes{margin:4px 0px 4px 15px}#ticket_history .update .comment{padding:0 10px 0px 15px}#ticket_history .update .comment p:last-child{margin-bottom:0}#ticket_history .update:first-child h4{margin-top:0}#ticket_history .update:last-child{padding-bottom:10px}#ticket_history .ticket_history_to,#ticket_history .ticket_history_from{font-family:Courier, "Courier New", monospace;background:#F6F6F6;border:1px solid #e4e4e4;padding:0 2px}.attachment_filename{font-family:Courier, "Courier New", monospace}#popover .voters{list-style:none;padding-left:5px}#voters_list{width:500px;max-height:300px;overflow:scroll;padding:5px;margin:5px}#voters_list li{display:inline}table.ticket_listing th.mass_actions{width:18px}table.ticket_listing tr.priority_1 td{background-color:#fdc}table.ticket_listing tr.priority_1:nth-child(even) td{background-color:#fed}table.ticket_listing tr.priority_2 td{background-color:#ffb}table.ticket_listing tr.priority_2:nth-child(even) td{background-color:#ffd}table.ticket_listing tr.priority_3 td{background-color:#d9f9f9}table.ticket_listing tr.priority_3:nth-child(even) td{background-color:#dff}table.ticket_listing tr.priority_4 td{background-color:#e7eeff}table.ticket_listing tr.priority_4:nth-child(even) td{background-color:#dde7ff}table.ticket_listing tr.priority_5 td{background-color:#fbfbfb}table.ticket_listing tr.priority_5:nth-child(even) td{background-color:#f6f6f6}table.ticket_listing tr:hover td,table.ticket_listing tr:hover:nth-child(even) td{background:#fff}#mass_actions{display:none}.sort_indicator{float:right;position:relative;top:7px;left:-2px}.sort_indicator.asc,.sort_indicator.desc{position:relative;background:#ffffff}.sort_indicator.asc:after,.sort_indicator.desc:after{border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none;border-color:rgba(255,255,255,0);border-width:5px;left:50%;margin-left:-5px}.sort_indicator.asc{top:12px}.sort_indicator.asc:after{bottom:100%;border-bottom-color:#ffffff}.sort_indicator.desc:after{top:100%;border-top-color:#ffffff}.timeline.content h3{margin-top:15px}.timeline.content dl dt{font-weight:normal}.timeline.content dl dt .time{color:#777}.timeline.content .timeline_filters{width:180px;float:right}.timeline.content fieldset{padding:5px 10px;padding-bottom:0}.timeline.content fieldset .actions{margin-top:5px}.wiki.content #page_title{margin-bottom:10px}.wiki.content #head{height:28px;margin-bottom:10px}.wiki.content #head h2{float:left;margin-bottom:0}.wiki.content #head #wiki_actions{float:right;list-style:none;margin:0;padding:0}.wiki.content #head #wiki_actions li{margin-left:5px;display:inline}.wiki.content #head #wiki_actions a{font-weight:bold}.wiki.content ul#pages li a{text-decoration:none;font-size:14px;font-weight:bold}
+ */#sexytooltip{display:none;position:absolute;border-radius:4px;z-index:2100;background:rgba(0,0,0,.7);color:#fff;padding:4px;font-size:11px;max-width:300px}#sexytooltip code{background:#555;border-color:#a3a3a3}#sexytooltip.sexytooltip-right:before,#sexytooltip.sexytooltip-right:after{right:100%;border:solid rgba(0,0,0,0);content:" ";height:0;width:0;position:absolute;pointer-events:none}#sexytooltip.sexytooltip-right:before{border-right-color:rgba(0,0,0,.7);border-width:6px;top:50%;margin-top:-6px}#sexytooltip.sexytooltip-top:before,#sexytooltip.sexytooltip-top:after{top:100%;border:solid rgba(0,0,0,0);content:" ";height:0;width:0;position:absolute;pointer-events:none}#sexytooltip.sexytooltip-top:before{border-top-color:rgba(0,0,0,.7);border-width:6px;left:10px;margin-left:-6px}.admin.content h3{margin-bottom:0;line-height:1}.admin.content dl{margin:0}.admin.content dl:after{display:table;content:"";line-height:0;clear:both}.admin.content dl dt{float:left;clear:both}.admin.content dl dd{float:right}.admin.content #update{text-align:center}#traq_news{width:100%;margin-top:10px}#traq_news ul{margin:0;padding:0;list-style:none}#traq_news ul h4{margin:0;font-weight:bold;font-size:16px;display:inline-block;margin-right:10px}#traq_news .secure_alert{display:none}.button_new,.button_edit,.button_delete,.button_move,.btn_plugin_enable,.btn_plugin_disable,.btn_plugin_install,.btn_plugin_uninstall,.button_bug_new,.button_previous,.button_revisions{padding:1px 0 1px 20px;background-position:left center;background-repeat:no-repeat}.button_new.small,.button_edit.small,.button_delete.small,.button_move.small,.btn_plugin_enable.small,.btn_plugin_disable.small,.btn_plugin_install.small,.btn_plugin_uninstall.small,.button_bug_new.small,.button_previous.small,.button_revisions.small{background-position:center;padding:0;height:18px;width:18px;text-indent:-5000px;display:inline-block;margin:0}.button_next{padding:1px 20px 1px 0;background-position:right center;background-repeat:no-repeat}.button_new{background-image:url(":baseuri:assets/images/add.png")}.button_edit{background-image:url(":baseuri:assets/images/pencil.png")}.button_delete{background-image:url(":baseuri:assets/images/delete.png")}.btn_plugin_enable{background-image:url(":baseuri:assets/images/plug-connect.png")}.btn_plugin_disable{background-image:url(":baseuri:assets/images/plug-disconnect.png")}.btn_plugin_install{background-image:url(":baseuri:assets/images/plug-plus.png")}.btn_plugin_uninstall{background-image:url(":baseuri:assets/images/plug-minus.png")}.button_bug_new{background-image:url(":baseuri:assets/images/bug_add.png")}.button_move{background-image:url(":baseuri:assets/images/arrow_left.png")}.button_next{background-image:url(":baseuri:assets/images/arrow_right.png")}.button_previous{background-image:url(":baseuri:assets/images/arrow_left.png")}.button_revisions{background-image:url(":baseuri:assets/images/page_white_stack.png")}button.button_new,button.button_delete,.icon_only.button_new,.icon_only.button_delete{border:0;text-indent:-5000px;background-color:rgba(0,0,0,0);cursor:pointer}.icon_only span{display:none}.tabular .group{margin:0;padding:5px 0;padding-left:150px;clear:left}.tabular .group label:first-child{font-weight:bold;float:left;margin-left:-145px;text-align:right;width:135px}.tabular input{margin-top:0px;vertical-align:middle}.tabular select{margin-top:0}.usercp.content fieldset .tabular .group{padding-left:200px}.usercp.content fieldset .tabular .group label:first-child{margin-left:-200px;width:195px}form.horizontal .group{width:auto;padding:0 4px;display:table-cell;padding-right:15px}form.horizontal label{margin-right:5px}.error ul,.success ul,.notice ul,.info ul{margin-bottom:0}form .actions{text-align:center;padding:4px 0}form abbr{border-radius:15px;background:#d5edf8;color:#205791;border:1px solid #92cae4;padding:0 5px;cursor:help}form abbr.hint{background:rgba(0,0,0,0);border:0;border-bottom:1px dotted #666;padding:0;margin-left:4px;border-radius:0}form select{margin-top:0}form textarea{height:150px;width:98%}#register_form .box{margin-bottom:10px}input[type=text],input[type=password],input[type=email],input[type=url],textarea{padding:2px;font-size:12px}input[type=text]:focus,input[type=password]:focus,input[type=email]:focus,input[type=url]:focus,textarea:focus{border-color:#3478aa}input[type=text].error,input[type=password].error,input[type=email].error,input[type=url].error,textarea.error{color:#8a1f11;border:1px solid red;background-color:#fff;padding:2px}input[type=text],input[type=password],input[type=email],input[type=url]{width:200px}.overlay_thin input[type=text],.overlay_thin input[type=password],.overlay_thin input[type=email],.overlay_thin input[type=url]{width:120px}.tabular .summary input{width:300px}.tabular .properties .field{float:left;width:335px;min-height:27px}.tabular .properties .field button{margin:0;margin-bottom:.5em}#overlay form{margin:0;width:600px}#overlay form textarea{width:95%}#overlay form.overlay_thin{width:100%;min-width:300px}#overlay form .actions,#overlay .overlay-actions{text-align:center;padding:4px 0;background-color:#f6f6f6;border-radius:0 0 4px 4px}#overlay #ticket_tasks_manager{padding:10px}#ticket_tasks_data{display:none}.popover_confirm{padding:5px;text-align:center}.progress_bar{width:400px;border:1px solid #d7d7d7;float:left;margin:2px 0;margin-right:5px}.progress_bar td{padding:0}.progress_bar .closed{background:#bae0ba}.progress_bar .open a,.progress_bar .closed a{display:block;padding:6px 0}.progress{margin-bottom:5px}.progress .percent_complete{margin:0 5px;font-size:12px;display:block}.progress .progress_info{font-style:italic}.progress .progress_info a{margin-right:5px;color:#aaa;text-decoration:none}.progress .progress_info a:hover{text-decoration:underline}.profile.content .span-16{width:665px}.profile.content .sidebar .box{margin-bottom:5px}.profile.content .sidebar .box:last-child{margin-bottom:0}.profile.content .sidebar .information dl{margin:0}.profile.content .sidebar .information dl dt{min-width:100px;text-align:right;margin:0;margin-right:2px;display:inline-block}.profile.content .sidebar .information dl dd{width:auto;min-width:50px;margin:0;display:inline-block}.profile.content #assigned_to table.list th.project{width:90px}.profile.content #assigned_to table.list th.owner{width:85px}.profile.content #assigned_to table.list th.status{width:75px}.profile.content #assigned_to table.list th.created,.profile.content #assigned_to table.list th.updated{width:90px}#project_list{margin:0;padding:0;list-style:none}#project_list li h3{margin:0;margin-top:10px}#project_list li h3 em{font-size:14px}#project_list li nav ul{list-style:none;padding:0;margin:0}#project_list li nav ul li{display:inline;margin-right:4px}.project_info{margin-top:10px}#project_wiki_nav{padding-top:5px}.roadmap #milestones{margin:0;padding:0;list-style:none;margin-top:15px}.roadmap #milestones li.milestone{margin-top:15px}.roadmap #milestones li.milestone:first-child{margin-top:0px}.roadmap #milestones li.milestone p{margin-bottom:5px}.roadmap #milestones h3{font-weight:bold}.roadmap #milestones h3 a{text-decoration:none}#ticket_filters,#ticket_columns{padding:0;margin:0}#ticket_filters legend,#ticket_columns legend{color:#999;margin:0 5px;padding:0 2px}#ticket_filters table,#ticket_columns table{margin:0}#ticket_filters table td,#ticket_columns table td{vertical-align:top}#ticket_filters table td.label,#ticket_columns table td.label{font-weight:bold;text-align:right;width:100px}#ticket_filters table td.condition,#ticket_columns table td.condition{width:120px}#ticket_filters table td.value .multiselect,#ticket_columns table td.value .multiselect{width:200px}#ticket_filters table td.ticket_filter_action,#ticket_columns table td.ticket_filter_action{text-align:right}#ticket_filters table #ticket_filter_actions,#ticket_columns table #ticket_filter_actions{text-align:right}#ticket_columns{margin-top:10px}#ticket_columns_content{padding:10px;display:none}#ticket_columns_content .actions{text-align:left;padding-top:5px;padding-bottom:0}#ticket_info{background:#ffd;border-bottom:2px solid #dd9;padding:5px}#ticket_info .ticket_actions{float:right}#ticket_info .properties .property{width:227px;margin-right:10px;float:left;border-bottom:1px solid #dd9}#ticket_info .properties .property label{color:#663}#ticket_info .properties .property div.value,#ticket_info .properties .property span.value,#ticket_info .properties .property ul.value{float:right}#ticket_info .properties .property:nth-child(4n){margin-right:0px}#ticket_info .properties .property ul{display:inline-block;margin:0;padding:0;list-style-type:none}#ticket_info .properties .property ul li{display:inline}#ticket_info #description h3,#ticket_info #attachments h3,#ticket_info #tasks h3{margin-top:5px;display:block;font-weight:bold;color:#663;border-bottom:1px solid #dd9;padding-bottom:2px}#ticket_info #attachments ul,#ticket_info #tasks ul{margin:0}#ticket_info #tasks ul{list-style:none;padding:0}#ticket_info #tasks label{font-weight:normal}#ticket_summary{margin:0;font-size:20px}#ticket_info h3{border-bottom:1px solid #dd9;color:#663;margin:0;margin-bottom:5px;font-size:100%;font-weight:normal}#ticket_history{border-bottom:1px solid #3478aa;margin-bottom:5px}#ticket_history h3{margin-top:5px;padding:10px;padding-bottom:0}#ticket_history .update h4{background:#3478aa;color:#fff;padding:4px 15px;margin:0;margin-top:10px;margin-bottom:10px;font-weight:bold}#ticket_history .update h4 a{color:#fff}#ticket_history .update .changes{margin:4px 0px 4px 15px}#ticket_history .update .comment{padding:0 10px 0px 15px}#ticket_history .update .comment p:last-child{margin-bottom:0}#ticket_history .update:first-child h4{margin-top:0}#ticket_history .update:last-child{padding-bottom:10px}#ticket_history .ticket_history_to,#ticket_history .ticket_history_from{font-family:Courier,"Courier New",monospace;background:#f6f6f6;border:1px solid #e4e4e4;padding:0 2px}.attachment_filename{font-family:Courier,"Courier New",monospace}#popover .voters{list-style:none;padding-left:5px}#voters_list{width:500px;max-height:300px;overflow:scroll;padding:5px;margin:5px}#voters_list li{display:inline}table.ticket_listing th.mass_actions{width:18px}#mass_actions{display:none}.sort_indicator{float:right;position:relative;top:7px;left:-2px}.sort_indicator.asc,.sort_indicator.desc{position:relative;background:#fff}.sort_indicator.asc:after,.sort_indicator.desc:after{border:solid rgba(0,0,0,0);content:" ";height:0;width:0;position:absolute;pointer-events:none;border-color:rgba(255,255,255,0);border-width:5px;left:50%;margin-left:-5px}.sort_indicator.asc{top:12px}.sort_indicator.asc:after{bottom:100%;border-bottom-color:#fff}.sort_indicator.desc:after{top:100%;border-top-color:#fff}.timeline.content h3{margin-top:15px}.timeline.content dl dt{font-weight:normal}.timeline.content dl dt .time{color:#777}.timeline.content .timeline_filters{width:180px;float:right}.timeline.content fieldset{padding:5px 10px;padding-bottom:0}.timeline.content fieldset .actions{margin-top:5px}.wiki.content #page_title{margin-bottom:10px}.wiki.content #head{height:28px;margin-bottom:10px}.wiki.content #head h2{float:left;margin-bottom:0}.wiki.content #head #wiki_actions{float:right;list-style:none;margin:0;padding:0}.wiki.content #head #wiki_actions li{margin-left:5px;display:inline}.wiki.content #head #wiki_actions a{font-weight:bold}.wiki.content ul#pages li a{text-decoration:none;font-size:14px;font-weight:bold}/*# sourceMappingURL=default.css.map */
diff --git a/vendor/traq/views/default/css/default.css.map b/vendor/traq/views/default/css/default.css.map
new file mode 100644
index 000000000..dc0897e47
--- /dev/null
+++ b/vendor/traq/views/default/css/default.css.map
@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["../../../../../_dev/css/default.scss","../../../../../_dev/css/_nav.scss","../../../../../_dev/css/_tables.scss","../../../../../_dev/css/_tabs.scss","../../../../../_dev/css/_jquery.scss","../../../../../_dev/css/_likeaboss.scss","../../../../../_dev/css/_popover.scss","../../../../../_dev/css/_overlay.scss","../../../../../_dev/css/_sexytooltips.scss","../../../../../_dev/css/_admin.scss","../../../../../_dev/css/_buttons.scss","../../../../../_dev/css/_forms.scss","../../../../../_dev/css/_milestones.scss","../../../../../_dev/css/_profiles.scss","../../../../../_dev/css/_projects.scss","../../../../../_dev/css/_roadmap.scss","../../../../../_dev/css/_ticket_filters.scss","../../../../../_dev/css/_tickets.scss","../../../../../_dev/css/_timeline.scss","../../../../../_dev/css/_wiki.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAwBA,GACI,gBAGJ,EACI,mBAEA,aACI,gBAMR,GACI,gBAGJ,GACI,kBAMJ,QAEI,WACA,aAEA,WACI,qBACA,WACA,SAEA,aACI,WACA,qBAIR,8BACI,aACA,kBACA,gBACA,gBACA,YACA,WAEA,qCACI,qBACA,gBACA,YACA,kBAEA,wCACI,cACA,oCACA,qCACA,6BAKZ,0BACI,gBACA,gBAIR,QACI,YAKJ,iBAEI,mBACA,yBACA,YACA,gBAEA,uCACI,eACA,gBAIR,qBACI,mBAEA,gCACI,gBAIR,cACI,YAIA,uBACI,WAGJ,uBACI,YAMR,QACI,WACA,YAKJ,KACI,yBACA,sBACA,kBACA,YAGJ,IACI,yBACA,sBACA,kBACA,YACA,qBAEA,SACI,+BACA,SACA,gBACA,UAOJ,sCACI,mBACA,WAEA,yDACI,mBAQR,+CACI,YACA,UAGJ,sBACI,WAGJ,yBACI,YAOJ,8BACI,gBAEA,iCACI,gBACA,iBAGI,2CACI,iBACA,UACA,kBACA,qBCjNpB,KAGI,YACA,cAEA,QACI,SACA,UACA,gBAGJ,QACI,eAGJ,OACI,WACA,iBACA,qBAGJ,yDACI,gBACA,WCxBR,cACI,eAGJ,YACI,gBAKI,4CACI,YAGJ,0CACI,YAKZ,WACI,SAGJ,SACI,mBACA,WAEA,WACI,WAGJ,gCACI,WCjCR,MACI,YACA,kBACA,gBAEA,SACI,SACA,kBACA,kBACA,aACA,6BACA,gBAEA,YACI,WACA,mBACA,iBACA,kBACA,mBAEA,cACI,cACA,qBACA,+BACA,iBACA,0BACA,cACA,iBAEA,oBACI,mBAIR,yCACI,sBAGJ,qBACI,gBAGJ,qBACI,WACA,yBC5ChB,iBACI,kBACA,eACA,yBACA,gBACA,wCAGJ,SACI,gBACA,YACA,SACA,cACA,WAEA,kBACI,gBAGJ,uBACI,SACA,UACA,WACA,WACA,WAEA,yBACI,qBACA,cACA,YACA,cACA,WAEA,iFAEI,gBAMhB,6BACI,aAGJ,eACI,kBACA,yBACA,gBACA,wCAEA,sEAEI,eACA,sBACA,2BACA,4BACA,oBAGJ,mCACI,WACA,gBACA,8DAGJ,mCACI,YACA,iBACA,+DAGJ,oCACI,kBACA,WAGJ,uCACI,SAEA,0CACI,kBACA,YAIR,0CACI,mBAEA,4CACI,WC5FZ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAUI,wCACI,YACA,mBAIA,0CACI,oBACA,cACA,WACA,YACA,WACA,sBACA,yBACA,2BACA,4BACA,gBACA,iBAEA,gDACI,yBAIR,sDACI,kEAGJ,sDACI,kEAGJ,sDACI,kEAGJ,wDACI,6DAGJ,0DACI,+DAGJ,+DACI,qEAGJ,+DACI,qEAGJ,wDACI,wDAGJ,yDACI,2DAGJ,wDACI,+DCvEZ;AAAA;AAAA;AAAA;AAAA;AAAA,GAOA,SACI,aACA,kBACA,kBACA,wBACA,aACA,gBACA,WACA,UACA,eAEA,0BACI,YAGJ,yBACI,mBACA,YACA,kBACA,0BAGJ,wBACI,gBAGJ,+BACI,YACA,2BACA,YACA,SACA,QACA,kBACA,oBAGJ,gBACI,yBACA,WACA,iBACA,SACA,iBAGJ,eACI,yBACA,iBACA,SACA,iBCvDR,SACI,aACA,eACA,kBACA,wBACA,aACA,gBACA,WACA,UAEA,kBACI,aAGJ,YACI,mBACA,WACA,gBACA,0BACA,SAGJ,cACI,SACA,yBACA,aCzBR;AAAA;AAAA;AAAA;AAAA;AAAA,GAOA,aACI,aACA,kBACA,kBACA,aACA,0BACA,WACA,YACA,eACA,gBAEA,kBACI,gBACA,qBAIA,2EACI,WACA,2BACA,YACA,SACA,QACA,kBACA,oBAGJ,sCACI,kCACA,iBACA,QACA,gBAKJ,uEACI,SACA,2BACA,YACA,SACA,QACA,kBACA,oBAGJ,oCACI,gCACA,iBACA,UACA,iBCrDJ,kBACI,gBACA,cAGJ,kBACI,SAEA,wBACI,cACA,WACA,cACA,WAGJ,qBACI,WACA,WAGJ,qBACI,YAIR,uBACI,kBAKZ,WACI,WACA,gBAEA,cACI,SACA,UACA,gBAEA,iBACI,SACA,iBACA,eACA,qBACA,kBAIR,yBACI,aCrDR,yLAII,uBACA,gCACA,4BAEA,2PACI,2BACA,UACA,YACA,WACA,oBACA,qBACA,SAIR,aACI,uBACA,iCACA,4BAGJ,YACI,uDAGJ,aACI,0DAGJ,eACI,0DAGJ,mBACI,gEAGJ,oBACI,mEAGJ,oBACI,6DAGJ,sBACI,8DAGJ,gBACI,2DAGJ,aACI,8DAGJ,aACI,+DAGJ,iBACI,8DAGJ,kBACI,oEAIA,sFAEI,SACA,oBACA,+BACA,eAKJ,gBACI,aCnFJ,gBACI,SACA,cACA,mBACA,WAEA,kCACI,iBACA,WACA,mBACA,iBACA,YAIR,eACI,eACA,sBAGJ,gBACI,aAKJ,yCACI,mBAEA,2DACI,mBACA,YAMR,uBACI,WACA,cACA,mBACA,mBAGJ,sBACI,iBAKJ,0CACI,gBAKJ,cACI,kBACA,cAGJ,UACI,mBACA,mBACA,cACA,yBACA,cACA,YAEA,eACI,yBACA,SACA,8BACA,UACA,gBACA,gBAIR,YACI,aAGJ,cACI,aACA,UAKJ,oBACI,mBAIR,iFAKI,YACA,eAEA,+GACI,qBAGJ,+GACI,cACA,qBACA,sBACA,YAIR,wEAII,YAIA,gIAII,YAMA,wBACI,YAKJ,4BACI,WACA,YACA,gBAEA,mCACI,SACA,mBAOZ,cACI,SACA,YAEA,uBACI,UAGJ,2BACI,WACA,gBAIR,iDACI,kBACA,cACA,yBACA,0BAGJ,+BACI,aAIR,mBACI,aAGJ,iBACI,YACA,kBC1LJ,cACI,YACA,yBACA,WACA,aACA,iBAEA,iBACI,UAGJ,sBACI,mBAGJ,8CACI,cACA,cAIR,UACI,kBAEA,4BACI,aACA,eACA,cAGJ,yBACI,kBAEA,2BACI,iBACA,WACA,qBAEA,iCACI,0BCtCZ,0BACI,YAIA,+BACI,kBAEA,0CACI,gBAKJ,0CACI,SAEA,6CACI,gBACA,iBACA,SACA,iBACA,qBAGJ,6CACI,WACA,eACA,SACA,qBAQR,oDACI,WAGJ,kDACI,WAGJ,mDACI,WAGJ,wGACI,WCnDhB,cACI,SACA,UACA,gBAGI,oBACI,SACA,gBAEA,uBACI,eAKJ,wBACI,gBACA,UACA,SAEA,2BACI,eACA,iBAOpB,cACI,gBAGJ,kBACI,gBClCA,qBACI,SACA,UACA,gBACA,gBAEA,kCACI,gBAEA,8CACI,eAGJ,oCACI,kBAIR,wBACI,iBAEA,0BACI,qBCvBhB,gCAEI,UACA,SAEA,8CACI,WACA,aACA,cAGJ,4CACI,SAEA,kDACI,mBAEA,8DACI,iBACA,iBACA,YAGJ,sEACI,YAIA,wFACI,YAKR,4FACI,iBAIR,0FACI,iBAKZ,gBACI,gBAGJ,wBACI,aACA,aAEA,iCACI,gBACA,gBACA,iBCxDR,aACI,gBACA,6BACA,YAEA,6BACI,YAIA,mCACI,YACA,kBACA,WACA,6BAEA,yCACI,WAGJ,uIACI,YAGJ,iDACI,iBAGJ,sCACI,qBACA,SACA,UACA,qBAEA,yCACI,eAOZ,iFACI,eACA,cACA,iBACA,WACA,6BACA,mBAKJ,oDACI,SAKJ,uBACI,gBACA,UAGJ,0BACI,mBAKZ,gBACI,SACA,eAGJ,gBACI,6BACA,WACA,SACA,kBACA,eACA,mBAGJ,gBACI,gCACA,kBAEA,mBACI,eACA,aACA,iBAIA,2BACI,mBACA,WACA,iBACA,SACA,gBACA,mBACA,iBAEA,6BACI,WAIR,iCACI,wBAGJ,iCACI,wBAEA,8CACI,gBAKJ,uCACI,aAIR,mCACI,oBAKZ,wEAEI,4CACA,mBACA,yBACA,cAGJ,qBACI,4CAGJ,iBACI,gBACA,iBAGJ,aACI,YACA,iBACA,gBACA,YACA,WAEA,gBACI,eAKJ,qCACI,WAIR,cACI,aAGJ,gBACI,YACA,kBACA,QACA,UAEA,yCACI,kBACA,gBAEA,qDACI,2BACA,YACA,SACA,QACA,kBACA,oBACA,iCACA,iBACA,SACA,iBAIR,oBACI,SAEA,0BACI,YACA,yBAKJ,2BACI,SACA,sBC/MR,qBACI,gBAIA,wBACI,mBAEA,8BACI,WAKZ,oCACI,YACA,YAGJ,2BACI,iBACA,iBAEA,oCACI,eCxBR,0BACI,mBAGJ,oBACI,YACA,mBAEA,uBACI,WACA,gBAGJ,kCACI,YACA,gBACA,SACA,UAEA,qCACI,gBACA,eAGJ,oCACI,iBAMR,4BACI,qBACA,eACA","file":"default.css"}
\ No newline at end of file
diff --git a/vendor/traq/views/default/layouts/_head.phtml b/vendor/traq/views/default/layouts/_head.phtml
index e83c8bf62..38c08c585 100644
--- a/vendor/traq/views/default/layouts/_head.phtml
+++ b/vendor/traq/views/default/layouts/_head.phtml
@@ -10,6 +10,8 @@
 		<?php echo HTML::js_inc(Request::base() . 'js.php?js=all'); ?>
 		<?php echo HTML::js_inc(Request::base('_js')); ?>
 
+		<?php echo ui_package('main'); ?>
+
 		<?php if ($project): ?>
 			<script>
 				window.traq.project_slug = <?php echo json_encode($project->slug); ?>
diff --git a/vendor/traq/views/default/layouts/_meta_nav.phtml b/vendor/traq/views/default/layouts/_meta_nav.phtml
index 12c6f62cd..f8b3064d6 100644
--- a/vendor/traq/views/default/layouts/_meta_nav.phtml
+++ b/vendor/traq/views/default/layouts/_meta_nav.phtml
@@ -1,24 +1,26 @@
 <div id="meta_nav">
-	<ul id="user_nav">
-		<?php FishHook::run('template:layouts/_meta_nav/user_nav'); ?>
-	<?php if (LOGGEDIN) { ?>
-		<li<?php echo iif(active_nav(current_user()->href()), ' class="active"')?>><?php echo HTML::link(l('profile'), current_user()->href()) ?></li>
-		<li<?php echo iif(active_nav('/usercp'), ' class="active"')?>><?php echo HTML::link(l('usercp'), '/usercp'); ?></li>
-		<li><?php echo HTML::link(l('logout'), '/logout'); ?></li>
-		<?php if ($current_user->group->is_admin) { ?>
-		<li<?php echo iif(active_nav('/admin(.*)'), ' class="active"')?>><?php echo HTML::link(l('admincp'), '/admin'); ?></li>
+	<div class="container">
+		<ul id="user_nav">
+			<?php FishHook::run('template:layouts/_meta_nav/user_nav'); ?>
+		<?php if (LOGGEDIN) { ?>
+			<li<?php echo iif(active_nav(current_user()->href()), ' class="active"')?>><?php echo HTML::link(l('profile'), current_user()->href()) ?></li>
+			<li<?php echo iif(active_nav('/usercp'), ' class="active"')?>><?php echo HTML::link(l('usercp'), '/usercp'); ?></li>
+			<li><?php echo HTML::link(l('logout'), '/logout'); ?></li>
+			<?php if ($current_user->group->is_admin) { ?>
+			<li<?php echo iif(active_nav('/admin(.*)'), ' class="active"')?>><?php echo HTML::link(l('admincp'), '/admin'); ?></li>
+			<?php } ?>
+		<?php } else { ?>
+			<li<?php echo iif(active_nav('/login'), ' class="active"')?>><?php echo HTML::link(l('login'), '/login'); ?></li>
+			<?php if (settings('allow_registration')) { ?>
+			<li<?php echo iif(active_nav('/register'), ' class="active"')?>><?php echo HTML::link(l('register'), '/register'); ?></li>
+			<?php } ?>
 		<?php } ?>
-	<?php } else { ?>
-		<li<?php echo iif(active_nav('/login'), ' class="active"')?>><?php echo HTML::link(l('login'), '/login'); ?></li>
-		<?php if (settings('allow_registration')) { ?>
-		<li<?php echo iif(active_nav('/register'), ' class="active"')?>><?php echo HTML::link(l('register'), '/register'); ?></li>
-		<?php } ?>
-	<?php } ?>
-	</ul>
-	<ul>
-		<?php if (settings('site_name') !== '') { ?>
-		<li><a href="<?php echo settings('site_url'); ?>"><?php echo settings('site_name'); ?></a></li>
-		<?php } ?>
-		<?php if (Request::seg(0)) { ?><li><?php echo HTML::link(settings('title'), '/'); ?></li><?php } ?>
-	</ul>
+		</ul>
+		<ul>
+			<?php if (settings('site_name') !== '') { ?>
+			<li><a href="<?php echo settings('site_url'); ?>"><?php echo settings('site_name'); ?></a></li>
+			<?php } ?>
+			<?php if (Request::seg(0)) { ?><li><?php echo HTML::link(settings('title'), '/'); ?></li><?php } ?>
+		</ul>
+	</div>
 </div>
diff --git a/vendor/traq/views/default/layouts/default.phtml b/vendor/traq/views/default/layouts/default.phtml
index 860d9a5c4..c07a20a87 100644
--- a/vendor/traq/views/default/layouts/default.phtml
+++ b/vendor/traq/views/default/layouts/default.phtml
@@ -8,56 +8,63 @@
 		<div id="overlay_blackout"></div>
 		<div id="overlay"></div>
 		<div id="popover" class="popover"></div>
-		<div id="wrapper" class="container">
+		<div id="wrapper">
 			<?php echo View::render('layouts/_meta_nav'); ?>
 			<header id="header">
-				<h1><?php echo (isset($project)) ? HTML::link($project->name, $project->slug) : HTML::link(settings('title'), null); ?></h1>
-				<?php echo View::render('layouts/_project_switcher'); ?>
-				<?php if (isset($project)) { ?>
-				<form onsubmit="do_search();return false;" id="search">
-					<input type="hidden" name="project_slug" value="<?php echo $project->slug; ?>" />
-					<input type="search" name="search" placeholder="<?php echo l('search'); ?>" />
-				</form>
-				<?php } ?>
+				<div class="container">
+					<h1><?php echo (isset($project)) ? HTML::link($project->name, $project->slug) : HTML::link(settings('title'), null); ?></h1>
+					<?php echo View::render('layouts/_project_switcher'); ?>
+					<?php if (isset($project)) { ?>
+					<form onsubmit="do_search();return false;" id="search">
+						<input type="hidden" name="project_slug" value="<?php echo $project->slug; ?>" />
+						<input type="search" name="search" placeholder="<?php echo l('search'); ?>" />
+					</form>
+					<?php } ?>
+				</div>
 			</header>
 			<nav id="nav">
-				<ul id="main_nav">
-				<?php if (isset($project)) { ?>
-					<li<?php echo iif(active_nav('/:slug'), ' class="active"')?>><?php echo HTML::link(l('project_info'), $project->href()); ?></li>
-					<li<?php echo iif(active_nav('/:slug/timeline'), ' class="active"')?>><?php echo HTML::link(l('timeline'), $project->href("timeline")); ?></li>
-					<li<?php echo iif(active_nav('/:slug/(roadmap|milestone)(.*)'), ' class="active"')?>><?php echo HTML::link(l('roadmap'), $project->href("roadmap")); ?></li>
-					<li<?php echo iif(active_nav('/:slug/tickets(?:/[0-9]+)?'), ' class="active"')?>><?php echo HTML::link(l('tickets'), $project->href("tickets")); ?></li>
-					<?php if($current_user->permission($project->id, 'create_tickets')) { ?>
-					<li<?php echo iif(active_nav('/:slug/tickets/new(.*)'), ' class="active"')?>><?php echo HTML::link(l('new_ticket'), $project->href('tickets/new')); ?></li>
-					<?php } ?>
-					<li<?php echo iif(active_nav('/:slug/changelog'), ' class="active"')?>><?php echo HTML::link(l('changelog'), $project->href('changelog')); ?></li>
-					<?php if ($project->enable_wiki) { ?>
-					<li<?php echo iif(active_nav('/:slug/wiki(.*)'), ' class="active"')?>><?php echo HTML::link(l('wiki'), $project->href("wiki")); ?></li>
-					<?php } ?>
-					<?php if($current_user->permission($project->id, 'project_settings')) { ?>
-					<li<?php echo iif(active_nav('/:slug/settings(.*)'), ' class="active"')?>><?php echo HTML::link(l('settings'), $project->href("settings")); ?></li>
+				<div class="container">
+					<ul id="main_nav">
+					<?php if (isset($project)) { ?>
+						<li<?php echo iif(active_nav('/:slug'), ' class="active"')?>><?php echo HTML::link(l('project_info'), $project->href()); ?></li>
+						<li<?php echo iif(active_nav('/:slug/timeline'), ' class="active"')?>><?php echo HTML::link(l('timeline'), $project->href("timeline")); ?></li>
+						<li<?php echo iif(active_nav('/:slug/(roadmap|milestone)(.*)'), ' class="active"')?>><?php echo HTML::link(l('roadmap'), $project->href("roadmap")); ?></li>
+						<li<?php echo iif(active_nav('/:slug/tickets(?:/[0-9]+)?'), ' class="active"')?>><?php echo HTML::link(l('tickets'), $project->href("tickets")); ?></li>
+						<?php if($current_user->permission($project->id, 'create_tickets')) { ?>
+						<li<?php echo iif(active_nav('/:slug/tickets/new(.*)'), ' class="active"')?>><?php echo HTML::link(l('new_ticket'), $project->href('tickets/new')); ?></li>
+						<?php } ?>
+						<li<?php echo iif(active_nav('/:slug/changelog'), ' class="active"')?>><?php echo HTML::link(l('changelog'), $project->href('changelog')); ?></li>
+						<?php if ($project->enable_wiki) { ?>
+						<li<?php echo iif(active_nav('/:slug/wiki(.*)'), ' class="active"')?>><?php echo HTML::link(l('wiki'), $project->href("wiki")); ?></li>
+						<?php } ?>
+						<?php if($current_user->permission($project->id, 'project_settings')) { ?>
+						<li<?php echo iif(active_nav('/:slug/settings(.*)'), ' class="active"')?>><?php echo HTML::link(l('settings'), $project->href("settings")); ?></li>
+						<?php } ?>
+					<?php } else { ?>
+						<li<?php echo iif(active_nav('/'), ' class="active"')?>><?php echo HTML::link(l('projects'), null); ?></li>
 					<?php } ?>
-				<?php } else { ?>
-					<li<?php echo iif(active_nav('/'), ' class="active"')?>><?php echo HTML::link(l('projects'), null); ?></li>
-				<?php } ?>
-				<?php FishHook::run('template:layouts/default/main_nav', array(isset($project) ? $project : false)); ?>
-				</ul>
+					<?php FishHook::run('template:layouts/default/main_nav', array(isset($project) ? $project : false)); ?>
+					</ul>
+				</div>
 			</nav>
 			<div id="page">
+				<div class="container">
+					<?php if (current_user()->password_ver == 'sha1') : ?>
+						<div id="password-change-prompt">
+							<div class="error" style="text-align: center;">
+								<h3><?=l('password_change_prompt')?></h3>
+								<div><?php echo HTML::link(l('change_password'), '/usercp/password')?></div>
+							</div>
+						</div>
+					<?php endif ?>
 
-				<?php if (current_user()->password_ver == 'sha1') : ?>
-				<div id="password-change-prompt">
-					<div class="error" style="text-align: center;">
-						<h3><?=l('password_change_prompt')?></h3>
-						<div><?php echo HTML::link(l('change_password'), '/usercp/password')?></div>
-					</div>
+					<?php echo $content; ?>
 				</div>
-				<?php endif ?>
-
-<?php echo $content; ?>
 			</div>
 			<footer id="footer">
-				<?php echo l('copyright', TRAQ_VER, date("Y")); ?>
+				<div class="container">
+					<?php echo l('copyright', TRAQ_VER, date("Y")); ?>
+				</div>
 			</footer>
 			<!-- <?php echo round((microtime(true) - START_TIME), 2); ?>s, <?php echo round((memory_get_peak_usage() - START_MEM) / pow(1024, 2), 3); ?>mb -->
 		</div>
diff --git a/vendor/traq/views/default/tickets/index.phtml b/vendor/traq/views/default/tickets/index.phtml
index ffb0779a2..eeab9636a 100644
--- a/vendor/traq/views/default/tickets/index.phtml
+++ b/vendor/traq/views/default/tickets/index.phtml
@@ -1,2 +1,2 @@
 <div id="ticket-listing"></div>
-<?php echo ui_package('ticket-listing'); ?>
\ No newline at end of file
+<?php echo ui_package('ticket-listing/ticket-listing'); ?>
\ No newline at end of file

From 858958263cd7613ebb21005b25a1af23aaa6b9dd Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Thu, 30 Jun 2022 01:05:31 +1000
Subject: [PATCH 05/46] Ticket listing styling

---
 traq-ui/ticket-listing/TicketListing.vue | 77 ++++++++++++++++++++----
 traq-ui/ticket-listing/ticket-listing.ts |  9 +--
 2 files changed, 70 insertions(+), 16 deletions(-)

diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
index 1cbd1ac35..6764f6270 100644
--- a/traq-ui/ticket-listing/TicketListing.vue
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -15,8 +15,7 @@ export default {
   },
   methods: {
     getTickets() {
-      let ticketsUrl =
-        window.traq.base + window.traq.project_slug + "/tickets.json"
+      let ticketsUrl = window.traq.base + window.traq.project_slug + "/tickets.json"
       if (this.sort_by) {
         ticketsUrl = `${ticketsUrl}?order_by=${this.sort_by}.${this.sort_order}`
       }
@@ -27,8 +26,7 @@ export default {
       })
     },
     sortTickets(column) {
-      this.sort_order =
-        column !== this.sort_by || this.sort_order === "desc" ? "asc" : "desc"
+      this.sort_order = column !== this.sort_by || this.sort_order === "desc" ? "asc" : "desc"
       this.sort_by = column
       this.getTickets()
     },
@@ -48,9 +46,9 @@ export default {
 <template>
   <div class="content">
     <h2 id="page_title">Tickets</h2>
-    <TicketFilters />
   </div>
-  <table id="tickets" class="ticket_listing list">
+  <TicketFilters />
+  <table id="tickets" class="ticket-listing list">
     <thead>
       <tr>
         <th>
@@ -69,11 +67,7 @@ export default {
         <th>Component</th>
         <th>Milestone</th>
       </tr>
-      <tr
-        v-for="ticket in tickets"
-        :key="ticket.id"
-        :class="'priority_' + ticket.priority.id"
-      >
+      <tr v-for="ticket in tickets" :key="ticket.id" :class="'priority-' + ticket.priority.id">
         <td>{{ ticket.id }}</td>
         <td>
           <a :href="ticketUrl(ticket.id)">
@@ -92,4 +86,63 @@ export default {
   </table>
 </template>
 
-<style></style>
+<style scoped lang="postcss">
+table.ticket-listing {
+  & tr {
+    &.priority-1 {
+      & td {
+        @apply bg-red-50;
+      }
+
+      &:nth-child(even) td {
+        @apply bg-red-100;
+      }
+    }
+
+    &.priority-2 {
+      & td {
+        @apply bg-yellow-50;
+      }
+
+      &:nth-child(even) td {
+        @apply bg-yellow-100;
+      }
+    }
+
+    &.priority-3 {
+      & td {
+        @apply bg-sky-50;
+      }
+
+      &:nth-child(even) td {
+        @apply bg-sky-100;
+      }
+    }
+
+    &.priority-4 {
+      & td {
+        @apply bg-violet-50;
+      }
+
+      &:nth-child(even) td {
+        @apply bg-violet-100;
+      }
+    }
+
+    &.priority-5 {
+      & td {
+        @apply bg-gray-50;
+      }
+
+      &:nth-child(even) td {
+        @apply bg-gray-100;
+      }
+    }
+
+    &:hover td,
+    &:hover:nth-child(even) td {
+      @apply bg-white;
+    }
+  }
+}
+</style>
diff --git a/traq-ui/ticket-listing/ticket-listing.ts b/traq-ui/ticket-listing/ticket-listing.ts
index e679d28ca..df3565746 100644
--- a/traq-ui/ticket-listing/ticket-listing.ts
+++ b/traq-ui/ticket-listing/ticket-listing.ts
@@ -1,5 +1,6 @@
-import { createApp } from "vue";
-import TicketListing from "./TicketListing.vue";
+import { createApp } from "vue"
 
-const app = createApp(TicketListing);
-app.mount("#ticket-listing");
+import TicketListing from "./TicketListing.vue"
+
+const app = createApp(TicketListing)
+app.mount("#ticket-listing")

From 6901797a1dadbfc498a55313b90a206430464a1b Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Thu, 30 Jun 2022 01:05:51 +1000
Subject: [PATCH 06/46] Progress on ticket filters

---
 traq-ui/ticket-listing/TicketFilters.vue | 179 ++++++++++++++++++++++-
 1 file changed, 173 insertions(+), 6 deletions(-)

diff --git a/traq-ui/ticket-listing/TicketFilters.vue b/traq-ui/ticket-listing/TicketFilters.vue
index f8615c0b6..a6e2236e8 100644
--- a/traq-ui/ticket-listing/TicketFilters.vue
+++ b/traq-ui/ticket-listing/TicketFilters.vue
@@ -1,10 +1,177 @@
+<script lang="ts">
+interface FilterOption {
+  field: string
+  label: string
+  type: "is" | "isOr" | "contains"
+}
+
+export default {
+  data() {
+    return {
+      isExpanded: false,
+      filters: [],
+    }
+  },
+
+  computed: {
+    filterOptions(): FilterOption[] {
+      const options: FilterOption[] = [
+        {
+          field: "summary",
+          label: "Summary",
+          type: "contains",
+        },
+        {
+          field: "description",
+          label: "Description",
+          type: "contains",
+        },
+        {
+          field: "owner",
+          label: "Owner",
+          type: "isOr",
+        },
+        {
+          field: "assigned_to",
+          label: "Assigned to",
+          type: "isOr",
+        },
+        {
+          field: "component",
+          label: "Component",
+          type: "is",
+        },
+        {
+          field: "milestone",
+          label: "Milestone",
+          type: "is",
+        },
+        {
+          field: "version",
+          label: "Version",
+          type: "is",
+        },
+        {
+          field: "status",
+          label: "Status",
+          type: "is",
+        },
+      ]
+
+      const filters = options.filter((filter: FilterOption) => {
+        const added = this.filters.find((option: FilterOption) => option.field === filter.field)
+
+        return added === undefined ? true : false
+      })
+
+      return filters
+    },
+  },
+
+  methods: {
+    toggleExpand() {
+      this.isExpanded = !this.isExpanded
+    },
+    addFilter(event) {
+      const field: string = event.target.value
+      const filter: FilterOption = this.filterOptions.find((option: FilterOption) => option.field === field)
+
+      console.log(field, filter)
+
+      if (filter) {
+        this.filters.push(filter)
+      }
+
+      event.target.value = ""
+    },
+  },
+}
+</script>
+
 <template>
-  <fieldset id="ticket_filters">
-    <legend><a href="#">Filters</a></legend>
-    <div id="ticket_filters_content">
-      <table>
-        <tbody></tbody>
-      </table>
+  <fieldset class="ticket-filters-container">
+    <legend @click="toggleExpand">Filters</legend>
+    <div class="active-filters" v-if="isExpanded">
+      <div class="no-filters" v-if="filters.length === 0">No filters set.</div>
+      <div v-for="filter in filters" :key="filter.field" class="filter">
+        <div class="label">{{ filter.label }}</div>
+        <div class="condition">
+          <select :name="`filters[${filter.field}][prefix]`" v-if="['is', 'isOr'].includes(filter.type)">
+            <option value="">is</option>
+            <option value="!">is not</option>
+          </select>
+          <select :name="`filters[${filter.field}][prefix]`" v-if="['contains'].includes(filter.type)">
+            <option value="">contains</option>
+            <option value="!">does not contain</option>
+          </select>
+        </div>
+        <div class="value"></div>
+      </div>
+    </div>
+    <div class="actions" v-if="isExpanded">
+      <div class="apply">
+        <button>Apply</button>
+      </div>
+      <div class="add-filter">
+        <select name="new_filter" @change="addFilter">
+          <option value="" disabled selected>Add filter</option>
+          <option v-for="option in filterOptions" :value="option.field" :key="option.value">
+            {{ option.label }}
+          </option>
+        </select>
+      </div>
     </div>
   </fieldset>
 </template>
+
+<style scoped lang="postcss">
+.ticket-filters-container {
+  padding: 0;
+  @apply border-gray-600;
+  @apply rounded;
+
+  & legend {
+    cursor: pointer;
+    @apply px-2 py-0;
+    @apply ml-3;
+    @apply underline;
+  }
+}
+
+.no-filters {
+  @apply p-2;
+  @apply text-gray-700;
+}
+
+.filter {
+  display: flex;
+  align-items: center;
+  @apply p-2;
+
+  &:nth-child(even) {
+    @apply bg-gray-50;
+  }
+
+  & .label {
+    text-align: right;
+    font-weight: bold;
+    @apply w-28;
+    @apply mr-3;
+  }
+}
+
+.actions {
+  display: flex;
+  @apply p-2;
+  @apply bg-gray-100;
+  @apply rounded-b;
+
+  & .apply {
+    flex-grow: 1;
+  }
+
+  & .add-filter {
+    justify-items: end;
+  }
+}
+</style>

From ec97e1f9ec6caea209612e5dc107b6c575e6db48 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Thu, 30 Jun 2022 23:27:34 +1000
Subject: [PATCH 07/46] FontAwesome

---
 package.json |  4 ++++
 yarn.lock    | 31 +++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/package.json b/package.json
index b2fdc80bd..b3dcdadac 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,10 @@
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
   },
   "dependencies": {
+    "@fortawesome/fontawesome-svg-core": "^6.1.1",
+    "@fortawesome/free-regular-svg-icons": "^6.1.1",
+    "@fortawesome/free-solid-svg-icons": "^6.1.1",
+    "@fortawesome/vue-fontawesome": "^3.0.1",
     "axios": "^0.27.2",
     "pinia": "^2.0.14",
     "vue": "^3.2.37"
diff --git a/yarn.lock b/yarn.lock
index e31e7c130..a45950113 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -27,6 +27,37 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@fortawesome/fontawesome-common-types@6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.1.tgz#7dc996042d21fc1ae850e3173b5c67b0549f9105"
+  integrity sha512-wVn5WJPirFTnzN6tR95abCx+ocH+3IFLXAgyavnf9hUmN0CfWoDjPT/BAWsUVwSlYYVBeCLJxaqi7ZGe4uSjBA==
+
+"@fortawesome/fontawesome-svg-core@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.1.1.tgz#3424ec6182515951816be9b11665d67efdce5b5f"
+  integrity sha512-NCg0w2YIp81f4V6cMGD9iomfsIj7GWrqmsa0ZsPh59G7PKiGN1KymZNxmF00ssuAlo/VZmpK6xazsGOwzKYUMg==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "6.1.1"
+
+"@fortawesome/free-regular-svg-icons@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.1.1.tgz#3f2f58262a839edf0643cbacee7a8a8230061c98"
+  integrity sha512-xXiW7hcpgwmWtndKPOzG+43fPH7ZjxOaoeyooptSztGmJxCAflHZxXNK0GcT0uEsR4jTGQAfGklDZE5NHoBhKg==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "6.1.1"
+
+"@fortawesome/free-solid-svg-icons@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.1.tgz#3369e673f8fe8be2fba30b1ec274d47490a830a6"
+  integrity sha512-0/5exxavOhI/D4Ovm2r3vxNojGZioPwmFrKg0ZUH69Q68uFhFPs6+dhAToh6VEQBntxPRYPuT5Cg1tpNa9JUPg==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "6.1.1"
+
+"@fortawesome/vue-fontawesome@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-3.0.1.tgz#ced35cefc52b364f7db973f2fe9f50c3dd160715"
+  integrity sha512-CdXZJoCS+aEPec26ZP7hWWU3SaJlQPZSCGdgpQ2qGl2HUmtUUNrI3zC4XWdn1JUmh3t5OuDeRG1qB4eGRNSD4A==
+
 "@humanwhocodes/config-array@^0.9.2":
   version "0.9.5"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7"

From f29abe6447ea43f0bbda0ed8bf41126a4167ace0 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Thu, 30 Jun 2022 23:29:04 +1000
Subject: [PATCH 08/46] Add/remove ticket filters and values

---
 traq-ui/css/buttons.css                  |  29 +++-
 traq-ui/ticket-listing/TicketFilters.vue | 193 +++++++++++++++++++++--
 traq-ui/ticket-listing/TicketListing.vue |   7 +-
 traq-ui/ticket-listing/ticket-listing.ts |   3 +-
 4 files changed, 206 insertions(+), 26 deletions(-)

diff --git a/traq-ui/css/buttons.css b/traq-ui/css/buttons.css
index 6cf1a5ae9..4ced31107 100644
--- a/traq-ui/css/buttons.css
+++ b/traq-ui/css/buttons.css
@@ -5,10 +5,10 @@ input[type="reset"] {
   @apply py-2 px-3;
   @apply border-0 rounded;
   @apply bg-gray-200 hover:bg-gray-300 active:bg-gray-400;
-  @apply focus:ring-2 ring-gray-500;
+  @apply focus:ring-4 ring-gray-400;
   @apply transition-all;
 
-  &.primary {
+  &.btn-primary {
     @apply text-white;
     @apply bg-brand-400;
     @apply ring-brand-200;
@@ -22,16 +22,31 @@ input[type="reset"] {
     }
   }
 
-  &.success {
-    @apply bg-emerald-400;
-    @apply ring-emerald-200;
+  &.btn-success {
+    @apply bg-emerald-500;
+    @apply ring-emerald-400;
+    @apply text-white;
 
     &:hover {
-      @apply bg-emerald-500;
+      @apply bg-emerald-600;
     }
 
     &:active {
-      @apply bg-emerald-600;
+      @apply bg-emerald-700;
+    }
+  }
+
+  &.btn-danger {
+    @apply bg-red-500;
+    @apply ring-red-200;
+    @apply text-white;
+
+    &:hover {
+      @apply bg-red-600;
+    }
+
+    &:active {
+      @apply bg-red-700;
     }
   }
 }
diff --git a/traq-ui/ticket-listing/TicketFilters.vue b/traq-ui/ticket-listing/TicketFilters.vue
index a6e2236e8..fb1df93c2 100644
--- a/traq-ui/ticket-listing/TicketFilters.vue
+++ b/traq-ui/ticket-listing/TicketFilters.vue
@@ -1,8 +1,23 @@
 <script lang="ts">
+import { faTrashCan } from "@fortawesome/free-regular-svg-icons"
+import { faPlus } from "@fortawesome/free-solid-svg-icons"
+import axios from "axios"
+
 interface FilterOption {
   field: string
   label: string
   type: "is" | "isOr" | "contains"
+  options?: Array<{ label: string; value: string }>
+
+  condition?: boolean
+  value?: Array<string | number>
+  count?: number
+}
+
+interface Filter {
+  field: string
+  condition: boolean
+  values: Array<string | number>
 }
 
 export default {
@@ -10,9 +25,21 @@ export default {
     return {
       isExpanded: false,
       filters: [],
+      milestones: [],
     }
   },
 
+  mounted() {
+    const roadmapUrl = window.traq.base + window.traq.project_slug + "/roadmap.json"
+    axios.get(roadmapUrl).then((resp) => {
+      this.milestones =
+        resp.data.map((data) => ({
+          label: data.name,
+          value: data.slug,
+        })) ?? []
+    })
+  },
+
   computed: {
     filterOptions(): FilterOption[] {
       const options: FilterOption[] = [
@@ -45,11 +72,13 @@ export default {
           field: "milestone",
           label: "Milestone",
           type: "is",
+          options: this.milestones,
         },
         {
           field: "version",
           label: "Version",
           type: "is",
+          options: this.milestones,
         },
         {
           field: "status",
@@ -66,24 +95,45 @@ export default {
 
       return filters
     },
+    // Icons
+    faTrashCan: () => faTrashCan,
+    faPlus: () => faPlus,
   },
 
   methods: {
     toggleExpand() {
       this.isExpanded = !this.isExpanded
     },
+    applyFilters() {
+      this.$emit("applyFilters", this.filters)
+    },
     addFilter(event) {
       const field: string = event.target.value
       const filter: FilterOption = this.filterOptions.find((option: FilterOption) => option.field === field)
 
-      console.log(field, filter)
-
       if (filter) {
-        this.filters.push(filter)
+        this.filters.push({
+          ...filter,
+          condition: true,
+          values: ["isOr", "contains"].includes(filter.type) ? [""] : [],
+        })
       }
 
       event.target.value = ""
     },
+    addFilterValue(filter) {
+      filter.values.push("")
+    },
+    setFilterValue(filter, index, event) {
+      filter.values[index] = event.target.value
+    },
+    removeFilter(filter, valueIndex = null) {
+      if (valueIndex === null || (valueIndex === 0 && filter.values.length === 1)) {
+        this.filters = this.filters.filter((option: FilterOption) => option.field !== filter.field)
+      } else {
+        filter.values.splice(valueIndex, 1)
+      }
+    },
   },
 }
 </script>
@@ -95,22 +145,62 @@ export default {
       <div class="no-filters" v-if="filters.length === 0">No filters set.</div>
       <div v-for="filter in filters" :key="filter.field" class="filter">
         <div class="label">{{ filter.label }}</div>
-        <div class="condition">
-          <select :name="`filters[${filter.field}][prefix]`" v-if="['is', 'isOr'].includes(filter.type)">
-            <option value="">is</option>
-            <option value="!">is not</option>
-          </select>
-          <select :name="`filters[${filter.field}][prefix]`" v-if="['contains'].includes(filter.type)">
-            <option value="">contains</option>
-            <option value="!">does not contain</option>
-          </select>
+        <div class="conditions-and-values" v-if="['is'].includes(filter.type)">
+          <div>
+            <div class="condition">
+              <select :name="`filters[${filter.field}][prefix]`">
+                <option value="">is</option>
+                <option value="!">is not</option>
+              </select>
+            </div>
+            <div class="value">
+              <select multiple :name="`filters[${filter.field}][values][]`" v-model="filter.values">
+                <option v-for="option in filter.options" :key="option.value" :value="option.value">{{ option.label }}</option>
+              </select>
+            </div>
+            <div class="remove">
+              <button class="btn-danger" @click="removeFilter(filter)">
+                <fa-icon :icon="faTrashCan" />
+              </button>
+            </div>
+          </div>
+        </div>
+
+        <div class="conditions-and-values" v-if="['isOr', 'contains'].includes(filter.type)">
+          <div v-for="(value, index) in filter.values" :key="filter.field + index">
+            <div class="condition" v-if="index === 0">
+              <select :name="`filters[${filter.field}][prefix]`" v-if="['is', 'isOr'].includes(filter.type)">
+                <option value="">is</option>
+                <option value="!">is not</option>
+              </select>
+              <select :name="`filters[${filter.field}][prefix]`" v-if="['contains'].includes(filter.type)">
+                <option value="">contains</option>
+                <option value="!">does not contain</option>
+              </select>
+            </div>
+            <div class="condition condition-static" v-if="index >= 1">
+              <span>or</span>
+            </div>
+            <div class="value">
+              <input type="text" :name="`filters[${filter.field}][values][]`" :value="value" @change="(event) => setFilterValue(filter, index, event)" />
+            </div>
+            <div class="add" v-if="index === filter.values.length - 1">
+              <button class="btn-success" @click="addFilterValue(filter)">
+                <fa-icon :icon="faPlus" />
+              </button>
+            </div>
+            <div class="remove">
+              <button class="btn-danger" @click="removeFilter(filter, index)">
+                <fa-icon :icon="faTrashCan" />
+              </button>
+            </div>
+          </div>
         </div>
-        <div class="value"></div>
       </div>
     </div>
     <div class="actions" v-if="isExpanded">
       <div class="apply">
-        <button>Apply</button>
+        <button @click="applyFilters">Apply</button>
       </div>
       <div class="add-filter">
         <select name="new_filter" @change="addFilter">
@@ -125,13 +215,24 @@ export default {
 </template>
 
 <style scoped lang="postcss">
+select,
+input[type="text"] {
+  @apply border border-gray-400 focus:border-brand-600 rounded;
+  @apply focus:ring-4 focus:ring-brand-100;
+  @apply text-sm text-gray-800;
+  @apply px-2 py-1;
+  @apply box-border min-h-[32px];
+  @apply transition-all;
+}
+
 .ticket-filters-container {
   padding: 0;
-  @apply border-gray-600;
+  @apply border-gray-400;
   @apply rounded;
 
   & legend {
     cursor: pointer;
+    @apply text-gray-600;
     @apply px-2 py-0;
     @apply ml-3;
     @apply underline;
@@ -139,13 +240,13 @@ export default {
 }
 
 .no-filters {
-  @apply p-2;
+  @apply px-6 py-4;
   @apply text-gray-700;
 }
 
 .filter {
   display: flex;
-  align-items: center;
+  align-items: top;
   @apply p-2;
 
   &:nth-child(even) {
@@ -157,11 +258,69 @@ export default {
     font-weight: bold;
     @apply w-28;
     @apply mr-3;
+    @apply pt-2;
+  }
+
+  & .conditions-and-values {
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+
+    & > div {
+      display: flex;
+      flex-direction: row;
+      @apply mb-2;
+
+      &:last-child {
+        @apply mb-0;
+      }
+    }
+
+    & .value,
+    & .condition {
+      & select,
+      & input {
+        margin: 0;
+      }
+
+      &.condition-static {
+        box-sizing: border-box;
+        @apply pt-2 pl-3;
+
+        & > span {
+          @apply text-gray-500;
+        }
+      }
+    }
+
+    & .condition {
+      @apply w-32;
+
+      & select,
+      & input {
+        @apply w-28;
+      }
+    }
+
+    & .value {
+      flex-grow: 1;
+
+      & select,
+      & input {
+        @apply min-w-full;
+      }
+    }
+
+    & .add,
+    & .remove {
+      @apply ml-4;
+    }
   }
 }
 
 .actions {
   display: flex;
+  align-items: center;
   @apply p-2;
   @apply bg-gray-100;
   @apply rounded-b;
diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
index 6764f6270..bc55de064 100644
--- a/traq-ui/ticket-listing/TicketListing.vue
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -11,6 +11,7 @@ export default {
       total_pages: 1,
       sort_by: null,
       sort_order: "desc",
+      filters: [],
     }
   },
   methods: {
@@ -36,6 +37,10 @@ export default {
     userUrl(userId) {
       return `${window.traq.base}users/${userId}`
     },
+    applyFilters(filters) {
+      console.log(filters)
+      this.filters = filters
+    },
   },
   mounted() {
     this.getTickets()
@@ -47,7 +52,7 @@ export default {
   <div class="content">
     <h2 id="page_title">Tickets</h2>
   </div>
-  <TicketFilters />
+  <TicketFilters @apply-filters="applyFilters" />
   <table id="tickets" class="ticket-listing list">
     <thead>
       <tr>
diff --git a/traq-ui/ticket-listing/ticket-listing.ts b/traq-ui/ticket-listing/ticket-listing.ts
index df3565746..851f25c45 100644
--- a/traq-ui/ticket-listing/ticket-listing.ts
+++ b/traq-ui/ticket-listing/ticket-listing.ts
@@ -1,6 +1,7 @@
 import { createApp } from "vue"
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"
 
 import TicketListing from "./TicketListing.vue"
 
-const app = createApp(TicketListing)
+const app = createApp(TicketListing).component("fa-icon", FontAwesomeIcon)
 app.mount("#ticket-listing")

From 90ef10dc7a2333d6539fb778befc7edd723d86aa Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Thu, 30 Jun 2022 23:45:34 +1000
Subject: [PATCH 09/46] Handle filter condition changes

---
 traq-ui/ticket-listing/TicketFilters.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/traq-ui/ticket-listing/TicketFilters.vue b/traq-ui/ticket-listing/TicketFilters.vue
index fb1df93c2..b5b8d4703 100644
--- a/traq-ui/ticket-listing/TicketFilters.vue
+++ b/traq-ui/ticket-listing/TicketFilters.vue
@@ -148,9 +148,9 @@ export default {
         <div class="conditions-and-values" v-if="['is'].includes(filter.type)">
           <div>
             <div class="condition">
-              <select :name="`filters[${filter.field}][prefix]`">
-                <option value="">is</option>
-                <option value="!">is not</option>
+              <select :name="`filters[${filter.field}][prefix]`" v-model="filter.condition">
+                <option :value="true">is</option>
+                <option :value="false">is not</option>
               </select>
             </div>
             <div class="value">
@@ -169,13 +169,13 @@ export default {
         <div class="conditions-and-values" v-if="['isOr', 'contains'].includes(filter.type)">
           <div v-for="(value, index) in filter.values" :key="filter.field + index">
             <div class="condition" v-if="index === 0">
-              <select :name="`filters[${filter.field}][prefix]`" v-if="['is', 'isOr'].includes(filter.type)">
-                <option value="">is</option>
-                <option value="!">is not</option>
+              <select :name="`filters[${filter.field}][prefix]`" v-if="['is', 'isOr'].includes(filter.type)" v-model="filter.condition">
+                <option :value="true">is</option>
+                <option :value="false">is not</option>
               </select>
-              <select :name="`filters[${filter.field}][prefix]`" v-if="['contains'].includes(filter.type)">
-                <option value="">contains</option>
-                <option value="!">does not contain</option>
+              <select :name="`filters[${filter.field}][prefix]`" v-if="['contains'].includes(filter.type)" v-model="filter.condition">
+                <option :value="true">contains</option>
+                <option :value="false">does not contain</option>
               </select>
             </div>
             <div class="condition condition-static" v-if="index >= 1">

From 45561fe8602c9f9feeb6a4f4d4a151f21f118055 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Thu, 30 Jun 2022 23:45:46 +1000
Subject: [PATCH 10/46] Update success button ring colour

---
 traq-ui/css/buttons.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/traq-ui/css/buttons.css b/traq-ui/css/buttons.css
index 4ced31107..dd6826139 100644
--- a/traq-ui/css/buttons.css
+++ b/traq-ui/css/buttons.css
@@ -24,7 +24,7 @@ input[type="reset"] {
 
   &.btn-success {
     @apply bg-emerald-500;
-    @apply ring-emerald-400;
+    @apply ring-emerald-200;
     @apply text-white;
 
     &:hover {

From f7c3538f18d56ee9bad9882eb0107596c3e90156 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Fri, 1 Jul 2022 00:38:03 +1000
Subject: [PATCH 11/46] Tweak filter UI

---
 traq-ui/css/buttons.css                  | 69 ++++++++++++++++++++++--
 traq-ui/ticket-listing/TicketFilters.vue | 38 +++++++++----
 2 files changed, 94 insertions(+), 13 deletions(-)

diff --git a/traq-ui/css/buttons.css b/traq-ui/css/buttons.css
index dd6826139..1f0b20bb6 100644
--- a/traq-ui/css/buttons.css
+++ b/traq-ui/css/buttons.css
@@ -1,3 +1,31 @@
+.btn-group {
+  & > button {
+    @apply rounded-none;
+
+    &:first-child {
+      @apply rounded-l;
+    }
+
+    &:last-child {
+      @apply rounded-r;
+    }
+  }
+}
+
+.input-group {
+  & > * {
+    @apply !rounded-none;
+
+    &:first-child {
+      @apply !rounded-l;
+    }
+
+    &:last-child {
+      @apply !rounded-r;
+    }
+  }
+}
+
 button,
 input[type="submit"],
 input[type="button"],
@@ -7,18 +35,37 @@ input[type="reset"] {
   @apply bg-gray-200 hover:bg-gray-300 active:bg-gray-400;
   @apply focus:ring-4 ring-gray-400;
   @apply transition-all;
+  @apply cursor-pointer;
+
+  &:disabled {
+    @apply cursor-not-allowed;
+
+    &,
+    &:hover,
+    &:active {
+      @apply bg-gray-100;
+    }
+  }
 
   &.btn-primary {
     @apply text-white;
-    @apply bg-brand-400;
+    @apply bg-brand-500;
     @apply ring-brand-200;
 
     &:hover {
-      @apply bg-brand-500;
+      @apply bg-brand-600;
     }
 
     &:active {
-      @apply bg-brand-600;
+      @apply bg-brand-700;
+    }
+
+    &:disabled {
+      &,
+      &:hover,
+      &:active {
+        @apply bg-brand-300;
+      }
     }
   }
 
@@ -34,6 +81,14 @@ input[type="reset"] {
     &:active {
       @apply bg-emerald-700;
     }
+
+    &:disabled {
+      &,
+      &:hover,
+      &:active {
+        @apply bg-emerald-300;
+      }
+    }
   }
 
   &.btn-danger {
@@ -48,5 +103,13 @@ input[type="reset"] {
     &:active {
       @apply bg-red-700;
     }
+
+    &:disabled {
+      &,
+      &:hover,
+      &:active {
+        @apply bg-red-300;
+      }
+    }
   }
 }
diff --git a/traq-ui/ticket-listing/TicketFilters.vue b/traq-ui/ticket-listing/TicketFilters.vue
index b5b8d4703..457b50647 100644
--- a/traq-ui/ticket-listing/TicketFilters.vue
+++ b/traq-ui/ticket-listing/TicketFilters.vue
@@ -200,15 +200,20 @@ export default {
     </div>
     <div class="actions" v-if="isExpanded">
       <div class="apply">
-        <button @click="applyFilters">Apply</button>
+        <div class="btn-group">
+          <button class="btn-danger" @click="filters = []" :disabled="filters.length === 0">Clear</button>
+        </div>
       </div>
       <div class="add-filter">
-        <select name="new_filter" @change="addFilter">
-          <option value="" disabled selected>Add filter</option>
-          <option v-for="option in filterOptions" :value="option.field" :key="option.value">
-            {{ option.label }}
-          </option>
-        </select>
+        <div class="input-group">
+          <select name="new_filter" @change="addFilter">
+            <option value="" disabled selected>Add filter</option>
+            <option v-for="option in filterOptions" :value="option.field" :key="option.value">
+              {{ option.label }}
+            </option>
+          </select>
+          <button class="btn-primary" @click="applyFilters" :disabled="filters.length === 0">Apply</button>
+        </div>
       </div>
     </div>
   </fieldset>
@@ -216,15 +221,24 @@ export default {
 
 <style scoped lang="postcss">
 select,
-input[type="text"] {
+input[type="text"],
+input[type="password"] {
   @apply border border-gray-400 focus:border-brand-600 rounded;
   @apply focus:ring-4 focus:ring-brand-100;
   @apply text-sm text-gray-800;
-  @apply px-2 py-1;
-  @apply box-border min-h-[32px];
+  @apply px-2 py-[.35rem];
   @apply transition-all;
 }
 
+select,
+input[type="text"],
+input[type="password"],
+input[type="button"],
+input[type="reset"],
+button {
+  @apply box-border min-h-[32px];
+}
+
 .ticket-filters-container {
   padding: 0;
   @apply border-gray-400;
@@ -331,6 +345,10 @@ input[type="text"] {
 
   & .add-filter {
     justify-items: end;
+
+    & select {
+      margin: 0;
+    }
   }
 }
 </style>

From 06347987a1f69c0330698623cd9b09d715088b3b Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Fri, 1 Jul 2022 00:38:18 +1000
Subject: [PATCH 12/46] Handle ticket filter application

---
 traq-ui/ticket-listing/TicketListing.vue | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
index bc55de064..2b18ad8da 100644
--- a/traq-ui/ticket-listing/TicketListing.vue
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -14,13 +14,28 @@ export default {
       filters: [],
     }
   },
-  methods: {
-    getTickets() {
+  computed: {
+    getTicketUrl(): string {
       let ticketsUrl = window.traq.base + window.traq.project_slug + "/tickets.json"
+
       if (this.sort_by) {
         ticketsUrl = `${ticketsUrl}?order_by=${this.sort_by}.${this.sort_order}`
       }
-      axios.get(ticketsUrl).then((resp) => {
+
+      if (this.filters.length) {
+        const filterBits = this.filters.map((filter) => {
+          return filter.field + (filter.condition ? "" : "!") + filter.values.join(",")
+        })
+
+        ticketsUrl = ticketsUrl + (this.sort_by ? "&" : "?") + filterBits.join("&")
+      }
+
+      return ticketsUrl
+    },
+  },
+  methods: {
+    getTickets() {
+      axios.get(this.getTicketUrl).then((resp) => {
         this.tickets = resp.data.tickets
         this.page = resp.data.page
         this.total_pages = resp.data.total_pages
@@ -38,8 +53,8 @@ export default {
       return `${window.traq.base}users/${userId}`
     },
     applyFilters(filters) {
-      console.log(filters)
       this.filters = filters
+      this.getTickets()
     },
   },
   mounted() {

From 5031cb63206ae2a9643878dbd2fd7b4ca69f1536 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Fri, 1 Jul 2022 01:36:42 +1000
Subject: [PATCH 13/46] Convert query string to filters

---
 traq-ui/ticket-listing/TicketFilters.vue | 57 +++++++++++++++++-------
 traq-ui/ticket-listing/TicketListing.vue |  8 +++-
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/traq-ui/ticket-listing/TicketFilters.vue b/traq-ui/ticket-listing/TicketFilters.vue
index 457b50647..66c79527e 100644
--- a/traq-ui/ticket-listing/TicketFilters.vue
+++ b/traq-ui/ticket-listing/TicketFilters.vue
@@ -7,32 +7,31 @@ interface FilterOption {
   field: string
   label: string
   type: "is" | "isOr" | "contains"
-  options?: Array<{ label: string; value: string }>
-
   condition?: boolean
+  dataSet?: string
   value?: Array<string | number>
   count?: number
 }
 
-interface Filter {
-  field: string
-  condition: boolean
-  values: Array<string | number>
-}
-
 export default {
   data() {
     return {
       isExpanded: false,
       filters: [],
-      milestones: [],
+      filterData: {
+        milestones: [],
+        components: [],
+        statuses: [],
+      },
     }
   },
 
   mounted() {
+    this.convertQueryString()
+
     const roadmapUrl = window.traq.base + window.traq.project_slug + "/roadmap.json"
     axios.get(roadmapUrl).then((resp) => {
-      this.milestones =
+      this.filterData.milestones =
         resp.data.map((data) => ({
           label: data.name,
           value: data.slug,
@@ -72,13 +71,13 @@ export default {
           field: "milestone",
           label: "Milestone",
           type: "is",
-          options: this.milestones,
+          dataSet: "milestones",
         },
         {
           field: "version",
           label: "Version",
           type: "is",
-          options: this.milestones,
+          dataSet: "milestones",
         },
         {
           field: "status",
@@ -104,7 +103,11 @@ export default {
     toggleExpand() {
       this.isExpanded = !this.isExpanded
     },
-    applyFilters() {
+    applyFilters(filters = null) {
+      if (Array.isArray(filters)) {
+        this.filters = filters
+      }
+
       this.$emit("applyFilters", this.filters)
     },
     addFilter(event) {
@@ -134,6 +137,28 @@ export default {
         filter.values.splice(valueIndex, 1)
       }
     },
+    convertQueryString() {
+      const filters = []
+      const params = new URLSearchParams(window.location.search.substring(1))
+
+      // Loop over filter options and check params for a value
+      this.filterOptions.map((filter: FilterOption) => {
+        const paramValue = params.get(filter.field)
+
+        if (paramValue) {
+          const condition = !paramValue.startsWith("!")
+          const values = !condition ? paramValue.substring(1)?.split(",") : paramValue.split(",")
+
+          filters.push({
+            ...filter,
+            condition,
+            values: values ?? [],
+          })
+        }
+      })
+
+      this.applyFilters(filters)
+    },
   },
 }
 </script>
@@ -155,7 +180,7 @@ export default {
             </div>
             <div class="value">
               <select multiple :name="`filters[${filter.field}][values][]`" v-model="filter.values">
-                <option v-for="option in filter.options" :key="option.value" :value="option.value">{{ option.label }}</option>
+                <option v-for="option in filterData[filter.dataSet]" :key="option.value" :value="option.value">{{ option.label }}</option>
               </select>
             </div>
             <div class="remove">
@@ -201,7 +226,7 @@ export default {
     <div class="actions" v-if="isExpanded">
       <div class="apply">
         <div class="btn-group">
-          <button class="btn-danger" @click="filters = []" :disabled="filters.length === 0">Clear</button>
+          <button class="btn-danger" @click="applyFilters([])" :disabled="filters.length === 0">Clear</button>
         </div>
       </div>
       <div class="add-filter">
@@ -212,7 +237,7 @@ export default {
               {{ option.label }}
             </option>
           </select>
-          <button class="btn-primary" @click="applyFilters" :disabled="filters.length === 0">Apply</button>
+          <button class="btn-primary" @click="applyFilters">Apply</button>
         </div>
       </div>
     </div>
diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
index 2b18ad8da..39ef99019 100644
--- a/traq-ui/ticket-listing/TicketListing.vue
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -24,7 +24,7 @@ export default {
 
       if (this.filters.length) {
         const filterBits = this.filters.map((filter) => {
-          return filter.field + (filter.condition ? "" : "!") + filter.values.join(",")
+          return `${filter.field}=` + (filter.condition ? "" : "!") + filter.values.join(",")
         })
 
         ticketsUrl = ticketsUrl + (this.sort_by ? "&" : "?") + filterBits.join("&")
@@ -40,6 +40,8 @@ export default {
         this.page = resp.data.page
         this.total_pages = resp.data.total_pages
       })
+
+      this.updateUrl()
     },
     sortTickets(column) {
       this.sort_order = column !== this.sort_by || this.sort_order === "desc" ? "asc" : "desc"
@@ -56,6 +58,10 @@ export default {
       this.filters = filters
       this.getTickets()
     },
+    updateUrl() {
+      // Update page URL to the same URL to fetch tickets without the .json extension.
+      history.pushState({}, null, this.getTicketUrl.replace(".json", ""))
+    },
   },
   mounted() {
     this.getTickets()

From 09a640ad636090583cee7cef6b64ea0719ebef06 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Fri, 1 Jul 2022 23:52:52 +1000
Subject: [PATCH 14/46] Add Luxon

---
 package.json | 1 +
 yarn.lock    | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/package.json b/package.json
index b3dcdadac..3215ba016 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "@fortawesome/free-solid-svg-icons": "^6.1.1",
     "@fortawesome/vue-fontawesome": "^3.0.1",
     "axios": "^0.27.2",
+    "luxon": "^2.4.0",
     "pinia": "^2.0.14",
     "vue": "^3.2.37"
   },
diff --git a/yarn.lock b/yarn.lock
index a45950113..e3d45ae11 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1717,6 +1717,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+luxon@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/luxon/-/luxon-2.4.0.tgz#9435806545bb32d4234dab766ab8a3d54847a765"
+  integrity sha512-w+NAwWOUL5hO0SgwOHsMBAmZ15SoknmQXhSO0hIbJCAmPKSsGeK8MlmhYh2w6Iib38IxN2M+/ooXWLbeis7GuA==
+
 magic-string@^0.25.7:
   version "0.25.9"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"

From 1a037d20245b79e348782ab4bb2be196db97a92d Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Fri, 1 Jul 2022 23:53:38 +1000
Subject: [PATCH 15/46] Ticket filter styling and animation

---
 traq-ui/css/forms.css                    | 30 ++++++++++++++++++++
 traq-ui/ticket-listing/TicketFilters.vue | 35 +++++++++---------------
 2 files changed, 43 insertions(+), 22 deletions(-)
 create mode 100644 traq-ui/css/forms.css

diff --git a/traq-ui/css/forms.css b/traq-ui/css/forms.css
new file mode 100644
index 000000000..c8d1db1f7
--- /dev/null
+++ b/traq-ui/css/forms.css
@@ -0,0 +1,30 @@
+select,
+input[type="text"],
+input[type="password"] {
+  @apply border border-gray-400 focus:border-brand-600 rounded;
+  @apply focus:ring-4 focus:ring-brand-100;
+  @apply text-sm text-gray-800;
+  @apply py-2 px-3;
+  @apply transition-all;
+  @apply text-sm;
+}
+
+select,
+input[type="text"],
+input[type="password"],
+input[type="button"],
+input[type="reset"],
+button {
+  line-height: 1.25;
+  @apply box-border;
+  @apply appearance-none;
+  /* @apply min-h-[32px]; */
+}
+
+select:not([multiple]) {
+  padding-right: 30px;
+  background-repeat: no-repeat;
+  background-position: right 0.75rem center;
+  background-size: 10px;
+  background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.1.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M224 416c-8.188 0-16.38-3.125-22.62-9.375l-192-192c-12.5-12.5-12.5-32.75 0-45.25s32.75-12.5 45.25 0L224 338.8l169.4-169.4c12.5-12.5 32.75-12.5 45.25 0s12.5 32.75 0 45.25l-192 192C240.4 412.9 232.2 416 224 416z"/></svg>');
+}
diff --git a/traq-ui/ticket-listing/TicketFilters.vue b/traq-ui/ticket-listing/TicketFilters.vue
index 66c79527e..d3a9d4e98 100644
--- a/traq-ui/ticket-listing/TicketFilters.vue
+++ b/traq-ui/ticket-listing/TicketFilters.vue
@@ -16,7 +16,7 @@ interface FilterOption {
 export default {
   data() {
     return {
-      isExpanded: false,
+      isExpanded: true,
       filters: [],
       filterData: {
         milestones: [],
@@ -164,9 +164,9 @@ export default {
 </script>
 
 <template>
-  <fieldset class="ticket-filters-container">
+  <fieldset :class="['ticket-filters-container', isExpanded ? 'open' : '']">
     <legend @click="toggleExpand">Filters</legend>
-    <div class="active-filters" v-if="isExpanded">
+    <div class="active-filters">
       <div class="no-filters" v-if="filters.length === 0">No filters set.</div>
       <div v-for="filter in filters" :key="filter.field" class="filter">
         <div class="label">{{ filter.label }}</div>
@@ -223,7 +223,7 @@ export default {
         </div>
       </div>
     </div>
-    <div class="actions" v-if="isExpanded">
+    <div class="actions">
       <div class="apply">
         <div class="btn-group">
           <button class="btn-danger" @click="applyFilters([])" :disabled="filters.length === 0">Clear</button>
@@ -245,30 +245,21 @@ export default {
 </template>
 
 <style scoped lang="postcss">
-select,
-input[type="text"],
-input[type="password"] {
-  @apply border border-gray-400 focus:border-brand-600 rounded;
-  @apply focus:ring-4 focus:ring-brand-100;
-  @apply text-sm text-gray-800;
-  @apply px-2 py-[.35rem];
-  @apply transition-all;
-}
-
-select,
-input[type="text"],
-input[type="password"],
-input[type="button"],
-input[type="reset"],
-button {
-  @apply box-border min-h-[32px];
-}
+@import "../css/forms.css";
 
 .ticket-filters-container {
   padding: 0;
+  overflow: scroll;
+  transition: max-height ease-in-out 0.4s;
+  max-height: 0px;
+  background-color: #fff;
   @apply border-gray-400;
   @apply rounded;
 
+  &.open {
+    max-height: 600px;
+  }
+
   & legend {
     cursor: pointer;
     @apply text-gray-600;

From d102d9d0b58138acd725179ca0aeccd0c8c4c2d4 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Fri, 1 Jul 2022 23:54:22 +1000
Subject: [PATCH 16/46] Ticket columns

---
 traq-ui/ticket-listing/TicketColumns.vue | 135 +++++++++++++++++++++
 traq-ui/ticket-listing/TicketListing.vue | 148 ++++++++++++++++++++---
 2 files changed, 263 insertions(+), 20 deletions(-)
 create mode 100644 traq-ui/ticket-listing/TicketColumns.vue

diff --git a/traq-ui/ticket-listing/TicketColumns.vue b/traq-ui/ticket-listing/TicketColumns.vue
new file mode 100644
index 000000000..f19d34927
--- /dev/null
+++ b/traq-ui/ticket-listing/TicketColumns.vue
@@ -0,0 +1,135 @@
+<script lang="ts">
+export default {
+  data() {
+    return {
+      isExpanded: true,
+      columns: [
+        {
+          name: "ID",
+          field: "ticket_id",
+        },
+        {
+          name: "Summary",
+          field: "summary",
+        },
+        {
+          name: "Owner",
+          field: "owner",
+        },
+        {
+          name: "Type",
+          field: "type",
+        },
+        {
+          name: "Component",
+          field: "component",
+        },
+        {
+          name: "Milestone",
+          field: "milestone",
+        },
+        {
+          name: "Assignee",
+          field: "assigned_to",
+        },
+        {
+          name: "Priority",
+          field: "priority",
+        },
+        {
+          name: "Severity",
+          field: "severity",
+        },
+        {
+          name: "Reported",
+          field: "created_at",
+        },
+        {
+          name: "Updated",
+          field: "updated_at",
+        },
+        {
+          name: "Votes",
+          field: "votes",
+        },
+      ],
+      active: ["ticket_id", "summary", "owner", "type", "component", "milestone"],
+    }
+  },
+
+  methods: {
+    toggleExpand(): void {
+      this.isExpanded = !this.isExpanded
+    },
+    toggleField(field): void {
+      if (this.active.includes(field)) {
+        this.active = this.active.filter((activeField) => activeField !== field)
+      } else {
+        this.active.push(field)
+      }
+
+      this.$emit("apply-columns", this.active)
+    },
+  },
+}
+</script>
+
+<template>
+  <fieldset :class="['ticket-columns-container', isExpanded ? 'open' : '']">
+    <legend @click="toggleExpand">Columns</legend>
+    <div class="ticket-columns">
+      <div
+        v-for="column in columns"
+        :class="['ticket-column', active.includes(column.field) ? 'column-active' : '']"
+        :key="column.field"
+        @click="toggleField(column.field)"
+      >
+        {{ column.name }}
+      </div>
+    </div>
+  </fieldset>
+</template>
+
+<style scoped lang="postcss">
+.ticket-columns-container {
+  padding: 0;
+  overflow: scroll;
+  transition: max-height ease-in-out 0.4s;
+  max-height: 0px;
+  background-color: #fff;
+  @apply border-gray-400;
+  @apply rounded;
+
+  &.open {
+    max-height: 600px;
+  }
+
+  & legend {
+    cursor: pointer;
+    @apply text-gray-600;
+    @apply px-2 py-0;
+    @apply ml-3;
+    @apply underline;
+  }
+}
+
+.ticket-columns {
+  @apply p-2;
+}
+
+.ticket-column {
+  display: inline-block;
+  cursor: pointer;
+  transition: all ease-in-out 0.1s;
+
+  @apply mx-1 my-1;
+  @apply text-gray-500;
+  @apply bg-gray-100;
+  @apply border border-solid border-gray-400 rounded;
+  @apply py-2 px-3;
+
+  &.column-active {
+    @apply border-emerald-300 bg-emerald-50 text-emerald-800;
+  }
+}
+</style>
diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
index 39ef99019..0b147305f 100644
--- a/traq-ui/ticket-listing/TicketListing.vue
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -1,9 +1,12 @@
 <script lang="ts">
+import { faChevronDown, faChevronUp } from "@fortawesome/free-solid-svg-icons"
 import axios from "axios"
+import { DateTime } from "luxon"
 import TicketFilters from "./TicketFilters.vue"
+import TicketColumns from "./TicketColumns.vue"
 
 export default {
-  components: { TicketFilters },
+  components: { TicketFilters, TicketColumns },
   data() {
     return {
       tickets: [],
@@ -12,6 +15,7 @@ export default {
       sort_by: null,
       sort_order: "desc",
       filters: [],
+      columns: ["ticket_id", "summary", "status", "type", "owner", "component", "milestone"],
     }
   },
   computed: {
@@ -32,9 +36,15 @@ export default {
 
       return ticketsUrl
     },
+    faChevronUp() {
+      return faChevronUp
+    },
+    faChevronDown() {
+      return faChevronDown
+    },
   },
   methods: {
-    getTickets() {
+    getTickets(): void {
       axios.get(this.getTicketUrl).then((resp) => {
         this.tickets = resp.data.tickets
         this.page = resp.data.page
@@ -43,21 +53,27 @@ export default {
 
       this.updateUrl()
     },
-    sortTickets(column) {
+    sortTickets(column): void {
       this.sort_order = column !== this.sort_by || this.sort_order === "desc" ? "asc" : "desc"
       this.sort_by = column
       this.getTickets()
     },
-    ticketUrl(ticketId) {
+    ticketUrl(ticketId): string {
       return `${window.traq.base}${window.traq.project_slug}/tickets/${ticketId}`
     },
-    userUrl(userId) {
+    userUrl(userId): string {
       return `${window.traq.base}users/${userId}`
     },
-    applyFilters(filters) {
+    applyFilters(filters): void {
       this.filters = filters
       this.getTickets()
     },
+    updateColumns(columns: Array<string>): void {
+      this.columns = columns
+    },
+    formatDate(date): string {
+      return date ? DateTime.fromSQL(date, { zone: "UTC" }).toLocal().toRelative() : "-"
+    },
     updateUrl() {
       // Update page URL to the same URL to fetch tickets without the .json extension.
       history.pushState({}, null, this.getTicketUrl.replace(".json", ""))
@@ -74,39 +90,125 @@ export default {
     <h2 id="page_title">Tickets</h2>
   </div>
   <TicketFilters @apply-filters="applyFilters" />
+  <TicketColumns @apply-columns="updateColumns" />
   <table id="tickets" class="ticket-listing list">
     <thead>
       <tr>
-        <th>
+        <th v-if="columns.includes('ticket_id')">
           <a href="#" @click="sortTickets('ticket_id')">ID</a>
+          <template v-if="sort_by === 'ticket_id'">
+            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          </template>
         </th>
-        <th>
+        <th v-if="columns.includes('summary')">
           <a href="#" @click="sortTickets('summary')">Summary</a>
+          <template v-if="sort_by === 'summary'">
+            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          </template>
         </th>
-        <th>
+        <th v-if="columns.includes('status')">
           <a href="#" @click="sortTickets('status')">Status</a>
+          <template v-if="sort_by === 'status'">
+            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          </template>
         </th>
-        <th>
+        <th v-if="columns.includes('owner')">
           <a href="#" @click="sortTickets('user')">Owner</a>
+          <template v-if="sort_by === 'user'">
+            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          </template>
+        </th>
+        <th v-if="columns.includes('type')">
+          <a href="#" @click="sortTickets('type')">Type</a>
+          <template v-if="sort_by === 'type'">
+            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          </template>
+        </th>
+        <th v-if="columns.includes('component')">
+          <a href="#" @click="sortTickets('component')">Component</a>
+          <template v-if="sort_by === 'component'">
+            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          </template>
+        </th>
+        <th v-if="columns.includes('milestone')">
+          <a href="#" @click="sortTickets('milestone')">Milestone</a>
+          <template v-if="sort_by === 'milestone'">
+            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          </template>
+        </th>
+        <th v-if="columns.includes('assigned_to')">
+          <a href="#" @click="sortTickets('assigned_to')">Assignee</a>
+          <template v-if="sort_by === 'assigned_to'">
+            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          </template>
+        </th>
+        <th v-if="columns.includes('priority')">
+          <a href="#" @click="sortTickets('priority')">Priority</a>
+          <template v-if="sort_by === 'priority'">
+            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          </template>
+        </th>
+        <th v-if="columns.includes('severity')">
+          <a href="#" @click="sortTickets('severity')">Severity</a>
+          <template v-if="sort_by === 'severity'">
+            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          </template>
+        </th>
+        <th v-if="columns.includes('created_at')">
+          <a href="#" @click="sortTickets('created_at')">Reported</a>
+          <template v-if="sort_by === 'created_at'">
+            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          </template>
+        </th>
+        <th v-if="columns.includes('updated_at')">
+          <a href="#" @click="sortTickets('updated_at')">Updated</a>
+          <template v-if="sort_by === 'updated_at'">
+            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          </template>
+        </th>
+        <th v-if="columns.includes('votes')">
+          <a href="#" @click="sortTickets('votes')">Votes</a>
+          <template v-if="sort_by === 'votes'">
+            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          </template>
         </th>
-        <th>Type</th>
-        <th>Component</th>
-        <th>Milestone</th>
       </tr>
       <tr v-for="ticket in tickets" :key="ticket.id" :class="'priority-' + ticket.priority.id">
-        <td>{{ ticket.id }}</td>
-        <td>
+        <td v-if="columns.includes('ticket_id')">{{ ticket.id }}</td>
+        <td v-if="columns.includes('summary')">
           <a :href="ticketUrl(ticket.id)">
             {{ ticket.summary }}
           </a>
         </td>
-        <td>{{ ticket.status.name }}</td>
-        <td>
+        <td v-if="columns.includes('status')">{{ ticket.status.name }}</td>
+        <td v-if="columns.includes('owner')">
           <a :href="userUrl(ticket.user.id)">{{ ticket.user.name }}</a>
         </td>
-        <td>{{ ticket.type.name }}</td>
-        <td>{{ ticket.component?.name ?? "-" }}</td>
-        <td>{{ ticket.milestone?.name ?? "-" }}</td>
+        <td v-if="columns.includes('type')">{{ ticket.type.name }}</td>
+        <td v-if="columns.includes('component')">{{ ticket.component?.name ?? "-" }}</td>
+        <td v-if="columns.includes('milestone')">{{ ticket.milestone?.name ?? "-" }}</td>
+        <td v-if="columns.includes('assigned_to')">
+          <a v-if="ticket.assigned_to" :href="userUrl(ticket.assigned_to.id)">{{ ticket.assigned_to.name }}</a>
+          <template v-if="!ticket.assigned_to">-</template>
+        </td>
+        <td v-if="columns.includes('priority')">{{ ticket.priority.name }}</td>
+        <td v-if="columns.includes('severity')">{{ ticket.severity.name }}</td>
+        <td v-if="columns.includes('created_at')">{{ formatDate(ticket.created_at) }}</td>
+        <td v-if="columns.includes('updated_at')">{{ formatDate(ticket.updated_at) }}</td>
+        <td v-if="columns.includes('votes')">{{ ticket.votes }}</td>
       </tr>
     </thead>
   </table>
@@ -114,6 +216,12 @@ export default {
 
 <style scoped lang="postcss">
 table.ticket-listing {
+  & th {
+    & > svg {
+      float: right;
+    }
+  }
+
   & tr {
     &.priority-1 {
       & td {

From e965250fac519f0627e8346eae1cecbfe617d5d9 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Fri, 1 Jul 2022 23:54:36 +1000
Subject: [PATCH 17/46] Update button styles

---
 traq-ui/css/buttons.css | 56 ++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 35 deletions(-)

diff --git a/traq-ui/css/buttons.css b/traq-ui/css/buttons.css
index 1f0b20bb6..840767b53 100644
--- a/traq-ui/css/buttons.css
+++ b/traq-ui/css/buttons.css
@@ -13,6 +13,9 @@
 }
 
 .input-group {
+  display: flex;
+  align-items: flex-start;
+
   & > * {
     @apply !rounded-none;
 
@@ -30,12 +33,16 @@ button,
 input[type="submit"],
 input[type="button"],
 input[type="reset"] {
+  line-height: 1.25;
+  @apply text-sm;
   @apply py-2 px-3;
-  @apply border-0 rounded;
+  @apply border border-solid rounded;
   @apply bg-gray-200 hover:bg-gray-300 active:bg-gray-400;
-  @apply focus:ring-4 ring-gray-400;
+  @apply border-gray-200 hover:border-gray-300 active:border-gray-400;
+  @apply ring-0 focus:ring-4 ring-gray-400;
   @apply transition-all;
   @apply cursor-pointer;
+  @apply appearance-none;
 
   &:disabled {
     @apply cursor-not-allowed;
@@ -43,72 +50,51 @@ input[type="reset"] {
     &,
     &:hover,
     &:active {
-      @apply bg-gray-100;
+      @apply bg-gray-100 border-gray-100;
     }
   }
 
   &.btn-primary {
     @apply text-white;
-    @apply bg-brand-500;
+    @apply bg-brand-500 hover:bg-brand-600 active:bg-brand-700;
+    @apply border-brand-500 hover:border-brand-600 active:border-brand-700;
     @apply ring-brand-200;
 
-    &:hover {
-      @apply bg-brand-600;
-    }
-
-    &:active {
-      @apply bg-brand-700;
-    }
-
     &:disabled {
       &,
       &:hover,
       &:active {
-        @apply bg-brand-300;
+        @apply bg-brand-300 border-brand-300;
       }
     }
   }
 
   &.btn-success {
-    @apply bg-emerald-500;
-    @apply ring-emerald-200;
     @apply text-white;
-
-    &:hover {
-      @apply bg-emerald-600;
-    }
-
-    &:active {
-      @apply bg-emerald-700;
-    }
+    @apply bg-emerald-500 hover:bg-emerald-600 active:bg-emerald-700;
+    @apply border-emerald-500 hover:border-emerald-600 active:border-emerald-700;
+    @apply ring-emerald-200;
 
     &:disabled {
       &,
       &:hover,
       &:active {
-        @apply bg-emerald-300;
+        @apply bg-emerald-300 border-emerald-300;
       }
     }
   }
 
   &.btn-danger {
-    @apply bg-red-500;
-    @apply ring-red-200;
     @apply text-white;
-
-    &:hover {
-      @apply bg-red-600;
-    }
-
-    &:active {
-      @apply bg-red-700;
-    }
+    @apply bg-red-500 hover:bg-red-600 active:bg-red-700;
+    @apply border-red-500 hover:border-red-600 active:border-red-700;
+    @apply ring-red-200;
 
     &:disabled {
       &,
       &:hover,
       &:active {
-        @apply bg-red-300;
+        @apply bg-red-300 border-red-300;
       }
     }
   }

From 42e05a063487e0da62d120df5bcff858830a2496 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Fri, 1 Jul 2022 23:54:55 +1000
Subject: [PATCH 18/46] Cleanup old code

---
 assets/js/traq.js                             | 533 +++++++++---------
 vendor/traq/config/routes.php                 |  76 +--
 vendor/traq/controllers/tickets.php           | 112 +---
 vendor/traq/helpers/tickets.php               |  23 -
 vendor/traq/views/default/css/default.css     |   2 +-
 vendor/traq/views/default/css/default.css.map |   2 +-
 .../traq/views/default/tickets/_columns.phtml |  18 -
 .../traq/views/default/tickets/_filters.phtml | 100 ----
 .../default/tickets/_sort_indicator.phtml     |   1 -
 9 files changed, 307 insertions(+), 560 deletions(-)
 delete mode 100644 vendor/traq/views/default/tickets/_columns.phtml
 delete mode 100644 vendor/traq/views/default/tickets/_filters.phtml
 delete mode 100644 vendor/traq/views/default/tickets/_sort_indicator.phtml

diff --git a/assets/js/traq.js b/assets/js/traq.js
index 8a1caaff8..8b5d3f596 100644
--- a/assets/js/traq.js
+++ b/assets/js/traq.js
@@ -1,7 +1,7 @@
 /*!
  * Traq
- * Copyright (C) 2009-2014 Traq.io
- * Copyright (C) 2009-2014 Jack P.
+ * Copyright (C) 2009-2022 Traq.io
+ * Copyright (C) 2009-2022 Jack P.
  * https://github.com/nirix
  *
  * This file is part of Traq.
@@ -21,256 +21,246 @@
 
 // The main Traq object
 var traq = {
-	base: '/',
-	load_ticket_template: function(){
-		var type_id = $("#type option:selected").val();
-
-		$("#description").load(traq.base + '_ajax/ticket_template/' + type_id);
-
-		traq.show_hide_custom_fields()
-	},
-	show_hide_custom_fields: function(){
-		var type_id = $("#type option:selected").val();
-
-		// Toggle visibility for custom fields that aren't relveant
-		// for the selected type.
-		$(".properties .custom_field").each(function(){
-			var field = $(this);
-
-			// Hide the field
-			field.hide();
-
-			// Check if it is for 0 (all) or the selected type ID and show it.
-			if (field.hasClass('field-for-type-0') || field.hasClass('field-for-type-' + type_id)) {
-				field.show();
-			}
-		});
-	}
-};
+  base: "/",
+  load_ticket_template: function () {
+    var type_id = $("#type option:selected").val()
+
+    $("#description").load(traq.base + "_ajax/ticket_template/" + type_id)
+
+    traq.show_hide_custom_fields()
+  },
+  show_hide_custom_fields: function () {
+    var type_id = $("#type option:selected").val()
+
+    // Toggle visibility for custom fields that aren't relveant
+    // for the selected type.
+    $(".properties .custom_field").each(function () {
+      var field = $(this)
+
+      // Hide the field
+      field.hide()
+
+      // Check if it is for 0 (all) or the selected type ID and show it.
+      if (field.hasClass("field-for-type-0") || field.hasClass("field-for-type-" + type_id)) {
+        field.show()
+      }
+    })
+  },
+}
 
 // Cookies, nom nom nom
-$.cookie.defaults.path = '/';
+$.cookie.defaults.path = "/"
 
 // Language object
-var language = {};
+var language = {}
 
 // Instead of that annoying popup confirm box
 // how about a nice simple popover box.
 // Credit to arturo182
-var popover_confirm = function(parent, message, callback) {
-	var outerDiv = $('<div/>').addClass('popover_confirm');
-	var innerDiv = $('<div/>');
-
-	innerDiv.append($('<button/>', { 'text' : language.yes }).click(function(){
-		$("#popover").fadeOut('fast');
-		callback();
-		return false;
-	}));
-	innerDiv.append($('<button/>', { 'text' : language.no }).click(function(){ $("#popover").fadeOut('fast'); return false; }));
-
-	outerDiv.append(message);
-	outerDiv.append(innerDiv);
-
-	$("#popover").stop(true, true).hide().empty().append(outerDiv);
-	$("#popover").popover(parent);
+var popover_confirm = function (parent, message, callback) {
+  var outerDiv = $("<div/>").addClass("popover_confirm")
+  var innerDiv = $("<div/>")
+
+  innerDiv.append(
+    $("<button/>", { text: language.yes }).click(function () {
+      $("#popover").fadeOut("fast")
+      callback()
+      return false
+    })
+  )
+  innerDiv.append(
+    $("<button/>", { text: language.no }).click(function () {
+      $("#popover").fadeOut("fast")
+      return false
+    })
+  )
+
+  outerDiv.append(message)
+  outerDiv.append(innerDiv)
+
+  $("#popover").stop(true, true).hide().empty().append(outerDiv)
+  $("#popover").popover(parent)
 }
 
-$(document).ready(function(){
-	$("#header h1").on('mouseenter', function(){
-		$("#project_switcher_btn").stop(true, true).fadeIn('fast');
-		$(this).off('mouseleave').on('mouseleave', function(){
-			$("#project_switcher_btn").stop(true, true).fadeOut('fast');
-		});
-	});
-
-	$("#project_switcher_btn").on('mouseenter', function(){
-		$(this).stop(true, true).show();
-		$(this).off('mouseleave').on('mouseleave', function(){
-			$(this).stop(true, true).fadeOut('fast');
-		});
-	});
-
-	$("#project_switcher_btn").on('click', function(){
-		$(this).off('mouseleave');
-		$(".project_switcher").popover($(this));
-		return false;
-	});
-
-	$(document).on('click', function(){
-		$("#project_switcher_btn").stop(true, true).fadeOut('fast');
-	});
-
-	$('[data-preview]').on('click', function(){
-		var data = $($(this).attr('data-preview')).val();
-		$('#overlay').load(traq.base + '_misc/preview_text', { data: data }, function(){
-			$('#overlay').overlay();
-		});
-	});
-
-	// Add the editor interface to all text areas, like a boss.
-	$('textarea.editor').likeaboss();
-
-	// Add a confirm-on-click event to call elements
-	// with the data-confirm attribute.
-	$(document).on('click', '[data-confirm]', function(){
-		var parent = $(this);
-
-		popover_confirm(parent, parent.attr('data-confirm'), function(){
-			window.location.href = parent.attr('href');
-		});
-
-		return false;
-	});
-
-	// Add a click event to all elements with
-	// the data-ajax attribute and send an ajax
-	// call to the href attrib value.
-	$(document).on('click', '[data-ajax=1]', function(){
-		var e = $(this);
-		$.ajax({
-			url: e.attr('href'),
-			dataType: 'script'
-		});
-		return false;
-	});
-
-	// Add a click event to ajax-confirm elements
-	// that will confirm with the specified message
-	// then send an ajax request if accepted.
-	$(document).on('click', '[data-ajax-confirm]', function(){
-		var e = $(this);
-
-		popover_confirm(e, e.attr('data-ajax-confirm'), function(){
-			$.ajax({
-				url: e.attr('href'),
-				dataType: 'script'
-			});
-		});
-
-		return false;
-	});
-
-	// Add a click even to all elements with the
-	// data-overlay attribute and load the elements
-	// href value into the overlay container then show
-	// the overlay.
-	$(document).on('click', '[data-overlay]', function(){
-		var path;
-
-		if ($(this).attr('data-overlay') == '1') {
-			path = $(this).attr('href').split('?');
-		} else {
-			path = $(this).attr('data-overlay').split('?');
-		}
-
-		var uri = path[0] + '?overlay=true';
-
-		if (path.length > 1) {
-			var uri = uri + '&' + path[1];
-		}
-
-		$('#overlay').load(uri, function(){ $('#overlay textarea').likeaboss(); $('#overlay').overlay(); });
-		return false;
-	});
-
-	// Add a hover event to all abbreviation elements inside
-	// a form for sexy tooltips.
-	$(document).on({
-		mouseenter: function(){
-			$(this).sexyTooltip();
-		}
-	}, 'form abbr');
-
-	$(document).on({
-		mouseenter: function(){
-			$(this).sexyTooltip('top');
-		}
-	}, '[title]:not(form abbr),[data-tooltip]:not(form abbr)');
-
-	// Add a click event to all elements with
-	// a data-popover attribute.
-	$(document).on('click', '[data-popover]', function(){
-		var parent = $(this);
-		$("#popover").stop(true, true).hide().load($(this).attr('data-popover') + '?popover=true', function(){
-			$("#popover").popover(parent);
-		});
-		return false;
-	});
-
-	// Add a click event to all elements with
-	// a data-popover-hover attribute.
-	$(document).on('mouseenter', '[data-popover-hover]', function(){
-		var parent = $(this);
-		$("#popover").stop(true, true).hide().load($(this).attr('data-popover-hover') + '?popover=true', function(){
-			$("#popover").popover(parent, 'hover');
-		});
-		parent.off('click').click(function(){ return false; });
-	});
-
-	// Loopover all the inputs with an autocomplete attribute
-	// and set them up with the source as the attribute value.
-	$("input[data-autocomplete]").each(function(){
-		$(this).autocomplete({ source: $(this).attr('data-autocomplete') });
-	});
-
-	// Move ticket form refresh
-	$("form#move_ticket #project_id").change(function(){
-		$("form#move_ticket input:hidden[name=step]").val(2);
-		$("form#move_ticket").submit();
-	});
-
-	// Datepicker
-	$(document).on({
-		mouseenter: function(){
-			$(this).datepicker({
-				dateFormat: $(this).attr('data-date-format'),
-				changeMonth: true,
-				changeYear: true
-			});
-		}
-	}, 'input.datepicker');
-
-	// Ticket filter remover
-	$(document).on('click', '#ticket_filters button.button_delete', function(){
-		var filter = $(this).attr('data-filter');
-		$('#filter-' + filter).fadeOut('fast', function(){
-			$(this).remove();
-		});
-	});
-
-	// Ticket filter form toggle
-	$(document).on('click', '#ticket_filters legend a', function(){
-		var filters_table = $('#ticket_filters_content');
-
-		if (filters_table.is(':visible')) {
-			filters_table.slideUp('fast');
-			$.cookie('hide_filters', 1);
-		} else {
-
-			filters_table.slideDown('fast');
-			$.cookie('hide_filters', 0);
-		}
-	});
-
-	// Select all options in ticket filter optgroups when clicked.
-	$(document).on('click', '#ticket_filters_content select[multiple] optgroup', function(e){
-		e.preventDefault();
-
-		// Make sure this is the actual optgroup being clicked on and no an option
-		// inside it.
-		if (!$(e.target).is('#ticket_filters_content select[multiple] optgroup')) {
-			return;
-		}
-
-		// Remove currently selected options unless
-		// the `ctrl` key is being held.
-		if (!e.ctrlKey && !e.metaKey) {
-			$('#ticket_filters_content select[multiple] option').prop('selected', false);
-		}
-
-		$(this).find('option').prop('selected', true);
-	});
-});
+$(document).ready(function () {
+  $("#header h1").on("mouseenter", function () {
+    $("#project_switcher_btn").stop(true, true).fadeIn("fast")
+    $(this)
+      .off("mouseleave")
+      .on("mouseleave", function () {
+        $("#project_switcher_btn").stop(true, true).fadeOut("fast")
+      })
+  })
+
+  $("#project_switcher_btn").on("mouseenter", function () {
+    $(this).stop(true, true).show()
+    $(this)
+      .off("mouseleave")
+      .on("mouseleave", function () {
+        $(this).stop(true, true).fadeOut("fast")
+      })
+  })
+
+  $("#project_switcher_btn").on("click", function () {
+    $(this).off("mouseleave")
+    $(".project_switcher").popover($(this))
+    return false
+  })
+
+  $(document).on("click", function () {
+    $("#project_switcher_btn").stop(true, true).fadeOut("fast")
+  })
+
+  $("[data-preview]").on("click", function () {
+    var data = $($(this).attr("data-preview")).val()
+    $("#overlay").load(traq.base + "_misc/preview_text", { data: data }, function () {
+      $("#overlay").overlay()
+    })
+  })
+
+  // Add the editor interface to all text areas, like a boss.
+  $("textarea.editor").likeaboss()
+
+  // Add a confirm-on-click event to call elements
+  // with the data-confirm attribute.
+  $(document).on("click", "[data-confirm]", function () {
+    var parent = $(this)
+
+    popover_confirm(parent, parent.attr("data-confirm"), function () {
+      window.location.href = parent.attr("href")
+    })
+
+    return false
+  })
+
+  // Add a click event to all elements with
+  // the data-ajax attribute and send an ajax
+  // call to the href attrib value.
+  $(document).on("click", "[data-ajax=1]", function () {
+    var e = $(this)
+    $.ajax({
+      url: e.attr("href"),
+      dataType: "script",
+    })
+    return false
+  })
+
+  // Add a click event to ajax-confirm elements
+  // that will confirm with the specified message
+  // then send an ajax request if accepted.
+  $(document).on("click", "[data-ajax-confirm]", function () {
+    var e = $(this)
+
+    popover_confirm(e, e.attr("data-ajax-confirm"), function () {
+      $.ajax({
+        url: e.attr("href"),
+        dataType: "script",
+      })
+    })
+
+    return false
+  })
+
+  // Add a click even to all elements with the
+  // data-overlay attribute and load the elements
+  // href value into the overlay container then show
+  // the overlay.
+  $(document).on("click", "[data-overlay]", function () {
+    var path
+
+    if ($(this).attr("data-overlay") == "1") {
+      path = $(this).attr("href").split("?")
+    } else {
+      path = $(this).attr("data-overlay").split("?")
+    }
+
+    var uri = path[0] + "?overlay=true"
+
+    if (path.length > 1) {
+      var uri = uri + "&" + path[1]
+    }
+
+    $("#overlay").load(uri, function () {
+      $("#overlay textarea").likeaboss()
+      $("#overlay").overlay()
+    })
+    return false
+  })
+
+  // Add a hover event to all abbreviation elements inside
+  // a form for sexy tooltips.
+  $(document).on(
+    {
+      mouseenter: function () {
+        $(this).sexyTooltip()
+      },
+    },
+    "form abbr"
+  )
+
+  $(document).on(
+    {
+      mouseenter: function () {
+        $(this).sexyTooltip("top")
+      },
+    },
+    "[title]:not(form abbr),[data-tooltip]:not(form abbr)"
+  )
+
+  // Add a click event to all elements with
+  // a data-popover attribute.
+  $(document).on("click", "[data-popover]", function () {
+    var parent = $(this)
+    $("#popover")
+      .stop(true, true)
+      .hide()
+      .load($(this).attr("data-popover") + "?popover=true", function () {
+        $("#popover").popover(parent)
+      })
+    return false
+  })
+
+  // Add a click event to all elements with
+  // a data-popover-hover attribute.
+  $(document).on("mouseenter", "[data-popover-hover]", function () {
+    var parent = $(this)
+    $("#popover")
+      .stop(true, true)
+      .hide()
+      .load($(this).attr("data-popover-hover") + "?popover=true", function () {
+        $("#popover").popover(parent, "hover")
+      })
+    parent.off("click").click(function () {
+      return false
+    })
+  })
+
+  // Loopover all the inputs with an autocomplete attribute
+  // and set them up with the source as the attribute value.
+  $("input[data-autocomplete]").each(function () {
+    $(this).autocomplete({ source: $(this).attr("data-autocomplete") })
+  })
+
+  // Move ticket form refresh
+  $("form#move_ticket #project_id").change(function () {
+    $("form#move_ticket input:hidden[name=step]").val(2)
+    $("form#move_ticket").submit()
+  })
+
+  // Datepicker
+  $(document).on(
+    {
+      mouseenter: function () {
+        $(this).datepicker({
+          dateFormat: $(this).attr("data-date-format"),
+          changeMonth: true,
+          changeYear: true,
+        })
+      },
+    },
+    "input.datepicker"
+  )
+})
 
 /*!
  * jQuery Overlay
@@ -278,35 +268,44 @@ $(document).ready(function(){
  * All Rights Reserved
  * Released under the BSD 3-clause license.
  */
-(function($){
-	$.fn.overlay = function() {
-		var element = $(this);
-		element.fadeIn();
-		element.css({left: jQuery(window).width() / 2-element.width() / 2, top: '18%'});
-		$('#overlay_blackout').css({display: 'none', opacity: 0.7, position: 'fixed', width: jQuery(document).width()+100, height: jQuery(document).height()+100, top: -100 + 'px', left: -100 + 'px' });
-		$('#overlay_blackout').fadeIn('', function() {
-			$('#overlay_blackout').bind('click', function() {
-				$('#overlay_blackout').fadeOut();
-				element.fadeOut();
-			});
-		});
-	};
-})(jQuery);
+;(function ($) {
+  $.fn.overlay = function () {
+    var element = $(this)
+    element.fadeIn()
+    element.css({ left: jQuery(window).width() / 2 - element.width() / 2, top: "18%" })
+    $("#overlay_blackout").css({
+      display: "none",
+      opacity: 0.7,
+      position: "fixed",
+      width: jQuery(document).width() + 100,
+      height: jQuery(document).height() + 100,
+      top: -100 + "px",
+      left: -100 + "px",
+    })
+    $("#overlay_blackout").fadeIn("", function () {
+      $("#overlay_blackout").bind("click", function () {
+        $("#overlay_blackout").fadeOut()
+        element.fadeOut()
+      })
+    })
+  }
+})(jQuery)
 
 // Function to close overlay
-function close_overlay(func)
-{
-	if (func == undefined) {
-		func = function(){}
-	}
-
-	$('#overlay_blackout').fadeOut();
-	$('#overlay').fadeOut(function(){ func(); });
+function close_overlay(func) {
+  if (func == undefined) {
+    func = function () {}
+  }
+
+  $("#overlay_blackout").fadeOut()
+  $("#overlay").fadeOut(function () {
+    func()
+  })
 }
 
 // Search box
 function do_search() {
-	var project_slug = $('#search input[name="project_slug"]').val();
-	var query = $('#search input[name="search"]').val();
-	window.location.href = traq.base + project_slug + "/tickets?search=" + query;
+  var project_slug = $('#search input[name="project_slug"]').val()
+  var query = $('#search input[name="search"]').val()
+  window.location.href = traq.base + project_slug + "/tickets?search=" + query
 }
diff --git a/vendor/traq/config/routes.php b/vendor/traq/config/routes.php
index 7f7d63224..b7e32ddec 100644
--- a/vendor/traq/config/routes.php
+++ b/vendor/traq/config/routes.php
@@ -20,7 +20,7 @@
 
 use avalon\http\Router;
 
-define("RTR_PROJSLUG", '(?P<project_slug>[a-zA-Z0-9\-\_]+)');
+const PROJECT_SLUG = '(?P<project_slug>[a-zA-Z0-9\-\_]+)';
 
 Router::add('root', 'traq::controllers::Projects.index');
 Router::add('404', 'traq::controllers::Error.404');
@@ -51,54 +51,54 @@
 // ------------------------------------------------
 // Project routes
 Router::add('/projects', 'traq::controllers::Projects.index');
-Router::add('/' . RTR_PROJSLUG . '/milestone/(?P<milestone_slug>[a-zA-Z0-9\-_.]+?)', 'traq::controllers::Projects.milestone/$2');
-Router::add('/' . RTR_PROJSLUG . '/(timeline|roadmap|changelog)', 'traq::controllers::Projects.$2');
-Router::add('/' . RTR_PROJSLUG . '/timeline/([0-9]+)/delete', 'traq::controllers::Projects.delete_timeline_event/$2');
-Router::add('/' . RTR_PROJSLUG . '/roadmap/(completed|all|cancelled)', 'traq::controllers::Projects.roadmap/$2');
-Router::add('/' . RTR_PROJSLUG, 'traq::controllers::Projects.view');
+Router::add('/' . PROJECT_SLUG . '/milestone/(?P<milestone_slug>[a-zA-Z0-9\-_.]+?)', 'traq::controllers::Projects.milestone/$2');
+Router::add('/' . PROJECT_SLUG . '/(timeline|roadmap|changelog)', 'traq::controllers::Projects.$2');
+Router::add('/' . PROJECT_SLUG . '/timeline/([0-9]+)/delete', 'traq::controllers::Projects.delete_timeline_event/$2');
+Router::add('/' . PROJECT_SLUG . '/roadmap/(completed|all|cancelled)', 'traq::controllers::Projects.roadmap/$2');
+Router::add('/' . PROJECT_SLUG, 'traq::controllers::Projects.view');
 
 // Ticket routes
-Router::add('/' . RTR_PROJSLUG . '/tickets/new', 'traq::controllers::Tickets.new');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P<ticket_id>[0-9]+)', 'traq::controllers::Tickets.view/$2');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P<ticket_id>[0-9]+)/move', 'traq::controllers::Tickets.move/$2');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P<ticket_id>[0-9]+)/delete', 'traq::controllers::Tickets.delete/$2');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P<ticket_id>[0-9]+)/(update|edit|vote|voters)', 'traq::controllers::Tickets.$3/$2');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P<ticket_id>[0-9]+)/history/([0-9]+)/edit', 'traq::controllers::TicketHistory.edit/$3');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P<ticket_id>[0-9]+)/history/([0-9]+)/delete', 'traq::controllers::TicketHistory.delete/$3');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P<ticket_id>[0-9]+)/tasks/manage', 'traq::controllers::TicketTasks.manage/$2');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P<ticket_id>[0-9]+)/tasks/([0-9]+)', 'traq::controllers::TicketTasks.toggle/$2,$3');
-Router::add('/' . RTR_PROJSLUG . '/tickets/mass_actions', 'traq::controllers::Tickets.mass_actions');
-Router::add('/' . RTR_PROJSLUG . '/tickets/update_filters', 'traq::controllers::Tickets.update_filters');
-Router::add('/' . RTR_PROJSLUG . '/tickets', 'traq::controllers::Tickets.index');
+Router::add('/' . PROJECT_SLUG . '/tickets/new', 'traq::controllers::Tickets.new');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P<ticket_id>[0-9]+)', 'traq::controllers::Tickets.view/$2');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P<ticket_id>[0-9]+)/move', 'traq::controllers::Tickets.move/$2');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P<ticket_id>[0-9]+)/delete', 'traq::controllers::Tickets.delete/$2');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P<ticket_id>[0-9]+)/(update|edit|vote|voters)', 'traq::controllers::Tickets.$3/$2');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P<ticket_id>[0-9]+)/history/([0-9]+)/edit', 'traq::controllers::TicketHistory.edit/$3');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P<ticket_id>[0-9]+)/history/([0-9]+)/delete', 'traq::controllers::TicketHistory.delete/$3');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P<ticket_id>[0-9]+)/tasks/manage', 'traq::controllers::TicketTasks.manage/$2');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P<ticket_id>[0-9]+)/tasks/([0-9]+)', 'traq::controllers::TicketTasks.toggle/$2,$3');
+Router::add('/' . PROJECT_SLUG . '/tickets/mass_actions', 'traq::controllers::Tickets.mass_actions');
+Router::add('/' . PROJECT_SLUG . '/tickets/update_filters', 'traq::controllers::Tickets.update_filters');
+Router::add('/' . PROJECT_SLUG . '/tickets', 'traq::controllers::Tickets.index');
 
 // Wiki routes
-Router::add('/' . RTR_PROJSLUG . '/wiki', 'traq::controllers::Wiki.view', array('slug' => 'main'));
-Router::add('/' . RTR_PROJSLUG . '/wiki/_pages', 'traq::controllers::Wiki.pages');
-Router::add('/' . RTR_PROJSLUG . '/wiki/_new', 'traq::controllers::Wiki.new');
-Router::add('/' . RTR_PROJSLUG . '/wiki/(?P<slug>[a-zA-Z0-9\-\_/]+)/_edit', 'traq::controllers::Wiki.edit');
-Router::add('/' . RTR_PROJSLUG . '/wiki/(?P<slug>[a-zA-Z0-9\-\_/]+)/_delete', 'traq::controllers::Wiki.delete');
-Router::add('/' . RTR_PROJSLUG . '/wiki/(?P<slug>[a-zA-Z0-9\-\_/]+)/_revisions', 'traq::controllers::Wiki.revisions/$2');
-Router::add('/' . RTR_PROJSLUG . '/wiki/(?P<slug>[a-zA-Z0-9\-\_/]+)/_revisions/(\d+)', 'traq::controllers::Wiki.revision/$2,$3');
-Router::add('/' . RTR_PROJSLUG . '/wiki/(?P<slug>[a-zA-Z0-9\-\_/]+)', 'traq::controllers::Wiki.view');
+Router::add('/' . PROJECT_SLUG . '/wiki', 'traq::controllers::Wiki.view', array('slug' => 'main'));
+Router::add('/' . PROJECT_SLUG . '/wiki/_pages', 'traq::controllers::Wiki.pages');
+Router::add('/' . PROJECT_SLUG . '/wiki/_new', 'traq::controllers::Wiki.new');
+Router::add('/' . PROJECT_SLUG . '/wiki/(?P<slug>[a-zA-Z0-9\-\_/]+)/_edit', 'traq::controllers::Wiki.edit');
+Router::add('/' . PROJECT_SLUG . '/wiki/(?P<slug>[a-zA-Z0-9\-\_/]+)/_delete', 'traq::controllers::Wiki.delete');
+Router::add('/' . PROJECT_SLUG . '/wiki/(?P<slug>[a-zA-Z0-9\-\_/]+)/_revisions', 'traq::controllers::Wiki.revisions/$2');
+Router::add('/' . PROJECT_SLUG . '/wiki/(?P<slug>[a-zA-Z0-9\-\_/]+)/_revisions/(\d+)', 'traq::controllers::Wiki.revision/$2,$3');
+Router::add('/' . PROJECT_SLUG . '/wiki/(?P<slug>[a-zA-Z0-9\-\_/]+)', 'traq::controllers::Wiki.view');
 
 // Project settings routes
-Router::add('/' . RTR_PROJSLUG . '/settings', 'traq::controllers::ProjectSettings::Options.index');
-Router::add('/' . RTR_PROJSLUG . '/settings/(milestones|components|members|repositories)', 'traq::controllers::ProjectSettings::$2.index');
-Router::add('/' . RTR_PROJSLUG . '/settings/(milestones|components|members|repositories)/new', 'traq::controllers::ProjectSettings::$2.new');
-Router::add('/' . RTR_PROJSLUG . '/settings/(milestones|components|members)/([0-9]+)/(edit|delete)', 'traq::controllers::ProjectSettings::$2.$4/$3');
-Router::add('/' . RTR_PROJSLUG . '/settings/custom_fields', 'traq::controllers::ProjectSettings::CustomFields.index');
-Router::add('/' . RTR_PROJSLUG . '/settings/custom_fields/new', 'traq::controllers::ProjectSettings::CustomFields.new');
-Router::add('/' . RTR_PROJSLUG . '/settings/custom_fields/([0-9]+)/(edit|delete)', 'traq::controllers::ProjectSettings::CustomFields.$3/$2');
+Router::add('/' . PROJECT_SLUG . '/settings', 'traq::controllers::ProjectSettings::Options.index');
+Router::add('/' . PROJECT_SLUG . '/settings/(milestones|components|members|repositories)', 'traq::controllers::ProjectSettings::$2.index');
+Router::add('/' . PROJECT_SLUG . '/settings/(milestones|components|members|repositories)/new', 'traq::controllers::ProjectSettings::$2.new');
+Router::add('/' . PROJECT_SLUG . '/settings/(milestones|components|members)/([0-9]+)/(edit|delete)', 'traq::controllers::ProjectSettings::$2.$4/$3');
+Router::add('/' . PROJECT_SLUG . '/settings/custom_fields', 'traq::controllers::ProjectSettings::CustomFields.index');
+Router::add('/' . PROJECT_SLUG . '/settings/custom_fields/new', 'traq::controllers::ProjectSettings::CustomFields.new');
+Router::add('/' . PROJECT_SLUG . '/settings/custom_fields/([0-9]+)/(edit|delete)', 'traq::controllers::ProjectSettings::CustomFields.$3/$2');
 
-Router::add('/' . RTR_PROJSLUG . '/settings/members/save', 'traq::controllers::ProjectSettings::Members.save');
+Router::add('/' . PROJECT_SLUG . '/settings/members/save', 'traq::controllers::ProjectSettings::Members.save');
 
 // Project permission routes
-Router::add('/' . RTR_PROJSLUG . '/settings/permissions/(groups|roles)', 'traq::controllers::ProjectSettings::Permissions.index/$2');
+Router::add('/' . PROJECT_SLUG . '/settings/permissions/(groups|roles)', 'traq::controllers::ProjectSettings::Permissions.index/$2');
 
 // Subscription routes
-Router::add('/' . RTR_PROJSLUG . '/(?:un)?subscribe', 'traq::controllers::Subscriptions.toggle/project,$1');
-Router::add('/' . RTR_PROJSLUG . '/milestone/(?P<milestone_slug>[a-zA-Z0-9\-_.]+?)/(?:un)?subscribe', 'traq::controllers::Subscriptions.toggle/milestone,$2');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P<ticket_id>[0-9]+)/(?:un)?subscribe', 'traq::controllers::Subscriptions.toggle/ticket,$2');
+Router::add('/' . PROJECT_SLUG . '/(?:un)?subscribe', 'traq::controllers::Subscriptions.toggle/project,$1');
+Router::add('/' . PROJECT_SLUG . '/milestone/(?P<milestone_slug>[a-zA-Z0-9\-_.]+?)/(?:un)?subscribe', 'traq::controllers::Subscriptions.toggle/milestone,$2');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P<ticket_id>[0-9]+)/(?:un)?subscribe', 'traq::controllers::Subscriptions.toggle/ticket,$2');
 
 // ------------------------------------------------
 // AdminCP routes
diff --git a/vendor/traq/controllers/tickets.php b/vendor/traq/controllers/tickets.php
index 21f1b58c5..18561f885 100644
--- a/vendor/traq/controllers/tickets.php
+++ b/vendor/traq/controllers/tickets.php
@@ -97,26 +97,6 @@ public function action_index()
             }
         }
 
-        // Any filters stored in the session?
-        if (!count($filter_query->filters())
-        && isset($_SESSION['ticket_filters'])
-        && isset($_SESSION['ticket_filters'][$this->project->id])) {
-            foreach (explode('&', $_SESSION['ticket_filters'][$this->project->id]) as $filter_value) {
-                if (strpos($filter_value, '=')) {
-                    $filter_value = explode('=', $filter_value);
-                    if (in_array($filter_value[0], array_keys(ticket_filters_for($this->project)))) {
-                        $value = isset($filter_value[1]) ? explode(',', urldecode($filter_value[1])) : array();
-                        $filter_query->process($filter_value[0], $value);
-                    }
-                }
-            }
-        } else {
-            $_SESSION['ticket_filters'][$this->project->id] = Request::$query;
-        }
-
-        // Send filters to the view
-        View::set('filters', $filter_query->filters());
-
         // Fetch tickets
         $tickets = [];
         $rows = $this->db->select('tickets.*')->from('tickets')->custom_sql($filter_query->sql());
@@ -390,7 +370,7 @@ public function action_new()
             // Check if the ticket data is valid...
             // if it is, save the ticket to the DB and
             // redirect to the ticket page.
-            if (check_ticket_creation_delay($ticket) and $ticket->is_valid()) {
+            if (($this->user->group->is_admin || check_ticket_creation_delay($ticket)) && $ticket->is_valid()) {
                 // Set last ticket creation time
                 $_SESSION['last_ticket_creation'] = time();
 
@@ -805,96 +785,6 @@ public function action_mass_actions()
         Request::redirectTo($this->project->href('tickets'));
     }
 
-    /**
-     * Processes the ticket filters form and
-     * builds the query string.
-     */
-    public function action_update_filters()
-    {
-        $query_string = array();
-
-        // Add filter
-        if (isset(Request::$post['add_filter'])) {
-            $new_filter = Request::$post['new_filter'];
-
-            // Make sure the filter index exists
-            if (!isset(Request::$post['filters'][$new_filter])) {
-                Request::$post['filters'][$new_filter] = array('values' => array());
-            }
-
-            // Add the blank value
-            Request::$post['filters'][$new_filter] = array(
-                'prefix' => '',
-                'values' => array()
-            );
-        }
-
-        foreach (Request::post('filters', array()) as $name => $filter) {
-            // Don't bother if this isn't a valid filter.
-            if (!in_array($name, array_keys(ticket_filters_for($this->project)))) {
-                continue;
-            }
-
-            // Process filters
-            switch ($name) {
-                // Summary, description,
-                // owner and assigned to
-                case 'summary':
-                case 'description':
-                case 'owner':
-                case 'assigned_to':
-                case 'search':
-                    $values = array();
-                    foreach ($filter['values'] as $value) {
-                        $values[] = urlencode($value);
-                    }
-                    $query_string[] = "{$name}=" . $filter['prefix'] . implode(',', $values);
-                    break;
-
-                // Milestone, version, type,
-                // status and component
-                case 'milestone':
-                case 'version':
-                case 'type':
-                case 'status':
-                case 'component':
-                case 'priority':
-                case 'severity':
-                    // Class name
-                    $class = '\\traq\\models\\' . ucfirst($name == 'version' ? 'milestone' : $name);
-
-                    switch ($name) {
-                        case 'milestone':
-                        case 'version':
-                            $field = 'slug';
-                            break;
-
-                        default:
-                            $field = 'name';
-                            break;
-                    }
-
-                    // Values
-                    $values = array();
-                    foreach ($filter['values'] as $value) {
-                        $values[] = urlencode($class::find($value)->{$field});
-                    }
-
-                    $query_string[] = "{$name}=" . $filter['prefix'] . implode(',', $values);
-                    break;
-            }
-
-            // Process custom field filters
-            if ($field = CustomField::find('slug', $name)) {
-                $query_string[] = "{$field->slug}={$filter['prefix']}" . implode(',', $filter['values']);
-            }
-        }
-
-        // Save to session and redirect
-        $_SESSION['ticket_filters'][$this->project->id] = implode('&', $query_string);
-        Request::redirectTo($this->project->href('tickets') . '?' . implode('&', $query_string));
-    }
-
     /**
      * Used to check the permission for the requested action.
      */
diff --git a/vendor/traq/helpers/tickets.php b/vendor/traq/helpers/tickets.php
index 38cb02851..e8dd43ffa 100644
--- a/vendor/traq/helpers/tickets.php
+++ b/vendor/traq/helpers/tickets.php
@@ -396,29 +396,6 @@ function ticket_filter_options_for($filter, $project_id = null) {
     return $options;
 }
 
-/**
- * Ticket listing sort indicator.
- *
- * @param string $column
- */
-function ticketlist_sort_indicator($column)
-{
-    // Default
-    $order = 'priority_id.ASC';
-
-    // Check if order_by is set, and use it if it is
-    if (isset(Request::$request['order_by'])) {
-        $order = Request::$request['order_by'];
-    }
-
-    // Split column and order
-    $order = explode('.', $order);
-
-    if ($column == $order[0]) {
-        return View::render('tickets/_sort_indicator', array('order' => strtolower($order[1])));
-    }
-}
-
 /**
  * Returns a list of available ticket history sorting options
  * for use with the `Form::select` helper.
diff --git a/vendor/traq/views/default/css/default.css b/vendor/traq/views/default/css/default.css
index 583ed20fb..3cda71738 100644
--- a/vendor/traq/views/default/css/default.css
+++ b/vendor/traq/views/default/css/default.css
@@ -35,4 +35,4 @@
  * Copyright (c) 2012 Jack P.
  * All Rights Reserved
  * https://github.com/nirix
- */#sexytooltip{display:none;position:absolute;border-radius:4px;z-index:2100;background:rgba(0,0,0,.7);color:#fff;padding:4px;font-size:11px;max-width:300px}#sexytooltip code{background:#555;border-color:#a3a3a3}#sexytooltip.sexytooltip-right:before,#sexytooltip.sexytooltip-right:after{right:100%;border:solid rgba(0,0,0,0);content:" ";height:0;width:0;position:absolute;pointer-events:none}#sexytooltip.sexytooltip-right:before{border-right-color:rgba(0,0,0,.7);border-width:6px;top:50%;margin-top:-6px}#sexytooltip.sexytooltip-top:before,#sexytooltip.sexytooltip-top:after{top:100%;border:solid rgba(0,0,0,0);content:" ";height:0;width:0;position:absolute;pointer-events:none}#sexytooltip.sexytooltip-top:before{border-top-color:rgba(0,0,0,.7);border-width:6px;left:10px;margin-left:-6px}.admin.content h3{margin-bottom:0;line-height:1}.admin.content dl{margin:0}.admin.content dl:after{display:table;content:"";line-height:0;clear:both}.admin.content dl dt{float:left;clear:both}.admin.content dl dd{float:right}.admin.content #update{text-align:center}#traq_news{width:100%;margin-top:10px}#traq_news ul{margin:0;padding:0;list-style:none}#traq_news ul h4{margin:0;font-weight:bold;font-size:16px;display:inline-block;margin-right:10px}#traq_news .secure_alert{display:none}.button_new,.button_edit,.button_delete,.button_move,.btn_plugin_enable,.btn_plugin_disable,.btn_plugin_install,.btn_plugin_uninstall,.button_bug_new,.button_previous,.button_revisions{padding:1px 0 1px 20px;background-position:left center;background-repeat:no-repeat}.button_new.small,.button_edit.small,.button_delete.small,.button_move.small,.btn_plugin_enable.small,.btn_plugin_disable.small,.btn_plugin_install.small,.btn_plugin_uninstall.small,.button_bug_new.small,.button_previous.small,.button_revisions.small{background-position:center;padding:0;height:18px;width:18px;text-indent:-5000px;display:inline-block;margin:0}.button_next{padding:1px 20px 1px 0;background-position:right center;background-repeat:no-repeat}.button_new{background-image:url(":baseuri:assets/images/add.png")}.button_edit{background-image:url(":baseuri:assets/images/pencil.png")}.button_delete{background-image:url(":baseuri:assets/images/delete.png")}.btn_plugin_enable{background-image:url(":baseuri:assets/images/plug-connect.png")}.btn_plugin_disable{background-image:url(":baseuri:assets/images/plug-disconnect.png")}.btn_plugin_install{background-image:url(":baseuri:assets/images/plug-plus.png")}.btn_plugin_uninstall{background-image:url(":baseuri:assets/images/plug-minus.png")}.button_bug_new{background-image:url(":baseuri:assets/images/bug_add.png")}.button_move{background-image:url(":baseuri:assets/images/arrow_left.png")}.button_next{background-image:url(":baseuri:assets/images/arrow_right.png")}.button_previous{background-image:url(":baseuri:assets/images/arrow_left.png")}.button_revisions{background-image:url(":baseuri:assets/images/page_white_stack.png")}button.button_new,button.button_delete,.icon_only.button_new,.icon_only.button_delete{border:0;text-indent:-5000px;background-color:rgba(0,0,0,0);cursor:pointer}.icon_only span{display:none}.tabular .group{margin:0;padding:5px 0;padding-left:150px;clear:left}.tabular .group label:first-child{font-weight:bold;float:left;margin-left:-145px;text-align:right;width:135px}.tabular input{margin-top:0px;vertical-align:middle}.tabular select{margin-top:0}.usercp.content fieldset .tabular .group{padding-left:200px}.usercp.content fieldset .tabular .group label:first-child{margin-left:-200px;width:195px}form.horizontal .group{width:auto;padding:0 4px;display:table-cell;padding-right:15px}form.horizontal label{margin-right:5px}.error ul,.success ul,.notice ul,.info ul{margin-bottom:0}form .actions{text-align:center;padding:4px 0}form abbr{border-radius:15px;background:#d5edf8;color:#205791;border:1px solid #92cae4;padding:0 5px;cursor:help}form abbr.hint{background:rgba(0,0,0,0);border:0;border-bottom:1px dotted #666;padding:0;margin-left:4px;border-radius:0}form select{margin-top:0}form textarea{height:150px;width:98%}#register_form .box{margin-bottom:10px}input[type=text],input[type=password],input[type=email],input[type=url],textarea{padding:2px;font-size:12px}input[type=text]:focus,input[type=password]:focus,input[type=email]:focus,input[type=url]:focus,textarea:focus{border-color:#3478aa}input[type=text].error,input[type=password].error,input[type=email].error,input[type=url].error,textarea.error{color:#8a1f11;border:1px solid red;background-color:#fff;padding:2px}input[type=text],input[type=password],input[type=email],input[type=url]{width:200px}.overlay_thin input[type=text],.overlay_thin input[type=password],.overlay_thin input[type=email],.overlay_thin input[type=url]{width:120px}.tabular .summary input{width:300px}.tabular .properties .field{float:left;width:335px;min-height:27px}.tabular .properties .field button{margin:0;margin-bottom:.5em}#overlay form{margin:0;width:600px}#overlay form textarea{width:95%}#overlay form.overlay_thin{width:100%;min-width:300px}#overlay form .actions,#overlay .overlay-actions{text-align:center;padding:4px 0;background-color:#f6f6f6;border-radius:0 0 4px 4px}#overlay #ticket_tasks_manager{padding:10px}#ticket_tasks_data{display:none}.popover_confirm{padding:5px;text-align:center}.progress_bar{width:400px;border:1px solid #d7d7d7;float:left;margin:2px 0;margin-right:5px}.progress_bar td{padding:0}.progress_bar .closed{background:#bae0ba}.progress_bar .open a,.progress_bar .closed a{display:block;padding:6px 0}.progress{margin-bottom:5px}.progress .percent_complete{margin:0 5px;font-size:12px;display:block}.progress .progress_info{font-style:italic}.progress .progress_info a{margin-right:5px;color:#aaa;text-decoration:none}.progress .progress_info a:hover{text-decoration:underline}.profile.content .span-16{width:665px}.profile.content .sidebar .box{margin-bottom:5px}.profile.content .sidebar .box:last-child{margin-bottom:0}.profile.content .sidebar .information dl{margin:0}.profile.content .sidebar .information dl dt{min-width:100px;text-align:right;margin:0;margin-right:2px;display:inline-block}.profile.content .sidebar .information dl dd{width:auto;min-width:50px;margin:0;display:inline-block}.profile.content #assigned_to table.list th.project{width:90px}.profile.content #assigned_to table.list th.owner{width:85px}.profile.content #assigned_to table.list th.status{width:75px}.profile.content #assigned_to table.list th.created,.profile.content #assigned_to table.list th.updated{width:90px}#project_list{margin:0;padding:0;list-style:none}#project_list li h3{margin:0;margin-top:10px}#project_list li h3 em{font-size:14px}#project_list li nav ul{list-style:none;padding:0;margin:0}#project_list li nav ul li{display:inline;margin-right:4px}.project_info{margin-top:10px}#project_wiki_nav{padding-top:5px}.roadmap #milestones{margin:0;padding:0;list-style:none;margin-top:15px}.roadmap #milestones li.milestone{margin-top:15px}.roadmap #milestones li.milestone:first-child{margin-top:0px}.roadmap #milestones li.milestone p{margin-bottom:5px}.roadmap #milestones h3{font-weight:bold}.roadmap #milestones h3 a{text-decoration:none}#ticket_filters,#ticket_columns{padding:0;margin:0}#ticket_filters legend,#ticket_columns legend{color:#999;margin:0 5px;padding:0 2px}#ticket_filters table,#ticket_columns table{margin:0}#ticket_filters table td,#ticket_columns table td{vertical-align:top}#ticket_filters table td.label,#ticket_columns table td.label{font-weight:bold;text-align:right;width:100px}#ticket_filters table td.condition,#ticket_columns table td.condition{width:120px}#ticket_filters table td.value .multiselect,#ticket_columns table td.value .multiselect{width:200px}#ticket_filters table td.ticket_filter_action,#ticket_columns table td.ticket_filter_action{text-align:right}#ticket_filters table #ticket_filter_actions,#ticket_columns table #ticket_filter_actions{text-align:right}#ticket_columns{margin-top:10px}#ticket_columns_content{padding:10px;display:none}#ticket_columns_content .actions{text-align:left;padding-top:5px;padding-bottom:0}#ticket_info{background:#ffd;border-bottom:2px solid #dd9;padding:5px}#ticket_info .ticket_actions{float:right}#ticket_info .properties .property{width:227px;margin-right:10px;float:left;border-bottom:1px solid #dd9}#ticket_info .properties .property label{color:#663}#ticket_info .properties .property div.value,#ticket_info .properties .property span.value,#ticket_info .properties .property ul.value{float:right}#ticket_info .properties .property:nth-child(4n){margin-right:0px}#ticket_info .properties .property ul{display:inline-block;margin:0;padding:0;list-style-type:none}#ticket_info .properties .property ul li{display:inline}#ticket_info #description h3,#ticket_info #attachments h3,#ticket_info #tasks h3{margin-top:5px;display:block;font-weight:bold;color:#663;border-bottom:1px solid #dd9;padding-bottom:2px}#ticket_info #attachments ul,#ticket_info #tasks ul{margin:0}#ticket_info #tasks ul{list-style:none;padding:0}#ticket_info #tasks label{font-weight:normal}#ticket_summary{margin:0;font-size:20px}#ticket_info h3{border-bottom:1px solid #dd9;color:#663;margin:0;margin-bottom:5px;font-size:100%;font-weight:normal}#ticket_history{border-bottom:1px solid #3478aa;margin-bottom:5px}#ticket_history h3{margin-top:5px;padding:10px;padding-bottom:0}#ticket_history .update h4{background:#3478aa;color:#fff;padding:4px 15px;margin:0;margin-top:10px;margin-bottom:10px;font-weight:bold}#ticket_history .update h4 a{color:#fff}#ticket_history .update .changes{margin:4px 0px 4px 15px}#ticket_history .update .comment{padding:0 10px 0px 15px}#ticket_history .update .comment p:last-child{margin-bottom:0}#ticket_history .update:first-child h4{margin-top:0}#ticket_history .update:last-child{padding-bottom:10px}#ticket_history .ticket_history_to,#ticket_history .ticket_history_from{font-family:Courier,"Courier New",monospace;background:#f6f6f6;border:1px solid #e4e4e4;padding:0 2px}.attachment_filename{font-family:Courier,"Courier New",monospace}#popover .voters{list-style:none;padding-left:5px}#voters_list{width:500px;max-height:300px;overflow:scroll;padding:5px;margin:5px}#voters_list li{display:inline}table.ticket_listing th.mass_actions{width:18px}#mass_actions{display:none}.sort_indicator{float:right;position:relative;top:7px;left:-2px}.sort_indicator.asc,.sort_indicator.desc{position:relative;background:#fff}.sort_indicator.asc:after,.sort_indicator.desc:after{border:solid rgba(0,0,0,0);content:" ";height:0;width:0;position:absolute;pointer-events:none;border-color:rgba(255,255,255,0);border-width:5px;left:50%;margin-left:-5px}.sort_indicator.asc{top:12px}.sort_indicator.asc:after{bottom:100%;border-bottom-color:#fff}.sort_indicator.desc:after{top:100%;border-top-color:#fff}.timeline.content h3{margin-top:15px}.timeline.content dl dt{font-weight:normal}.timeline.content dl dt .time{color:#777}.timeline.content .timeline_filters{width:180px;float:right}.timeline.content fieldset{padding:5px 10px;padding-bottom:0}.timeline.content fieldset .actions{margin-top:5px}.wiki.content #page_title{margin-bottom:10px}.wiki.content #head{height:28px;margin-bottom:10px}.wiki.content #head h2{float:left;margin-bottom:0}.wiki.content #head #wiki_actions{float:right;list-style:none;margin:0;padding:0}.wiki.content #head #wiki_actions li{margin-left:5px;display:inline}.wiki.content #head #wiki_actions a{font-weight:bold}.wiki.content ul#pages li a{text-decoration:none;font-size:14px;font-weight:bold}/*# sourceMappingURL=default.css.map */
+ */#sexytooltip{display:none;position:absolute;border-radius:4px;z-index:2100;background:rgba(0,0,0,.7);color:#fff;padding:4px;font-size:11px;max-width:300px}#sexytooltip code{background:#555;border-color:#a3a3a3}#sexytooltip.sexytooltip-right:before,#sexytooltip.sexytooltip-right:after{right:100%;border:solid rgba(0,0,0,0);content:" ";height:0;width:0;position:absolute;pointer-events:none}#sexytooltip.sexytooltip-right:before{border-right-color:rgba(0,0,0,.7);border-width:6px;top:50%;margin-top:-6px}#sexytooltip.sexytooltip-top:before,#sexytooltip.sexytooltip-top:after{top:100%;border:solid rgba(0,0,0,0);content:" ";height:0;width:0;position:absolute;pointer-events:none}#sexytooltip.sexytooltip-top:before{border-top-color:rgba(0,0,0,.7);border-width:6px;left:10px;margin-left:-6px}.admin.content h3{margin-bottom:0;line-height:1}.admin.content dl{margin:0}.admin.content dl:after{display:table;content:"";line-height:0;clear:both}.admin.content dl dt{float:left;clear:both}.admin.content dl dd{float:right}.admin.content #update{text-align:center}#traq_news{width:100%;margin-top:10px}#traq_news ul{margin:0;padding:0;list-style:none}#traq_news ul h4{margin:0;font-weight:bold;font-size:16px;display:inline-block;margin-right:10px}#traq_news .secure_alert{display:none}.button_new,.button_edit,.button_delete,.button_move,.btn_plugin_enable,.btn_plugin_disable,.btn_plugin_install,.btn_plugin_uninstall,.button_bug_new,.button_previous,.button_revisions{padding:1px 0 1px 20px;background-position:left center;background-repeat:no-repeat}.button_new.small,.button_edit.small,.button_delete.small,.button_move.small,.btn_plugin_enable.small,.btn_plugin_disable.small,.btn_plugin_install.small,.btn_plugin_uninstall.small,.button_bug_new.small,.button_previous.small,.button_revisions.small{background-position:center;padding:0;height:18px;width:18px;text-indent:-5000px;display:inline-block;margin:0}.button_next{padding:1px 20px 1px 0;background-position:right center;background-repeat:no-repeat}.button_new{background-image:url(":baseuri:assets/images/add.png")}.button_edit{background-image:url(":baseuri:assets/images/pencil.png")}.button_delete{background-image:url(":baseuri:assets/images/delete.png")}.btn_plugin_enable{background-image:url(":baseuri:assets/images/plug-connect.png")}.btn_plugin_disable{background-image:url(":baseuri:assets/images/plug-disconnect.png")}.btn_plugin_install{background-image:url(":baseuri:assets/images/plug-plus.png")}.btn_plugin_uninstall{background-image:url(":baseuri:assets/images/plug-minus.png")}.button_bug_new{background-image:url(":baseuri:assets/images/bug_add.png")}.button_move{background-image:url(":baseuri:assets/images/arrow_left.png")}.button_next{background-image:url(":baseuri:assets/images/arrow_right.png")}.button_previous{background-image:url(":baseuri:assets/images/arrow_left.png")}.button_revisions{background-image:url(":baseuri:assets/images/page_white_stack.png")}button.button_new,button.button_delete,.icon_only.button_new,.icon_only.button_delete{border:0;text-indent:-5000px;background-color:rgba(0,0,0,0);cursor:pointer}.icon_only span{display:none}.tabular .group{margin:0;padding:5px 0;padding-left:150px;clear:left}.tabular .group label:first-child{font-weight:bold;float:left;margin-left:-145px;text-align:right;width:135px}.tabular input{margin-top:0px;vertical-align:middle}.tabular select{margin-top:0}.usercp.content fieldset .tabular .group{padding-left:200px}.usercp.content fieldset .tabular .group label:first-child{margin-left:-200px;width:195px}form.horizontal .group{width:auto;padding:0 4px;display:table-cell;padding-right:15px}form.horizontal label{margin-right:5px}.error ul,.success ul,.notice ul,.info ul{margin-bottom:0}form .actions{text-align:center;padding:4px 0}form abbr{border-radius:15px;background:#d5edf8;color:#205791;border:1px solid #92cae4;padding:0 5px;cursor:help}form abbr.hint{background:rgba(0,0,0,0);border:0;border-bottom:1px dotted #666;padding:0;margin-left:4px;border-radius:0}form select{margin-top:0}form textarea{height:150px;width:98%}#register_form .box{margin-bottom:10px}input[type=text],input[type=password],input[type=email],input[type=url],textarea{padding:2px;font-size:12px}input[type=text]:focus,input[type=password]:focus,input[type=email]:focus,input[type=url]:focus,textarea:focus{border-color:#3478aa}input[type=text].error,input[type=password].error,input[type=email].error,input[type=url].error,textarea.error{color:#8a1f11;border:1px solid red;background-color:#fff;padding:2px}input[type=text],input[type=password],input[type=email],input[type=url]{width:200px}.overlay_thin input[type=text],.overlay_thin input[type=password],.overlay_thin input[type=email],.overlay_thin input[type=url]{width:120px}.tabular .summary input{width:300px}.tabular .properties .field{float:left;width:335px;min-height:27px}.tabular .properties .field button{margin:0;margin-bottom:.5em}#overlay form{margin:0;width:600px}#overlay form textarea{width:95%}#overlay form.overlay_thin{width:100%;min-width:300px}#overlay form .actions,#overlay .overlay-actions{text-align:center;padding:4px 0;background-color:#f6f6f6;border-radius:0 0 4px 4px}#overlay #ticket_tasks_manager{padding:10px}#ticket_tasks_data{display:none}.popover_confirm{padding:5px;text-align:center}.progress_bar{width:400px;border:1px solid #d7d7d7;float:left;margin:2px 0;margin-right:5px}.progress_bar td{padding:0}.progress_bar .closed{background:#bae0ba}.progress_bar .open a,.progress_bar .closed a{display:block;padding:6px 0}.progress{margin-bottom:5px}.progress .percent_complete{margin:0 5px;font-size:12px;display:block}.progress .progress_info{font-style:italic}.progress .progress_info a{margin-right:5px;color:#aaa;text-decoration:none}.progress .progress_info a:hover{text-decoration:underline}.profile.content .span-16{width:665px}.profile.content .sidebar .box{margin-bottom:5px}.profile.content .sidebar .box:last-child{margin-bottom:0}.profile.content .sidebar .information dl{margin:0}.profile.content .sidebar .information dl dt{min-width:100px;text-align:right;margin:0;margin-right:2px;display:inline-block}.profile.content .sidebar .information dl dd{width:auto;min-width:50px;margin:0;display:inline-block}.profile.content #assigned_to table.list th.project{width:90px}.profile.content #assigned_to table.list th.owner{width:85px}.profile.content #assigned_to table.list th.status{width:75px}.profile.content #assigned_to table.list th.created,.profile.content #assigned_to table.list th.updated{width:90px}#project_list{margin:0;padding:0;list-style:none}#project_list li h3{margin:0;margin-top:10px}#project_list li h3 em{font-size:14px}#project_list li nav ul{list-style:none;padding:0;margin:0}#project_list li nav ul li{display:inline;margin-right:4px}.project_info{margin-top:10px}#project_wiki_nav{padding-top:5px}.roadmap #milestones{margin:0;padding:0;list-style:none;margin-top:15px}.roadmap #milestones li.milestone{margin-top:15px}.roadmap #milestones li.milestone:first-child{margin-top:0px}.roadmap #milestones li.milestone p{margin-bottom:5px}.roadmap #milestones h3{font-weight:bold}.roadmap #milestones h3 a{text-decoration:none}#ticket_info{background:#ffd;border-bottom:2px solid #dd9;padding:5px}#ticket_info .ticket_actions{float:right}#ticket_info .properties .property{width:227px;margin-right:10px;float:left;border-bottom:1px solid #dd9}#ticket_info .properties .property label{color:#663}#ticket_info .properties .property div.value,#ticket_info .properties .property span.value,#ticket_info .properties .property ul.value{float:right}#ticket_info .properties .property:nth-child(4n){margin-right:0px}#ticket_info .properties .property ul{display:inline-block;margin:0;padding:0;list-style-type:none}#ticket_info .properties .property ul li{display:inline}#ticket_info #description h3,#ticket_info #attachments h3,#ticket_info #tasks h3{margin-top:5px;display:block;font-weight:bold;color:#663;border-bottom:1px solid #dd9;padding-bottom:2px}#ticket_info #attachments ul,#ticket_info #tasks ul{margin:0}#ticket_info #tasks ul{list-style:none;padding:0}#ticket_info #tasks label{font-weight:normal}#ticket_summary{margin:0;font-size:20px}#ticket_info h3{border-bottom:1px solid #dd9;color:#663;margin:0;margin-bottom:5px;font-size:100%;font-weight:normal}#ticket_history{border-bottom:1px solid #3478aa;margin-bottom:5px}#ticket_history h3{margin-top:5px;padding:10px;padding-bottom:0}#ticket_history .update h4{background:#3478aa;color:#fff;padding:4px 15px;margin:0;margin-top:10px;margin-bottom:10px;font-weight:bold}#ticket_history .update h4 a{color:#fff}#ticket_history .update .changes{margin:4px 0px 4px 15px}#ticket_history .update .comment{padding:0 10px 0px 15px}#ticket_history .update .comment p:last-child{margin-bottom:0}#ticket_history .update:first-child h4{margin-top:0}#ticket_history .update:last-child{padding-bottom:10px}#ticket_history .ticket_history_to,#ticket_history .ticket_history_from{font-family:Courier,"Courier New",monospace;background:#f6f6f6;border:1px solid #e4e4e4;padding:0 2px}.attachment_filename{font-family:Courier,"Courier New",monospace}#popover .voters{list-style:none;padding-left:5px}#voters_list{width:500px;max-height:300px;overflow:scroll;padding:5px;margin:5px}#voters_list li{display:inline}table.ticket_listing th.mass_actions{width:18px}#mass_actions{display:none}.timeline.content h3{margin-top:15px}.timeline.content dl dt{font-weight:normal}.timeline.content dl dt .time{color:#777}.timeline.content .timeline_filters{width:180px;float:right}.timeline.content fieldset{padding:5px 10px;padding-bottom:0}.timeline.content fieldset .actions{margin-top:5px}.wiki.content #page_title{margin-bottom:10px}.wiki.content #head{height:28px;margin-bottom:10px}.wiki.content #head h2{float:left;margin-bottom:0}.wiki.content #head #wiki_actions{float:right;list-style:none;margin:0;padding:0}.wiki.content #head #wiki_actions li{margin-left:5px;display:inline}.wiki.content #head #wiki_actions a{font-weight:bold}.wiki.content ul#pages li a{text-decoration:none;font-size:14px;font-weight:bold}/*# sourceMappingURL=default.css.map */
diff --git a/vendor/traq/views/default/css/default.css.map b/vendor/traq/views/default/css/default.css.map
index dc0897e47..428adf9cb 100644
--- a/vendor/traq/views/default/css/default.css.map
+++ b/vendor/traq/views/default/css/default.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../../../../../_dev/css/default.scss","../../../../../_dev/css/_nav.scss","../../../../../_dev/css/_tables.scss","../../../../../_dev/css/_tabs.scss","../../../../../_dev/css/_jquery.scss","../../../../../_dev/css/_likeaboss.scss","../../../../../_dev/css/_popover.scss","../../../../../_dev/css/_overlay.scss","../../../../../_dev/css/_sexytooltips.scss","../../../../../_dev/css/_admin.scss","../../../../../_dev/css/_buttons.scss","../../../../../_dev/css/_forms.scss","../../../../../_dev/css/_milestones.scss","../../../../../_dev/css/_profiles.scss","../../../../../_dev/css/_projects.scss","../../../../../_dev/css/_roadmap.scss","../../../../../_dev/css/_ticket_filters.scss","../../../../../_dev/css/_tickets.scss","../../../../../_dev/css/_timeline.scss","../../../../../_dev/css/_wiki.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAwBA,GACI,gBAGJ,EACI,mBAEA,aACI,gBAMR,GACI,gBAGJ,GACI,kBAMJ,QAEI,WACA,aAEA,WACI,qBACA,WACA,SAEA,aACI,WACA,qBAIR,8BACI,aACA,kBACA,gBACA,gBACA,YACA,WAEA,qCACI,qBACA,gBACA,YACA,kBAEA,wCACI,cACA,oCACA,qCACA,6BAKZ,0BACI,gBACA,gBAIR,QACI,YAKJ,iBAEI,mBACA,yBACA,YACA,gBAEA,uCACI,eACA,gBAIR,qBACI,mBAEA,gCACI,gBAIR,cACI,YAIA,uBACI,WAGJ,uBACI,YAMR,QACI,WACA,YAKJ,KACI,yBACA,sBACA,kBACA,YAGJ,IACI,yBACA,sBACA,kBACA,YACA,qBAEA,SACI,+BACA,SACA,gBACA,UAOJ,sCACI,mBACA,WAEA,yDACI,mBAQR,+CACI,YACA,UAGJ,sBACI,WAGJ,yBACI,YAOJ,8BACI,gBAEA,iCACI,gBACA,iBAGI,2CACI,iBACA,UACA,kBACA,qBCjNpB,KAGI,YACA,cAEA,QACI,SACA,UACA,gBAGJ,QACI,eAGJ,OACI,WACA,iBACA,qBAGJ,yDACI,gBACA,WCxBR,cACI,eAGJ,YACI,gBAKI,4CACI,YAGJ,0CACI,YAKZ,WACI,SAGJ,SACI,mBACA,WAEA,WACI,WAGJ,gCACI,WCjCR,MACI,YACA,kBACA,gBAEA,SACI,SACA,kBACA,kBACA,aACA,6BACA,gBAEA,YACI,WACA,mBACA,iBACA,kBACA,mBAEA,cACI,cACA,qBACA,+BACA,iBACA,0BACA,cACA,iBAEA,oBACI,mBAIR,yCACI,sBAGJ,qBACI,gBAGJ,qBACI,WACA,yBC5ChB,iBACI,kBACA,eACA,yBACA,gBACA,wCAGJ,SACI,gBACA,YACA,SACA,cACA,WAEA,kBACI,gBAGJ,uBACI,SACA,UACA,WACA,WACA,WAEA,yBACI,qBACA,cACA,YACA,cACA,WAEA,iFAEI,gBAMhB,6BACI,aAGJ,eACI,kBACA,yBACA,gBACA,wCAEA,sEAEI,eACA,sBACA,2BACA,4BACA,oBAGJ,mCACI,WACA,gBACA,8DAGJ,mCACI,YACA,iBACA,+DAGJ,oCACI,kBACA,WAGJ,uCACI,SAEA,0CACI,kBACA,YAIR,0CACI,mBAEA,4CACI,WC5FZ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAUI,wCACI,YACA,mBAIA,0CACI,oBACA,cACA,WACA,YACA,WACA,sBACA,yBACA,2BACA,4BACA,gBACA,iBAEA,gDACI,yBAIR,sDACI,kEAGJ,sDACI,kEAGJ,sDACI,kEAGJ,wDACI,6DAGJ,0DACI,+DAGJ,+DACI,qEAGJ,+DACI,qEAGJ,wDACI,wDAGJ,yDACI,2DAGJ,wDACI,+DCvEZ;AAAA;AAAA;AAAA;AAAA;AAAA,GAOA,SACI,aACA,kBACA,kBACA,wBACA,aACA,gBACA,WACA,UACA,eAEA,0BACI,YAGJ,yBACI,mBACA,YACA,kBACA,0BAGJ,wBACI,gBAGJ,+BACI,YACA,2BACA,YACA,SACA,QACA,kBACA,oBAGJ,gBACI,yBACA,WACA,iBACA,SACA,iBAGJ,eACI,yBACA,iBACA,SACA,iBCvDR,SACI,aACA,eACA,kBACA,wBACA,aACA,gBACA,WACA,UAEA,kBACI,aAGJ,YACI,mBACA,WACA,gBACA,0BACA,SAGJ,cACI,SACA,yBACA,aCzBR;AAAA;AAAA;AAAA;AAAA;AAAA,GAOA,aACI,aACA,kBACA,kBACA,aACA,0BACA,WACA,YACA,eACA,gBAEA,kBACI,gBACA,qBAIA,2EACI,WACA,2BACA,YACA,SACA,QACA,kBACA,oBAGJ,sCACI,kCACA,iBACA,QACA,gBAKJ,uEACI,SACA,2BACA,YACA,SACA,QACA,kBACA,oBAGJ,oCACI,gCACA,iBACA,UACA,iBCrDJ,kBACI,gBACA,cAGJ,kBACI,SAEA,wBACI,cACA,WACA,cACA,WAGJ,qBACI,WACA,WAGJ,qBACI,YAIR,uBACI,kBAKZ,WACI,WACA,gBAEA,cACI,SACA,UACA,gBAEA,iBACI,SACA,iBACA,eACA,qBACA,kBAIR,yBACI,aCrDR,yLAII,uBACA,gCACA,4BAEA,2PACI,2BACA,UACA,YACA,WACA,oBACA,qBACA,SAIR,aACI,uBACA,iCACA,4BAGJ,YACI,uDAGJ,aACI,0DAGJ,eACI,0DAGJ,mBACI,gEAGJ,oBACI,mEAGJ,oBACI,6DAGJ,sBACI,8DAGJ,gBACI,2DAGJ,aACI,8DAGJ,aACI,+DAGJ,iBACI,8DAGJ,kBACI,oEAIA,sFAEI,SACA,oBACA,+BACA,eAKJ,gBACI,aCnFJ,gBACI,SACA,cACA,mBACA,WAEA,kCACI,iBACA,WACA,mBACA,iBACA,YAIR,eACI,eACA,sBAGJ,gBACI,aAKJ,yCACI,mBAEA,2DACI,mBACA,YAMR,uBACI,WACA,cACA,mBACA,mBAGJ,sBACI,iBAKJ,0CACI,gBAKJ,cACI,kBACA,cAGJ,UACI,mBACA,mBACA,cACA,yBACA,cACA,YAEA,eACI,yBACA,SACA,8BACA,UACA,gBACA,gBAIR,YACI,aAGJ,cACI,aACA,UAKJ,oBACI,mBAIR,iFAKI,YACA,eAEA,+GACI,qBAGJ,+GACI,cACA,qBACA,sBACA,YAIR,wEAII,YAIA,gIAII,YAMA,wBACI,YAKJ,4BACI,WACA,YACA,gBAEA,mCACI,SACA,mBAOZ,cACI,SACA,YAEA,uBACI,UAGJ,2BACI,WACA,gBAIR,iDACI,kBACA,cACA,yBACA,0BAGJ,+BACI,aAIR,mBACI,aAGJ,iBACI,YACA,kBC1LJ,cACI,YACA,yBACA,WACA,aACA,iBAEA,iBACI,UAGJ,sBACI,mBAGJ,8CACI,cACA,cAIR,UACI,kBAEA,4BACI,aACA,eACA,cAGJ,yBACI,kBAEA,2BACI,iBACA,WACA,qBAEA,iCACI,0BCtCZ,0BACI,YAIA,+BACI,kBAEA,0CACI,gBAKJ,0CACI,SAEA,6CACI,gBACA,iBACA,SACA,iBACA,qBAGJ,6CACI,WACA,eACA,SACA,qBAQR,oDACI,WAGJ,kDACI,WAGJ,mDACI,WAGJ,wGACI,WCnDhB,cACI,SACA,UACA,gBAGI,oBACI,SACA,gBAEA,uBACI,eAKJ,wBACI,gBACA,UACA,SAEA,2BACI,eACA,iBAOpB,cACI,gBAGJ,kBACI,gBClCA,qBACI,SACA,UACA,gBACA,gBAEA,kCACI,gBAEA,8CACI,eAGJ,oCACI,kBAIR,wBACI,iBAEA,0BACI,qBCvBhB,gCAEI,UACA,SAEA,8CACI,WACA,aACA,cAGJ,4CACI,SAEA,kDACI,mBAEA,8DACI,iBACA,iBACA,YAGJ,sEACI,YAIA,wFACI,YAKR,4FACI,iBAIR,0FACI,iBAKZ,gBACI,gBAGJ,wBACI,aACA,aAEA,iCACI,gBACA,gBACA,iBCxDR,aACI,gBACA,6BACA,YAEA,6BACI,YAIA,mCACI,YACA,kBACA,WACA,6BAEA,yCACI,WAGJ,uIACI,YAGJ,iDACI,iBAGJ,sCACI,qBACA,SACA,UACA,qBAEA,yCACI,eAOZ,iFACI,eACA,cACA,iBACA,WACA,6BACA,mBAKJ,oDACI,SAKJ,uBACI,gBACA,UAGJ,0BACI,mBAKZ,gBACI,SACA,eAGJ,gBACI,6BACA,WACA,SACA,kBACA,eACA,mBAGJ,gBACI,gCACA,kBAEA,mBACI,eACA,aACA,iBAIA,2BACI,mBACA,WACA,iBACA,SACA,gBACA,mBACA,iBAEA,6BACI,WAIR,iCACI,wBAGJ,iCACI,wBAEA,8CACI,gBAKJ,uCACI,aAIR,mCACI,oBAKZ,wEAEI,4CACA,mBACA,yBACA,cAGJ,qBACI,4CAGJ,iBACI,gBACA,iBAGJ,aACI,YACA,iBACA,gBACA,YACA,WAEA,gBACI,eAKJ,qCACI,WAIR,cACI,aAGJ,gBACI,YACA,kBACA,QACA,UAEA,yCACI,kBACA,gBAEA,qDACI,2BACA,YACA,SACA,QACA,kBACA,oBACA,iCACA,iBACA,SACA,iBAIR,oBACI,SAEA,0BACI,YACA,yBAKJ,2BACI,SACA,sBC/MR,qBACI,gBAIA,wBACI,mBAEA,8BACI,WAKZ,oCACI,YACA,YAGJ,2BACI,iBACA,iBAEA,oCACI,eCxBR,0BACI,mBAGJ,oBACI,YACA,mBAEA,uBACI,WACA,gBAGJ,kCACI,YACA,gBACA,SACA,UAEA,qCACI,gBACA,eAGJ,oCACI,iBAMR,4BACI,qBACA,eACA","file":"default.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../../../../../_dev/css/default.scss","../../../../../_dev/css/_nav.scss","../../../../../_dev/css/_tables.scss","../../../../../_dev/css/_tabs.scss","../../../../../_dev/css/_jquery.scss","../../../../../_dev/css/_likeaboss.scss","../../../../../_dev/css/_popover.scss","../../../../../_dev/css/_overlay.scss","../../../../../_dev/css/_sexytooltips.scss","../../../../../_dev/css/_admin.scss","../../../../../_dev/css/_buttons.scss","../../../../../_dev/css/_forms.scss","../../../../../_dev/css/_milestones.scss","../../../../../_dev/css/_profiles.scss","../../../../../_dev/css/_projects.scss","../../../../../_dev/css/_roadmap.scss","../../../../../_dev/css/_tickets.scss","../../../../../_dev/css/_timeline.scss","../../../../../_dev/css/_wiki.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAwBA,GACI,gBAGJ,EACI,mBAEA,aACI,gBAMR,GACI,gBAGJ,GACI,kBAMJ,QAEI,WACA,aAEA,WACI,qBACA,WACA,SAEA,aACI,WACA,qBAIR,8BACI,aACA,kBACA,gBACA,gBACA,YACA,WAEA,qCACI,qBACA,gBACA,YACA,kBAEA,wCACI,cACA,oCACA,qCACA,6BAKZ,0BACI,gBACA,gBAIR,QACI,YAKJ,iBAEI,mBACA,yBACA,YACA,gBAEA,uCACI,eACA,gBAIR,qBACI,mBAEA,gCACI,gBAIR,cACI,YAIA,uBACI,WAGJ,uBACI,YAMR,QACI,WACA,YAKJ,KACI,yBACA,sBACA,kBACA,YAGJ,IACI,yBACA,sBACA,kBACA,YACA,qBAEA,SACI,+BACA,SACA,gBACA,UAOJ,sCACI,mBACA,WAEA,yDACI,mBAQR,+CACI,YACA,UAGJ,sBACI,WAGJ,yBACI,YAOJ,8BACI,gBAEA,iCACI,gBACA,iBAGI,2CACI,iBACA,UACA,kBACA,qBCjNpB,KAGI,YACA,cAEA,QACI,SACA,UACA,gBAGJ,QACI,eAGJ,OACI,WACA,iBACA,qBAGJ,yDACI,gBACA,WCxBR,cACI,eAGJ,YACI,gBAKI,4CACI,YAGJ,0CACI,YAKZ,WACI,SAGJ,SACI,mBACA,WAEA,WACI,WAGJ,gCACI,WCjCR,MACI,YACA,kBACA,gBAEA,SACI,SACA,kBACA,kBACA,aACA,6BACA,gBAEA,YACI,WACA,mBACA,iBACA,kBACA,mBAEA,cACI,cACA,qBACA,+BACA,iBACA,0BACA,cACA,iBAEA,oBACI,mBAIR,yCACI,sBAGJ,qBACI,gBAGJ,qBACI,WACA,yBC5ChB,iBACI,kBACA,eACA,yBACA,gBACA,wCAGJ,SACI,gBACA,YACA,SACA,cACA,WAEA,kBACI,gBAGJ,uBACI,SACA,UACA,WACA,WACA,WAEA,yBACI,qBACA,cACA,YACA,cACA,WAEA,iFAEI,gBAMhB,6BACI,aAGJ,eACI,kBACA,yBACA,gBACA,wCAEA,sEAEI,eACA,sBACA,2BACA,4BACA,oBAGJ,mCACI,WACA,gBACA,8DAGJ,mCACI,YACA,iBACA,+DAGJ,oCACI,kBACA,WAGJ,uCACI,SAEA,0CACI,kBACA,YAIR,0CACI,mBAEA,4CACI,WC5FZ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAUI,wCACI,YACA,mBAIA,0CACI,oBACA,cACA,WACA,YACA,WACA,sBACA,yBACA,2BACA,4BACA,gBACA,iBAEA,gDACI,yBAIR,sDACI,kEAGJ,sDACI,kEAGJ,sDACI,kEAGJ,wDACI,6DAGJ,0DACI,+DAGJ,+DACI,qEAGJ,+DACI,qEAGJ,wDACI,wDAGJ,yDACI,2DAGJ,wDACI,+DCvEZ;AAAA;AAAA;AAAA;AAAA;AAAA,GAOA,SACI,aACA,kBACA,kBACA,wBACA,aACA,gBACA,WACA,UACA,eAEA,0BACI,YAGJ,yBACI,mBACA,YACA,kBACA,0BAGJ,wBACI,gBAGJ,+BACI,YACA,2BACA,YACA,SACA,QACA,kBACA,oBAGJ,gBACI,yBACA,WACA,iBACA,SACA,iBAGJ,eACI,yBACA,iBACA,SACA,iBCvDR,SACI,aACA,eACA,kBACA,wBACA,aACA,gBACA,WACA,UAEA,kBACI,aAGJ,YACI,mBACA,WACA,gBACA,0BACA,SAGJ,cACI,SACA,yBACA,aCzBR;AAAA;AAAA;AAAA;AAAA;AAAA,GAOA,aACI,aACA,kBACA,kBACA,aACA,0BACA,WACA,YACA,eACA,gBAEA,kBACI,gBACA,qBAIA,2EACI,WACA,2BACA,YACA,SACA,QACA,kBACA,oBAGJ,sCACI,kCACA,iBACA,QACA,gBAKJ,uEACI,SACA,2BACA,YACA,SACA,QACA,kBACA,oBAGJ,oCACI,gCACA,iBACA,UACA,iBCrDJ,kBACI,gBACA,cAGJ,kBACI,SAEA,wBACI,cACA,WACA,cACA,WAGJ,qBACI,WACA,WAGJ,qBACI,YAIR,uBACI,kBAKZ,WACI,WACA,gBAEA,cACI,SACA,UACA,gBAEA,iBACI,SACA,iBACA,eACA,qBACA,kBAIR,yBACI,aCrDR,yLAII,uBACA,gCACA,4BAEA,2PACI,2BACA,UACA,YACA,WACA,oBACA,qBACA,SAIR,aACI,uBACA,iCACA,4BAGJ,YACI,uDAGJ,aACI,0DAGJ,eACI,0DAGJ,mBACI,gEAGJ,oBACI,mEAGJ,oBACI,6DAGJ,sBACI,8DAGJ,gBACI,2DAGJ,aACI,8DAGJ,aACI,+DAGJ,iBACI,8DAGJ,kBACI,oEAIA,sFAEI,SACA,oBACA,+BACA,eAKJ,gBACI,aCnFJ,gBACI,SACA,cACA,mBACA,WAEA,kCACI,iBACA,WACA,mBACA,iBACA,YAIR,eACI,eACA,sBAGJ,gBACI,aAKJ,yCACI,mBAEA,2DACI,mBACA,YAMR,uBACI,WACA,cACA,mBACA,mBAGJ,sBACI,iBAKJ,0CACI,gBAKJ,cACI,kBACA,cAGJ,UACI,mBACA,mBACA,cACA,yBACA,cACA,YAEA,eACI,yBACA,SACA,8BACA,UACA,gBACA,gBAIR,YACI,aAGJ,cACI,aACA,UAKJ,oBACI,mBAIR,iFAKI,YACA,eAEA,+GACI,qBAGJ,+GACI,cACA,qBACA,sBACA,YAIR,wEAII,YAIA,gIAII,YAMA,wBACI,YAKJ,4BACI,WACA,YACA,gBAEA,mCACI,SACA,mBAOZ,cACI,SACA,YAEA,uBACI,UAGJ,2BACI,WACA,gBAIR,iDACI,kBACA,cACA,yBACA,0BAGJ,+BACI,aAIR,mBACI,aAGJ,iBACI,YACA,kBC1LJ,cACI,YACA,yBACA,WACA,aACA,iBAEA,iBACI,UAGJ,sBACI,mBAGJ,8CACI,cACA,cAIR,UACI,kBAEA,4BACI,aACA,eACA,cAGJ,yBACI,kBAEA,2BACI,iBACA,WACA,qBAEA,iCACI,0BCtCZ,0BACI,YAIA,+BACI,kBAEA,0CACI,gBAKJ,0CACI,SAEA,6CACI,gBACA,iBACA,SACA,iBACA,qBAGJ,6CACI,WACA,eACA,SACA,qBAQR,oDACI,WAGJ,kDACI,WAGJ,mDACI,WAGJ,wGACI,WCnDhB,cACI,SACA,UACA,gBAGI,oBACI,SACA,gBAEA,uBACI,eAKJ,wBACI,gBACA,UACA,SAEA,2BACI,eACA,iBAOpB,cACI,gBAGJ,kBACI,gBClCA,qBACI,SACA,UACA,gBACA,gBAEA,kCACI,gBAEA,8CACI,eAGJ,oCACI,kBAIR,wBACI,iBAEA,0BACI,qBCvBhB,aACI,gBACA,6BACA,YAEA,6BACI,YAIA,mCACI,YACA,kBACA,WACA,6BAEA,yCACI,WAGJ,uIACI,YAGJ,iDACI,iBAGJ,sCACI,qBACA,SACA,UACA,qBAEA,yCACI,eAOZ,iFACI,eACA,cACA,iBACA,WACA,6BACA,mBAKJ,oDACI,SAKJ,uBACI,gBACA,UAGJ,0BACI,mBAKZ,gBACI,SACA,eAGJ,gBACI,6BACA,WACA,SACA,kBACA,eACA,mBAGJ,gBACI,gCACA,kBAEA,mBACI,eACA,aACA,iBAIA,2BACI,mBACA,WACA,iBACA,SACA,gBACA,mBACA,iBAEA,6BACI,WAIR,iCACI,wBAGJ,iCACI,wBAEA,8CACI,gBAKJ,uCACI,aAIR,mCACI,oBAKZ,wEAEI,4CACA,mBACA,yBACA,cAGJ,qBACI,4CAGJ,iBACI,gBACA,iBAGJ,aACI,YACA,iBACA,gBACA,YACA,WAEA,gBACI,eAKJ,qCACI,WAIR,cACI,aCxKA,qBACI,gBAIA,wBACI,mBAEA,8BACI,WAKZ,oCACI,YACA,YAGJ,2BACI,iBACA,iBAEA,oCACI,eCxBR,0BACI,mBAGJ,oBACI,YACA,mBAEA,uBACI,WACA,gBAGJ,kCACI,YACA,gBACA,SACA,UAEA,qCACI,gBACA,eAGJ,oCACI,iBAMR,4BACI,qBACA,eACA","file":"default.css"}
\ No newline at end of file
diff --git a/vendor/traq/views/default/tickets/_columns.phtml b/vendor/traq/views/default/tickets/_columns.phtml
deleted file mode 100644
index 34e03f331..000000000
--- a/vendor/traq/views/default/tickets/_columns.phtml
+++ /dev/null
@@ -1,18 +0,0 @@
-<form action="<?php echo Request::requestUri(); ?>" method="post">
-	<fieldset id="ticket_columns">
-		<legend><a href="#" onclick="$('#ticket_columns_content').slideToggle(); return false;"><?php echo l('columns'); ?></a></legend>
-		<div id="ticket_columns_content">
-		<?php foreach (ticketlist_allowed_columns() as $column) { ?>
-			<?php echo Form::checkbox("columns[{$column}]", $column, array('checked' => in_array($column, $columns))); ?>
-			<?php echo Form::label(ticketlist_header($column), "columns[{$column}]"); ?>
-		<?php } ?>
-		<?php foreach($custom_fields as $column) { ?>
-			<?php echo Form::checkbox("columns[{$column->id}]", $column->id, array('checked' => in_array($column->name, $columns)))?>
-			<?php echo Form::label($column->name, "columns[{$column->id}]")?>
-		<?php } ?>
-		<div class="actions">
-			<?php echo Form::submit(l('update'), 'update_columns'); ?>
-		</div>
-		</div>
-	</fieldset>
-</form>
diff --git a/vendor/traq/views/default/tickets/_filters.phtml b/vendor/traq/views/default/tickets/_filters.phtml
deleted file mode 100644
index 8c6b0b0c9..000000000
--- a/vendor/traq/views/default/tickets/_filters.phtml
+++ /dev/null
@@ -1,100 +0,0 @@
-<form action="<?php echo Request::base($project->href('tickets/update_filters')); ?>" method="post">
-	<fieldset id="ticket_filters">
-		<legend><a href="#"><?php echo l('filters'); ?></a></legend>
-		<div id="ticket_filters_content"<?php echo (isset($_COOKIE['hide_filters']) and $_COOKIE['hide_filters']) == 1 ? ' style="display:none;"' : ''; ?>>
-			<table>
-				<tbody>
-				<?php foreach ($filters as $filter => $info) { ?>
-					<?php if (in_array($filter, array('milestone', 'status', 'version', 'type', 'component', 'priority', 'severity', 'search'))) { ?>
-					<tr id="filter-<?php echo $filter; ?>">
-						<td class="label"><?php echo l($filter); ?></td>
-						<?php if ($filter == 'search') { ?>
-						<td class="condition">is</td>
-						<td class="value">
-							<?php echo Form::text("filters[{$filter}][values][]", array('value' => implode(',', $info['values']), 'id' => false)); ?>
-						</td>
-						<?php } else { ?>
-						<td class="condition">
-							<?php
-								echo Form::select("filters[{$filter}][prefix]",
-									array(
-										array('label' => l('is'), 'value' => ''),
-										array('label' => l('is_not'), 'value' => '!')
-									),
-									array('value' => $info['prefix'], 'id' => false)
-								);
-							?>
-						</td>
-						<td class="value">
-							<?php echo Form::multiselect("filters[{$filter}][values][]", ticket_filter_options_for($filter, $project->id), $info['values']); ?>
-						</td>
-						<?php } ?>
-						<td class="ticket_filter_action">
-							<button type="button" class="button_delete" name="remove_filter[<?php echo $filter; ?>]" data-filter="<?php echo $filter; ?>">-</button>
-						</td>
-					</tr>
-					<?php } else { ?>
-						<?php foreach ($info['values'] as $k => $value) { ?>
-						<tr id="filter-<?php echo $filter; ?>-<?php echo $k; ?>">
-							<td class="label">
-								<?php if (isset($info['label'])) { ?>
-									<?php echo $info['label']; ?>
-								<?php } else { ?>
-									<?php echo $k == 0 ? l($filter) :''; ?>
-								<?php } ?>
-							</td>
-							<td class="condition">
-							<?php
-								if ($k == 0) {
-									if (in_array($filter, array('summary', 'description'))) {
-										echo Form::select("filters[{$filter}][prefix]",
-											array(
-												array('label' => l('contains'), 'value' => ''),
-												array('label' => l('does_not_contain'), 'value' => '!')
-											),
-											array('value' => $info['prefix'], 'id' => false)
-										);
-									} else {
-										echo Form::select("filters[{$filter}][prefix]",
-											array(
-												array('label' => l('is'), 'value' => ''),
-												array('label' => l('is_not'), 'value' => '!')
-											),
-											array('value' => $info['prefix'], 'id' => false)
-										);
-									}
-								} else {
-									echo l('or');
-								}
-							?>
-							</td>
-							<td class="value">
-							<?php
-								if (in_array($filter, array_merge(array('summary', 'description'), array_keys(ticket_filters_for($project))))) {
-									echo Form::text("filters[{$filter}][values][]", array('value' => $value, 'id' => false));
-								} elseif (in_array($filter, array('owner', 'assigned_to'))) {
-									echo Form::text("filters[{$filter}][values][]", array('value' => $value, 'data-autocomplete' => Request::base('/_ajax/autocomplete/username'), 'id' => false));
-								}
-							?>
-							</td>
-							<td class="ticket_filter_action">
-								<button type="button" class="button_delete" name="remove_filter[<?php echo $filter; ?>:<?php echo $k; ?>]" data-filter="<?php echo $filter; ?>-<?php echo $k; ?>">-</button>
-							</td>
-						</tr>
-						<?php } ?>
-					<?php } ?>
-				<?php } ?>
-					<tr>
-						<td>
-							<input type="submit" value="<?php echo l('update'); ?>" name="update">
-						</td>
-						<td colspan="3" id="ticket_filter_actions">
-							<?php echo Form::select('new_filter', ticket_filters_select_options($project)); ?>
-							<button type="submit" class="button_new" name="add_filter">+</button>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-		</div>
-	</fieldset>
-</form>
diff --git a/vendor/traq/views/default/tickets/_sort_indicator.phtml b/vendor/traq/views/default/tickets/_sort_indicator.phtml
deleted file mode 100644
index a43c631a7..000000000
--- a/vendor/traq/views/default/tickets/_sort_indicator.phtml
+++ /dev/null
@@ -1 +0,0 @@
-<span class="sort_indicator <?php echo $order; ?>"></span>

From 86b436ca587d75748435b6db12cfebd4ac4db674 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sat, 2 Jul 2022 01:13:36 +1000
Subject: [PATCH 19/46] Implement filter datasets

---
 traq-ui/ticket-listing/TicketFilters.vue      | 61 ++++++++++++++++++-
 vendor/traq/config/routes.php                 |  5 +-
 vendor/traq/controllers/api.php               | 25 +++++++-
 vendor/traq/models/status.php                 | 10 +++
 .../views/default/api/priorities.json.php     |  1 -
 .../traq/views/default/api/statuses.json.php  |  1 -
 6 files changed, 96 insertions(+), 7 deletions(-)
 delete mode 100644 vendor/traq/views/default/api/priorities.json.php
 delete mode 100644 vendor/traq/views/default/api/statuses.json.php

diff --git a/traq-ui/ticket-listing/TicketFilters.vue b/traq-ui/ticket-listing/TicketFilters.vue
index d3a9d4e98..530ac0687 100644
--- a/traq-ui/ticket-listing/TicketFilters.vue
+++ b/traq-ui/ticket-listing/TicketFilters.vue
@@ -22,6 +22,7 @@ export default {
         milestones: [],
         components: [],
         statuses: [],
+        priorities: [],
       },
     }
   },
@@ -30,6 +31,10 @@ export default {
     this.convertQueryString()
 
     const roadmapUrl = window.traq.base + window.traq.project_slug + "/roadmap.json"
+    const componentsUrl = window.traq.base + "api/" + window.traq.project_slug + "/components"
+    const statusesUrl = window.traq.base + "api/statuses"
+    const prioritiesUrl = window.traq.base + "api/priorities"
+
     axios.get(roadmapUrl).then((resp) => {
       this.filterData.milestones =
         resp.data.map((data) => ({
@@ -37,6 +42,45 @@ export default {
           value: data.slug,
         })) ?? []
     })
+
+    axios.get(statusesUrl).then((resp) => {
+      const open =
+        resp.data
+          .filter((status) => status.status === 1)
+          .map((data) => ({
+            label: data.name,
+            value: data.name,
+          })) ?? []
+
+      const closed =
+        resp.data
+          .filter((status) => status.status === 0)
+          .map((data) => ({
+            label: data.name,
+            value: data.name,
+          })) ?? []
+
+      this.filterData.statuses = {
+        Open: open,
+        Closed: closed,
+      }
+    })
+
+    axios.get(prioritiesUrl).then((resp) => {
+      this.filterData.priorities =
+        resp.data.map((data) => ({
+          label: data.name,
+          value: data.name,
+        })) ?? []
+    })
+
+    axios.get(componentsUrl).then((resp) => {
+      this.filterData.components =
+        resp.data.map((data) => ({
+          label: data.name,
+          value: data.name,
+        })) ?? []
+    })
   },
 
   computed: {
@@ -66,6 +110,7 @@ export default {
           field: "component",
           label: "Component",
           type: "is",
+          dataSet: "components",
         },
         {
           field: "milestone",
@@ -83,6 +128,13 @@ export default {
           field: "status",
           label: "Status",
           type: "is",
+          dataSet: "statuses",
+        },
+        {
+          field: "priority",
+          label: "Priorities",
+          type: "is",
+          dataSet: "priorities",
         },
       ]
 
@@ -180,7 +232,14 @@ export default {
             </div>
             <div class="value">
               <select multiple :name="`filters[${filter.field}][values][]`" v-model="filter.values">
-                <option v-for="option in filterData[filter.dataSet]" :key="option.value" :value="option.value">{{ option.label }}</option>
+                <template v-if="Array.isArray(filterData[filter.dataSet])">
+                  <option v-for="option in filterData[filter.dataSet]" :key="option.value" :value="option.value">{{ option.label }}</option>
+                </template>
+                <template v-else>
+                  <optgroup v-for="key in Object.keys(filterData[filter.dataSet])" :label="key" :key="key">
+                    <option v-for="option in filterData[filter.dataSet][key]" :key="option.value" :value="option.value">{{ option.label }}</option>
+                  </optgroup>
+                </template>
               </select>
             </div>
             <div class="remove">
diff --git a/vendor/traq/config/routes.php b/vendor/traq/config/routes.php
index b7e32ddec..dd6e0769d 100644
--- a/vendor/traq/config/routes.php
+++ b/vendor/traq/config/routes.php
@@ -33,8 +33,9 @@
 Router::add('/users/validate/(.*)', 'traq::controllers::Users.validate/$1');
 
 // API
-Router::add('/statuses', 'traq::controllers::API.statuses');
-Router::add('/priorities', 'traq::controllers::API.priorities');
+Router::add('/api/statuses', 'traq::controllers::API.statuses');
+Router::add('/api/priorities', 'traq::controllers::API.priorities');
+Router::add('/api/'.PROJECT_SLUG.'/components', 'traq::controllers::API.components');
 
 // Misc
 Router::add('/_js(?:.js)?', 'traq::controllers::Misc.javascript');
diff --git a/vendor/traq/controllers/api.php b/vendor/traq/controllers/api.php
index 55eaf4127..8af7e4f69 100644
--- a/vendor/traq/controllers/api.php
+++ b/vendor/traq/controllers/api.php
@@ -21,6 +21,8 @@
 namespace traq\controllers;
 
 use avalon\output\View;
+use avalon\http\Router;
+use avalon\output\Body;
 
 use avalon\core\Load;
 use traq\models\Status;
@@ -36,6 +38,17 @@
  */
 class API extends AppController
 {
+    public function __construct()
+    {
+        Router::$extension = 'json';
+        parent::__construct();
+
+        $this->render['layout'] = false;
+        $this->render['view'] = false;
+
+        header('Content-Type: application/json; charset=UTF-8');
+    }
+
     /**
      * Ticket statuses.
      *
@@ -43,7 +56,7 @@ class API extends AppController
      */
     public function action_statuses()
     {
-        View::set('statuses', Status::fetch_all());
+        Body::append(to_json(Status::fetch_all()));
     }
 
     /**
@@ -53,6 +66,14 @@ public function action_statuses()
      */
     public function action_priorities()
     {
-        View::set('priorities', Priority::fetch_all());
+        Body::append(to_json(Priority::fetch_all()));
+    }
+
+    /**
+     * Project components.
+     */
+    public function action_components()
+    {
+        Body::append(to_json($this->project->components->exec()->fetch_all()));
     }
 }
diff --git a/vendor/traq/models/status.php b/vendor/traq/models/status.php
index 946fe6b45..db81cf7b0 100644
--- a/vendor/traq/models/status.php
+++ b/vendor/traq/models/status.php
@@ -72,4 +72,14 @@ public function is_valid()
         $this->errors = $errors;
         return !count($errors) > 0;
     }
+
+    public function __toArray($fields = null)
+    {
+        return [
+            'id' => (int) $this->id,
+            'name' => $this->name,
+            'status' => (int) $this->status,
+            'changelog' => (bool) $this->changelog,
+        ];
+    }
 }
diff --git a/vendor/traq/views/default/api/priorities.json.php b/vendor/traq/views/default/api/priorities.json.php
deleted file mode 100644
index 498d4d4f0..000000000
--- a/vendor/traq/views/default/api/priorities.json.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo to_json($priorities)?>
diff --git a/vendor/traq/views/default/api/statuses.json.php b/vendor/traq/views/default/api/statuses.json.php
deleted file mode 100644
index df524b87f..000000000
--- a/vendor/traq/views/default/api/statuses.json.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo to_json($statuses)?>

From 01ae25cb07084c41c8e1f269745d08380db3995c Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sat, 2 Jul 2022 10:44:41 +1000
Subject: [PATCH 20/46] Convert `allOpen` and `allClosed` to statuses

---
 traq-ui/ticket-listing/TicketFilters.vue | 21 ++++++++++++++-------
 traq-ui/ticket-listing/TicketListing.vue |  4 ++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/traq-ui/ticket-listing/TicketFilters.vue b/traq-ui/ticket-listing/TicketFilters.vue
index 530ac0687..61f38c2f0 100644
--- a/traq-ui/ticket-listing/TicketFilters.vue
+++ b/traq-ui/ticket-listing/TicketFilters.vue
@@ -28,8 +28,6 @@ export default {
   },
 
   mounted() {
-    this.convertQueryString()
-
     const roadmapUrl = window.traq.base + window.traq.project_slug + "/roadmap.json"
     const componentsUrl = window.traq.base + "api/" + window.traq.project_slug + "/components"
     const statusesUrl = window.traq.base + "api/statuses"
@@ -64,6 +62,9 @@ export default {
         Open: open,
         Closed: closed,
       }
+
+      // Convert query string after we get statuses, as we convert 'allOpen' and 'allClosed'
+      this.convertQueryString()
     })
 
     axios.get(prioritiesUrl).then((resp) => {
@@ -190,7 +191,7 @@ export default {
       }
     },
     convertQueryString() {
-      const filters = []
+      const activeFilters = []
       const params = new URLSearchParams(window.location.search.substring(1))
 
       // Loop over filter options and check params for a value
@@ -199,9 +200,15 @@ export default {
 
         if (paramValue) {
           const condition = !paramValue.startsWith("!")
-          const values = !condition ? paramValue.substring(1)?.split(",") : paramValue.split(",")
+          let values = !condition ? paramValue.substring(1)?.split(",") : paramValue.split(",")
+
+          // Convert the 'allOpen' and 'allClosed' for the status filter to actual open or closed statuses.
+          if (filter.field === "status" && (values[0] === "allopen" || values[0] === "allclosed")) {
+            const statusesKey = values[0] === "allopen" ? "Open" : "Closed"
+            values = this.filterData.statuses[statusesKey].map((status) => status.label)
+          }
 
-          filters.push({
+          activeFilters.push({
             ...filter,
             condition,
             values: values ?? [],
@@ -209,7 +216,7 @@ export default {
         }
       })
 
-      this.applyFilters(filters)
+      this.applyFilters(activeFilters)
     },
   },
 }
@@ -309,7 +316,7 @@ export default {
 .ticket-filters-container {
   padding: 0;
   overflow: scroll;
-  transition: max-height ease-in-out 0.4s;
+  transition: max-height ease-out 0.4s;
   max-height: 0px;
   background-color: #fff;
   @apply border-gray-400;
diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
index 0b147305f..0e23e72af 100644
--- a/traq-ui/ticket-listing/TicketListing.vue
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -50,13 +50,12 @@ export default {
         this.page = resp.data.page
         this.total_pages = resp.data.total_pages
       })
-
-      this.updateUrl()
     },
     sortTickets(column): void {
       this.sort_order = column !== this.sort_by || this.sort_order === "desc" ? "asc" : "desc"
       this.sort_by = column
       this.getTickets()
+      this.updateUrl()
     },
     ticketUrl(ticketId): string {
       return `${window.traq.base}${window.traq.project_slug}/tickets/${ticketId}`
@@ -67,6 +66,7 @@ export default {
     applyFilters(filters): void {
       this.filters = filters
       this.getTickets()
+      this.updateUrl()
     },
     updateColumns(columns: Array<string>): void {
       this.columns = columns

From 454ba9c0540489722cdecfa1285e802c91cda8b8 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sat, 2 Jul 2022 10:45:17 +1000
Subject: [PATCH 21/46] Cleanup older files

---
 assets/js/mass_actions.js                     | 132 +++---------
 assets/js/ticket_tasks.js                     | 191 +++++++++---------
 assets/js/traq.js                             | 152 +++++++-------
 assets/js/traq_news.js                        |  56 -----
 traq-ui/ticket-listing/TicketColumns.vue      |   2 +-
 vendor/traq/views/default/_theme.php          |   2 +-
 vendor/traq/views/default/layouts/_head.phtml |  22 +-
 7 files changed, 219 insertions(+), 338 deletions(-)
 delete mode 100644 assets/js/traq_news.js

diff --git a/assets/js/mass_actions.js b/assets/js/mass_actions.js
index c5b6fdcdc..a9e31ae94 100644
--- a/assets/js/mass_actions.js
+++ b/assets/js/mass_actions.js
@@ -1,7 +1,7 @@
 /*!
  * Traq
- * Copyright (C) 2009-2013 Traq.io
- * Copyright (C) 2009-2013 J. Polgar
+ * Copyright (C) 2009-2022 Traq.io
+ * Copyright (C) 2009-2022 J. Polgar
  * https://github.com/nirix
  *
  * This file is part of Traq.
@@ -19,101 +19,33 @@
  * along with Traq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-$(document).ready(function(){
-	// Get selected tickets.
-	var selected_tickets = $.cookie('selected_tickets');
-
-	// Selected users
-	var selected_users = [];
-
-	// If there are none, set empty array.
-	if (!selected_tickets) {
-		selected_tickets = [];
-	} else {
-		selected_tickets = JSON.parse($.cookie('selected_tickets'));
-	}
-
-	// Set form value
-	$('#mass_actions input[name="tickets"]').val(JSON.stringify(selected_tickets));
-
-	// Save selected tickets.
-	var saveSelectedTickets = function() {
-		$.cookie('selected_tickets', JSON.stringify(selected_tickets));
-
-		// Show mass actions form
-		if (selected_tickets.length > 0) {
-			$('#mass_actions').slideDown('fast');
-		} else {
-			$('#mass_actions').slideUp('fast');
-		}
-
-		$('#mass_actions input[name="tickets"]').val(JSON.stringify(selected_tickets));
-	};
-
-	// Check selected tickets
-	$(selected_tickets).each(function(i, ticket_id){
-		$('#mass_action_ticket_' + ticket_id).prop('checked', true);
-		$('#mass_actions').show();
-	});
-
-	$('#tickets .mass_actions #select_all_tickets').on('click', function(){
-		var select_all = $(this).is(':checked');
-		$('#tickets input[type="checkbox"][name^="tickets"]').each(function(){
-			var ticket_id = $(this).val();
-			if (select_all && !$(this).is(':checked')) {
-				$(this).prop('checked', true);
-				selected_tickets.push(ticket_id);
-			} else if(!select_all && $(this).is(':checked')) {
-				$(this).prop('checked', false);
-				selected_tickets = $.grep(selected_tickets, function(a){ return a != ticket_id; });
-			}
-			saveSelectedTickets();
-		});
-	});
-
-	// Loop over checkboxes
-	$('#tickets .mass_actions input[type="checkbox"][name^="tickets"]').each(function(){
-		// Add click event
-		$(this).on('click', function(){
-			var ticket_id = $(this).val();
-
-			// Add ticket ID to selected tickets
-			if ($(this).is(':checked')) {
-				selected_tickets.push(ticket_id);
-			} else {
-				selected_tickets = $.grep(selected_tickets, function(a){ return a != ticket_id; });
-				$('#tickets #select_all_tickets').prop('checked', false);
-			}
-			saveSelectedTickets();
-		});
-	});
-
-	// I'm not particularly proud of the code below, but then again I'm not at all
-	// proud of the 3.x codebase, so screw it, I'll make it better in 4.x.
-
-	$('#select_all_users').on('click', function(){
-		if ($(this).is(':checked')) {
-			$('#users .mass_actions input').each(function(){
-				$(this).prop('checked', true);
-			});
-
-			// $('#mass_actions').slideDown('fast');
-		} else {
-			$('#users .mass_actions input').each(function(){
-				$(this).prop('checked', false);
-			});
-
-			// $('#mass_actions').slideUp('fast');
-		}
-	});
-
-	$('#users .mass_actions input').each(function(){
-		$(this).on('click', function(){
-			if ($('#users .mass_actions input:checked').length > 0) {
-				$('#mass_actions').slideDown('fast');
-			} else {
-				$('#mass_actions').slideUp('fast');
-			}
-		});
-	});
-});
+jQuery(document).ready(function () {
+  // I'm not particularly proud of the code below, but then again I'm not at all
+  // proud of the 3.x codebase, so screw it, I'll make it better in 4.x.
+
+  jQuery("#select_all_users").on("click", function () {
+    if (jQuery(this).is(":checked")) {
+      jQuery("#users .mass_actions input").each(function () {
+        jQuery(this).prop("checked", true)
+      })
+
+      // jQuery('#mass_actions').slideDown('fast');
+    } else {
+      jQuery("#users .mass_actions input").each(function () {
+        jQuery(this).prop("checked", false)
+      })
+
+      // jQuery('#mass_actions').slideUp('fast');
+    }
+  })
+
+  jQuery("#users .mass_actions input").each(function () {
+    jQuery(this).on("click", function () {
+      if (jQuery("#users .mass_actions input:checked").length > 0) {
+        jQuery("#mass_actions").slideDown("fast")
+      } else {
+        jQuery("#mass_actions").slideUp("fast")
+      }
+    })
+  })
+})
diff --git a/assets/js/ticket_tasks.js b/assets/js/ticket_tasks.js
index b0c3e761d..4829622c9 100644
--- a/assets/js/ticket_tasks.js
+++ b/assets/js/ticket_tasks.js
@@ -1,7 +1,7 @@
 /*!
  * Traq
- * Copyright (C) 2009-2013 Traq.io
- * Copyright (C) 2009-2013 J. Polgar
+ * Copyright (C) 2009-2022 Traq.io
+ * Copyright (C) 2009-2022 J. Polgar
  * https://github.com/nirix
  *
  * This file is part of Traq.
@@ -19,107 +19,106 @@
  * along with Traq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-$(document).ready(function(){
-	// Manage ticket tasks
-	$(document).on('click', '#manage_ticket_tasks', function(){
-		$('#overlay').load($(this).attr('data-url') + '?overlay=true', function(){
-			var tasks = $('#ticket_tasks_data input[name="tasks"]').val();
+jQuery(document).ready(function () {
+  // Manage ticket tasks
+  jQuery(document).on("click", "#manage_ticket_tasks", function () {
+    jQuery("#overlay").load(jQuery(this).attr("data-url") + "?overlay=true", function () {
+      var tasks = jQuery('#ticket_tasks_data input[name="tasks"]').val()
 
-			if (tasks == '') {
-				tasks = new Array();
-			} else {
-				tasks = JSON.parse(tasks);
-			}
+      if (tasks == "") {
+        tasks = new Array()
+      } else {
+        tasks = JSON.parse(tasks)
+      }
 
-			$(tasks).each(function(task_id, task){
-				$("#ticket_tasks_manager #task_count").val(tasks.length);
-				$.get(
-					traq.base + '_misc/ticket_tasks_bit',
-					{ id: task_id, completed: String(task.completed), task: task.task },
-					function(data){
-						$('#ticket_tasks_manager .tasks').append(data);
-					}
-				);
-			});
-			$('#overlay').overlay();
-		});
-	});
+      jQuery(tasks).each(function (task_id, task) {
+        jQuery("#ticket_tasks_manager #task_count").val(tasks.length)
+        $.get(traq.base + "_misc/ticket_tasks_bit", { id: task_id, completed: String(task.completed), task: task.task }, function (data) {
+          jQuery("#ticket_tasks_manager .tasks").append(data)
+        })
+      })
+      jQuery("#overlay").overlay()
+    })
+  })
 
-	// Add ticket task
-	$(document).on('click', "#ticket_tasks_manager #add_task", function(){
-		var task_id = parseInt($("#task_count").val());
-		$.get(traq.base + '_misc/ticket_tasks_bit?id=' + task_id, function(data){
-			$("#task_count").val(task_id += 1);
-			$("#ticket_tasks_manager .tasks").append($(data).hide()).find('.task:last').slideDown('fast', function(){
-				$(this).find('[type=text]').focus();
-			});
-		});
-	});
+  // Add ticket task
+  jQuery(document).on("click", "#ticket_tasks_manager #add_task", function () {
+    var task_id = parseInt(jQuery("#task_count").val())
+    $.get(traq.base + "_misc/ticket_tasks_bit?id=" + task_id, function (data) {
+      jQuery("#task_count").val((task_id += 1))
+      jQuery("#ticket_tasks_manager .tasks")
+        .append(jQuery(data).hide())
+        .find(".task:last")
+        .slideDown("fast", function () {
+          jQuery(this).find("[type=text]").focus()
+        })
+    })
+  })
 
-	// Process ticket tasks form data
-	$(document).on('click', "#overlay #set_ticket_tasks", function(){
-		close_overlay(function(){
-			var task_count = parseInt($("#task_count").val());
-			var data = new Array();
-			$('#ticket_tasks_manager input[name*="tasks"]').each(function(){
-				var e = $(this);
-				var task_id = parseInt(e.attr('data-task-id'));
+  // Process ticket tasks form data
+  jQuery(document).on("click", "#overlay #set_ticket_tasks", function () {
+    close_overlay(function () {
+      var task_count = parseInt(jQuery("#task_count").val())
+      var data = new Array()
+      jQuery('#ticket_tasks_manager input[name*="tasks"]').each(function () {
+        var e = jQuery(this)
+        var task_id = parseInt(e.attr("data-task-id"))
 
-				if (!data[task_id]) {
-					data[task_id] = {}
-				}
+        if (!data[task_id]) {
+          data[task_id] = {}
+        }
 
-				// Checkbox
-				if (e.attr('type') == 'checkbox') {
-					if (e.is(':checked')) {
-						data[task_id].completed = true;
-					} else {
-						data[task_id].completed = false;
-					}
-				}
-				// Text
-				else if(e.attr('type') == 'text') {
-					data[task_id].task = e.val();
-				}
-			});
-			$("#ticket_tasks_data input[name='task_count']").val(task_count);
-			$("#ticket_tasks_data input[name='tasks']").val(JSON.stringify(data));
-		});
-	});
+        // Checkbox
+        if (e.attr("type") == "checkbox") {
+          if (e.is(":checked")) {
+            data[task_id].completed = true
+          } else {
+            data[task_id].completed = false
+          }
+        }
+        // Text
+        else if (e.attr("type") == "text") {
+          data[task_id].task = e.val()
+        }
+      })
+      jQuery("#ticket_tasks_data input[name='task_count']").val(task_count)
+      jQuery("#ticket_tasks_data input[name='tasks']").val(JSON.stringify(data))
+    })
+  })
 
-	// Delete ticket task
-	$(document).on('click', '#overlay button.delete_ticket_task', function(){
-		var e = $(this);
-		$("#overlay #ticket_task_bit_" + e.attr('data-task-id')).slideUp('fast', function(){
-			$(this).remove();
-		});
-	});
+  // Delete ticket task
+  jQuery(document).on("click", "#overlay button.delete_ticket_task", function () {
+    var e = jQuery(this)
+    jQuery("#overlay #ticket_task_bit_" + e.attr("data-task-id")).slideUp("fast", function () {
+      jQuery(this).remove()
+    })
+  })
 
-	// Toggle task state
-	$(document).on('click', '#ticket_info #tasks .task input[type="checkbox"]', function(){
-		var task_id = $(this).attr('data-task-task');
-		var completed = false;
+  // Toggle task state
+  jQuery(document).on("click", '#ticket_info #tasks .task input[type="checkbox"]', function () {
+    var task_id = jQuery(this).attr("data-task-task")
+    var completed = false
 
-		// Get task state
-		if ($(this).is(':checked')) {
-			completed = true;
-		}
+    // Get task state
+    if (jQuery(this).is(":checked")) {
+      completed = true
+    }
 
-		// Update task
-		$.ajax({
-			url: $(this).attr('data-url'),
-			data: { completed: completed },
-			beforeSend: function(){
-				// Disable tasks
-				$('#tasks input[type="checkbox"]').each(function(){
-					$(this).attr('disabled','disabled');
-				});
-			}
-		}).done(function(){
-			// Enable tasks
-			$('#tasks input[type="checkbox"]').each(function(){
-				$(this).removeAttr('disabled');
-			});
-		});
-	});
-});
+    // Update task
+    $.ajax({
+      url: jQuery(this).attr("data-url"),
+      data: { completed: completed },
+      beforeSend: function () {
+        // Disable tasks
+        jQuery('#tasks input[type="checkbox"]').each(function () {
+          jQuery(this).attr("disabled", "disabled")
+        })
+      },
+    }).done(function () {
+      // Enable tasks
+      jQuery('#tasks input[type="checkbox"]').each(function () {
+        jQuery(this).removeAttr("disabled")
+      })
+    })
+  })
+})
diff --git a/assets/js/traq.js b/assets/js/traq.js
index 8b5d3f596..ee0c47718 100644
--- a/assets/js/traq.js
+++ b/assets/js/traq.js
@@ -23,19 +23,19 @@
 var traq = {
   base: "/",
   load_ticket_template: function () {
-    var type_id = $("#type option:selected").val()
+    var type_id = jQuery("#type option:selected").val()
 
-    $("#description").load(traq.base + "_ajax/ticket_template/" + type_id)
+    jQuery("#description").load(traq.base + "_ajax/ticket_template/" + type_id)
 
     traq.show_hide_custom_fields()
   },
   show_hide_custom_fields: function () {
-    var type_id = $("#type option:selected").val()
+    var type_id = jQuery("#type option:selected").val()
 
     // Toggle visibility for custom fields that aren't relveant
     // for the selected type.
-    $(".properties .custom_field").each(function () {
-      var field = $(this)
+    jQuery(".properties .custom_field").each(function () {
+      var field = jQuery(this)
 
       // Hide the field
       field.hide()
@@ -58,19 +58,19 @@ var language = {}
 // how about a nice simple popover box.
 // Credit to arturo182
 var popover_confirm = function (parent, message, callback) {
-  var outerDiv = $("<div/>").addClass("popover_confirm")
-  var innerDiv = $("<div/>")
+  var outerDiv = jQuery("<div/>").addClass("popover_confirm")
+  var innerDiv = jQuery("<div/>")
 
   innerDiv.append(
-    $("<button/>", { text: language.yes }).click(function () {
-      $("#popover").fadeOut("fast")
+    jQuery("<button/>", { text: language.yes }).click(function () {
+      jQuery("#popover").fadeOut("fast")
       callback()
       return false
     })
   )
   innerDiv.append(
-    $("<button/>", { text: language.no }).click(function () {
-      $("#popover").fadeOut("fast")
+    jQuery("<button/>", { text: language.no }).click(function () {
+      jQuery("#popover").fadeOut("fast")
       return false
     })
   )
@@ -78,53 +78,53 @@ var popover_confirm = function (parent, message, callback) {
   outerDiv.append(message)
   outerDiv.append(innerDiv)
 
-  $("#popover").stop(true, true).hide().empty().append(outerDiv)
-  $("#popover").popover(parent)
+  jQuery("#popover").stop(true, true).hide().empty().append(outerDiv)
+  jQuery("#popover").popover(parent)
 }
 
-$(document).ready(function () {
-  $("#header h1").on("mouseenter", function () {
-    $("#project_switcher_btn").stop(true, true).fadeIn("fast")
-    $(this)
+jQuery(document).ready(function () {
+  jQuery("#header h1").on("mouseenter", function () {
+    jQuery("#project_switcher_btn").stop(true, true).fadeIn("fast")
+    jQuery(this)
       .off("mouseleave")
       .on("mouseleave", function () {
-        $("#project_switcher_btn").stop(true, true).fadeOut("fast")
+        jQuery("#project_switcher_btn").stop(true, true).fadeOut("fast")
       })
   })
 
-  $("#project_switcher_btn").on("mouseenter", function () {
-    $(this).stop(true, true).show()
-    $(this)
+  jQuery("#project_switcher_btn").on("mouseenter", function () {
+    jQuery(this).stop(true, true).show()
+    jQuery(this)
       .off("mouseleave")
       .on("mouseleave", function () {
-        $(this).stop(true, true).fadeOut("fast")
+        jQuery(this).stop(true, true).fadeOut("fast")
       })
   })
 
-  $("#project_switcher_btn").on("click", function () {
-    $(this).off("mouseleave")
-    $(".project_switcher").popover($(this))
+  jQuery("#project_switcher_btn").on("click", function () {
+    jQuery(this).off("mouseleave")
+    jQuery(".project_switcher").popover(jQuery(this))
     return false
   })
 
-  $(document).on("click", function () {
-    $("#project_switcher_btn").stop(true, true).fadeOut("fast")
+  jQuery(document).on("click", function () {
+    jQuery("#project_switcher_btn").stop(true, true).fadeOut("fast")
   })
 
-  $("[data-preview]").on("click", function () {
-    var data = $($(this).attr("data-preview")).val()
-    $("#overlay").load(traq.base + "_misc/preview_text", { data: data }, function () {
-      $("#overlay").overlay()
+  jQuery("[data-preview]").on("click", function () {
+    var data = jQuery(jQuery(this).attr("data-preview")).val()
+    jQuery("#overlay").load(traq.base + "_misc/preview_text", { data: data }, function () {
+      jQuery("#overlay").overlay()
     })
   })
 
   // Add the editor interface to all text areas, like a boss.
-  $("textarea.editor").likeaboss()
+  jQuery("textarea.editor").likeaboss()
 
   // Add a confirm-on-click event to call elements
   // with the data-confirm attribute.
-  $(document).on("click", "[data-confirm]", function () {
-    var parent = $(this)
+  jQuery(document).on("click", "[data-confirm]", function () {
+    var parent = jQuery(this)
 
     popover_confirm(parent, parent.attr("data-confirm"), function () {
       window.location.href = parent.attr("href")
@@ -136,8 +136,8 @@ $(document).ready(function () {
   // Add a click event to all elements with
   // the data-ajax attribute and send an ajax
   // call to the href attrib value.
-  $(document).on("click", "[data-ajax=1]", function () {
-    var e = $(this)
+  jQuery(document).on("click", "[data-ajax=1]", function () {
+    var e = jQuery(this)
     $.ajax({
       url: e.attr("href"),
       dataType: "script",
@@ -148,8 +148,8 @@ $(document).ready(function () {
   // Add a click event to ajax-confirm elements
   // that will confirm with the specified message
   // then send an ajax request if accepted.
-  $(document).on("click", "[data-ajax-confirm]", function () {
-    var e = $(this)
+  jQuery(document).on("click", "[data-ajax-confirm]", function () {
+    var e = jQuery(this)
 
     popover_confirm(e, e.attr("data-ajax-confirm"), function () {
       $.ajax({
@@ -165,13 +165,13 @@ $(document).ready(function () {
   // data-overlay attribute and load the elements
   // href value into the overlay container then show
   // the overlay.
-  $(document).on("click", "[data-overlay]", function () {
+  jQuery(document).on("click", "[data-overlay]", function () {
     var path
 
-    if ($(this).attr("data-overlay") == "1") {
-      path = $(this).attr("href").split("?")
+    if (jQuery(this).attr("data-overlay") == "1") {
+      path = jQuery(this).attr("href").split("?")
     } else {
-      path = $(this).attr("data-overlay").split("?")
+      path = jQuery(this).attr("data-overlay").split("?")
     }
 
     var uri = path[0] + "?overlay=true"
@@ -180,28 +180,28 @@ $(document).ready(function () {
       var uri = uri + "&" + path[1]
     }
 
-    $("#overlay").load(uri, function () {
-      $("#overlay textarea").likeaboss()
-      $("#overlay").overlay()
+    jQuery("#overlay").load(uri, function () {
+      jQuery("#overlay textarea").likeaboss()
+      jQuery("#overlay").overlay()
     })
     return false
   })
 
   // Add a hover event to all abbreviation elements inside
   // a form for sexy tooltips.
-  $(document).on(
+  jQuery(document).on(
     {
       mouseenter: function () {
-        $(this).sexyTooltip()
+        jQuery(this).sexyTooltip()
       },
     },
     "form abbr"
   )
 
-  $(document).on(
+  jQuery(document).on(
     {
       mouseenter: function () {
-        $(this).sexyTooltip("top")
+        jQuery(this).sexyTooltip("top")
       },
     },
     "[title]:not(form abbr),[data-tooltip]:not(form abbr)"
@@ -209,26 +209,26 @@ $(document).ready(function () {
 
   // Add a click event to all elements with
   // a data-popover attribute.
-  $(document).on("click", "[data-popover]", function () {
-    var parent = $(this)
-    $("#popover")
+  jQuery(document).on("click", "[data-popover]", function () {
+    var parent = jQuery(this)
+    jQuery("#popover")
       .stop(true, true)
       .hide()
-      .load($(this).attr("data-popover") + "?popover=true", function () {
-        $("#popover").popover(parent)
+      .load(jQuery(this).attr("data-popover") + "?popover=true", function () {
+        jQuery("#popover").popover(parent)
       })
     return false
   })
 
   // Add a click event to all elements with
   // a data-popover-hover attribute.
-  $(document).on("mouseenter", "[data-popover-hover]", function () {
-    var parent = $(this)
-    $("#popover")
+  jQuery(document).on("mouseenter", "[data-popover-hover]", function () {
+    var parent = jQuery(this)
+    jQuery("#popover")
       .stop(true, true)
       .hide()
-      .load($(this).attr("data-popover-hover") + "?popover=true", function () {
-        $("#popover").popover(parent, "hover")
+      .load(jQuery(this).attr("data-popover-hover") + "?popover=true", function () {
+        jQuery("#popover").popover(parent, "hover")
       })
     parent.off("click").click(function () {
       return false
@@ -237,22 +237,22 @@ $(document).ready(function () {
 
   // Loopover all the inputs with an autocomplete attribute
   // and set them up with the source as the attribute value.
-  $("input[data-autocomplete]").each(function () {
-    $(this).autocomplete({ source: $(this).attr("data-autocomplete") })
+  jQuery("input[data-autocomplete]").each(function () {
+    jQuery(this).autocomplete({ source: jQuery(this).attr("data-autocomplete") })
   })
 
   // Move ticket form refresh
-  $("form#move_ticket #project_id").change(function () {
-    $("form#move_ticket input:hidden[name=step]").val(2)
-    $("form#move_ticket").submit()
+  jQuery("form#move_ticket #project_id").change(function () {
+    jQuery("form#move_ticket input:hidden[name=step]").val(2)
+    jQuery("form#move_ticket").submit()
   })
 
   // Datepicker
-  $(document).on(
+  jQuery(document).on(
     {
       mouseenter: function () {
-        $(this).datepicker({
-          dateFormat: $(this).attr("data-date-format"),
+        jQuery(this).datepicker({
+          dateFormat: jQuery(this).attr("data-date-format"),
           changeMonth: true,
           changeYear: true,
         })
@@ -270,10 +270,10 @@ $(document).ready(function () {
  */
 ;(function ($) {
   $.fn.overlay = function () {
-    var element = $(this)
+    var element = jQuery(this)
     element.fadeIn()
     element.css({ left: jQuery(window).width() / 2 - element.width() / 2, top: "18%" })
-    $("#overlay_blackout").css({
+    jQuery("#overlay_blackout").css({
       display: "none",
       opacity: 0.7,
       position: "fixed",
@@ -282,9 +282,9 @@ $(document).ready(function () {
       top: -100 + "px",
       left: -100 + "px",
     })
-    $("#overlay_blackout").fadeIn("", function () {
-      $("#overlay_blackout").bind("click", function () {
-        $("#overlay_blackout").fadeOut()
+    jQuery("#overlay_blackout").fadeIn("", function () {
+      jQuery("#overlay_blackout").bind("click", function () {
+        jQuery("#overlay_blackout").fadeOut()
         element.fadeOut()
       })
     })
@@ -297,15 +297,15 @@ function close_overlay(func) {
     func = function () {}
   }
 
-  $("#overlay_blackout").fadeOut()
-  $("#overlay").fadeOut(function () {
+  jQuery("#overlay_blackout").fadeOut()
+  jQuery("#overlay").fadeOut(function () {
     func()
   })
 }
 
 // Search box
 function do_search() {
-  var project_slug = $('#search input[name="project_slug"]').val()
-  var query = $('#search input[name="search"]').val()
+  var project_slug = jQuery('#search input[name="project_slug"]').val()
+  var query = jQuery('#search input[name="search"]').val()
   window.location.href = traq.base + project_slug + "/tickets?search=" + query
 }
diff --git a/assets/js/traq_news.js b/assets/js/traq_news.js
deleted file mode 100644
index c5b82d8cd..000000000
--- a/assets/js/traq_news.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/*!
- * Traq
- * Copyright (C) 2009-2014 Jack Polgar
- * Copyright (C) 2012-2014 Traq.io
- * https://github.com/nirix
- * http://traq.io
- *
- * This file is part of Traq.
- *
- * Traq is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3 only.
- *
- * Traq is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Traq. If not, see <http://www.gnu.org/licenses/>.
- */
-
-$(document).ready(function(){
-	var news_container = $("#traq_news ul");
-
-	var strip = function(text) {
-		return text.replace(/</g, "&lt;");
-	};
-
-	if (window.location.protocol == "http:") {
-		$.getJSON('http://traq.io/news.json?callback=?').done(function(data){
-			$.each(data, function(i, data){
-				var item = $("<li>").addClass('box');
-
-				var summary = $("<h4>");
-				if (data.url) {
-					summary.append($("<a>").attr('href', data.url).append(data.summary));
-				} else {
-					summary.append(data.summary);
-				}
-
-				var created_at = $("<span>").append(data.created_at_relative).attr('title', data.created_at);
-
-				// Format the Markdown text.
-				var content = $("<div>").load(traq.base + '_misc/format_text', { data: data.content });
-
-				item.append(summary);
-				item.append(created_at);
-				item.append(content);
-				news_container.append(item);
-			});
-		});
-	} else {
-		$("#traq_news .secure_alert").show();
-	}
-});
diff --git a/traq-ui/ticket-listing/TicketColumns.vue b/traq-ui/ticket-listing/TicketColumns.vue
index f19d34927..b36dee9f7 100644
--- a/traq-ui/ticket-listing/TicketColumns.vue
+++ b/traq-ui/ticket-listing/TicketColumns.vue
@@ -94,7 +94,7 @@ export default {
 .ticket-columns-container {
   padding: 0;
   overflow: scroll;
-  transition: max-height ease-in-out 0.4s;
+  transition: max-height ease-out 0.4s;
   max-height: 0px;
   background-color: #fff;
   @apply border-gray-400;
diff --git a/vendor/traq/views/default/_theme.php b/vendor/traq/views/default/_theme.php
index d4462ffd8..5f42f3977 100644
--- a/vendor/traq/views/default/_theme.php
+++ b/vendor/traq/views/default/_theme.php
@@ -20,6 +20,6 @@
 
 return array(
 	'name' => 'Traq 3.0',
-	'version' => '1.0',
+	'version' => '2.0',
 	'author' => 'Jack P.'
 );
\ No newline at end of file
diff --git a/vendor/traq/views/default/layouts/_head.phtml b/vendor/traq/views/default/layouts/_head.phtml
index 38c08c585..5bf33b872 100644
--- a/vendor/traq/views/default/layouts/_head.phtml
+++ b/vendor/traq/views/default/layouts/_head.phtml
@@ -1,16 +1,22 @@
 <title><?php echo implode(' - ', array_reverse($traq->title)); ?></title>
 		<meta charset="UTF-8" />
+		
 		<?php echo HTML::css_link(Request::base() . 'css.php?css=screen&theme=' . settings('theme')); ?>
 		<?php echo HTML::css_link(Request::base() . 'css.php?css=print', 'print'); ?>
-		<!--[if lt IE 8]>
-		<?php echo HTML::css_link(Request::base() . 'css.php?css=ie'); ?>
-		<![endif]-->
-		<?php echo HTML::js_inc('//code.jquery.com/jquery-1.11.0.min.js'); ?>
-		<?php echo HTML::js_inc('//code.jquery.com/ui/1.10.4/jquery-ui.min.js'); ?>
-		<?php echo HTML::js_inc(Request::base() . 'js.php?js=all'); ?>
-		<?php echo HTML::js_inc(Request::base('_js')); ?>
 
-		<?php echo ui_package('main'); ?>
+		<script src="https://code.jquery.com/jquery-1.11.0.min.js" type="text/javascript"></script>
+		<script src="https://code.jquery.com/ui/1.10.4/jquery-ui.min.js" type="text/javascript"></script>
+		<script src="<?=Request::base('assets/js/jquery.cookie.js')?>" type="text/javascript"></script>
+		<script src="<?=Request::base('assets/js/sexytooltips.js')?>" type="text/javascript"></script>
+		<script src="<?=Request::base('assets/js/popover.js')?>" type="text/javascript"></script>
+		<script src="<?=Request::base('assets/js/likeaboss.js')?>" type="text/javascript"></script>
+
+		<script src="<?=Request::base('assets/js/traq.js')?>" type="text/javascript"></script>
+		<script src="<?=Request::base('assets/js/mass_actions.js')?>" type="text/javascript"></script>
+		<script src="<?=Request::base('assets/js/ticket_tasks.js')?>" type="text/javascript"></script>
+
+		<script src="<?=Request::base('_js')?>" type="text/javascript"></script>
+		<?=ui_package('main')?>
 
 		<?php if ($project): ?>
 			<script>

From 52e84e345182cee82665e9e5f02e03920b364a2b Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sat, 2 Jul 2022 11:27:17 +1000
Subject: [PATCH 22/46] PHP 7/8 fixes

---
 dev/docker/php56-apache                       |    6 -
 vendor/avalon                                 |    2 +-
 .../plugins/markdown/Michelf/Markdown.php     | 3094 -----------------
 .../markdown/Michelf/MarkdownExtra.php        |   38 -
 vendor/traq/plugins/markdown/Parsedown.php    | 1994 +++++++++++
 .../traq/plugins/markdown/ParsedownExtra.php  |  686 ++++
 vendor/traq/plugins/markdown/markdown.php     |   13 +-
 7 files changed, 2688 insertions(+), 3145 deletions(-)
 delete mode 100644 dev/docker/php56-apache
 delete mode 100755 vendor/traq/plugins/markdown/Michelf/Markdown.php
 delete mode 100755 vendor/traq/plugins/markdown/Michelf/MarkdownExtra.php
 create mode 100644 vendor/traq/plugins/markdown/Parsedown.php
 create mode 100644 vendor/traq/plugins/markdown/ParsedownExtra.php

diff --git a/dev/docker/php56-apache b/dev/docker/php56-apache
deleted file mode 100644
index e4cb2053f..000000000
--- a/dev/docker/php56-apache
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM php:5.6-apache
-
-RUN docker-php-ext-install pdo_mysql
-RUN printf '[PHP]\ndate.timezone = "US/Central"\n' > /usr/local/etc/php/conf.d/tzone.ini
-
-RUN a2enmod rewrite
diff --git a/vendor/avalon b/vendor/avalon
index 63a9ae223..5b53b2498 160000
--- a/vendor/avalon
+++ b/vendor/avalon
@@ -1 +1 @@
-Subproject commit 63a9ae2237809b8d6700a0c78727631046cef178
+Subproject commit 5b53b249886531801197b7e915deaa5fef420f17
diff --git a/vendor/traq/plugins/markdown/Michelf/Markdown.php b/vendor/traq/plugins/markdown/Michelf/Markdown.php
deleted file mode 100755
index 74486470a..000000000
--- a/vendor/traq/plugins/markdown/Michelf/Markdown.php
+++ /dev/null
@@ -1,3094 +0,0 @@
-<?php
-#
-# Markdown  -  A text-to-HTML conversion tool for web writers
-#
-# PHP Markdown  
-# Copyright (c) 2004-2013 Michel Fortin  
-# <http://michelf.com/projects/php-markdown/>
-#
-# Original Markdown  
-# Copyright (c) 2004-2006 John Gruber  
-# <http://daringfireball.net/projects/markdown/>
-#
-namespace Michelf;
-
-
-#
-# Markdown Parser Class
-#
-
-class Markdown {
-
-	### Version ###
-
-	const  MARKDOWNLIB_VERSION  =  "1.3";
-
-	### Simple Function Interface ###
-
-	public static function defaultTransform($text) {
-	#
-	# Initialize the parser and return the result of its transform method.
-	# This will work fine for derived classes too.
-	#
-		# Take parser class on which this function was called.
-		$parser_class = \get_called_class();
-
-		# try to take parser from the static parser list
-		static $parser_list;
-		$parser =& $parser_list[$parser_class];
-
-		# create the parser it not already set
-		if (!$parser)
-			$parser = new $parser_class;
-
-		# Transform text using parser.
-		return $parser->transform($text);
-	}
-
-	### Configuration Variables ###
-
-	# Change to ">" for HTML output.
-	public $empty_element_suffix = " />";
-	public $tab_width = 4;
-	
-	# Change to `true` to disallow markup or entities.
-	public $no_markup = false;
-	public $no_entities = false;
-	
-	# Predefined urls and titles for reference links and images.
-	public $predef_urls = array();
-	public $predef_titles = array();
-
-
-	### Parser Implementation ###
-
-	# Regex to match balanced [brackets].
-	# Needed to insert a maximum bracked depth while converting to PHP.
-	protected $nested_brackets_depth = 6;
-	protected $nested_brackets_re;
-	
-	protected $nested_url_parenthesis_depth = 4;
-	protected $nested_url_parenthesis_re;
-
-	# Table of hash values for escaped characters:
-	protected $escape_chars = '\`*_{}[]()>#+-.!';
-	protected $escape_chars_re;
-
-
-	public function __construct() {
-	#
-	# Constructor function. Initialize appropriate member variables.
-	#
-		$this->_initDetab();
-		$this->prepareItalicsAndBold();
-	
-		$this->nested_brackets_re = 
-			str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth).
-			str_repeat('\])*', $this->nested_brackets_depth);
-	
-		$this->nested_url_parenthesis_re = 
-			str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth).
-			str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth);
-		
-		$this->escape_chars_re = '['.preg_quote($this->escape_chars).']';
-		
-		# Sort document, block, and span gamut in ascendent priority order.
-		asort($this->document_gamut);
-		asort($this->block_gamut);
-		asort($this->span_gamut);
-	}
-
-
-	# Internal hashes used during transformation.
-	protected $urls = array();
-	protected $titles = array();
-	protected $html_hashes = array();
-	
-	# Status flag to avoid invalid nesting.
-	protected $in_anchor = false;
-	
-	
-	protected function setup() {
-	#
-	# Called before the transformation process starts to setup parser 
-	# states.
-	#
-		# Clear global hashes.
-		$this->urls = $this->predef_urls;
-		$this->titles = $this->predef_titles;
-		$this->html_hashes = array();
-		
-		$this->in_anchor = false;
-	}
-	
-	protected function teardown() {
-	#
-	# Called after the transformation process to clear any variable 
-	# which may be taking up memory unnecessarly.
-	#
-		$this->urls = array();
-		$this->titles = array();
-		$this->html_hashes = array();
-	}
-
-
-	public function transform($text) {
-	#
-	# Main function. Performs some preprocessing on the input text
-	# and pass it through the document gamut.
-	#
-		$this->setup();
-	
-		# Remove UTF-8 BOM and marker character in input, if present.
-		$text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text);
-
-		# Standardize line endings:
-		#   DOS to Unix and Mac to Unix
-		$text = preg_replace('{\r\n?}', "\n", $text);
-
-		# Make sure $text ends with a couple of newlines:
-		$text .= "\n\n";
-
-		# Convert all tabs to spaces.
-		$text = $this->detab($text);
-
-		# Turn block-level HTML blocks into hash entries
-		$text = $this->hashHTMLBlocks($text);
-
-		# Strip any lines consisting only of spaces and tabs.
-		# This makes subsequent regexen easier to write, because we can
-		# match consecutive blank lines with /\n+/ instead of something
-		# contorted like /[ ]*\n+/ .
-		$text = preg_replace('/^[ ]+$/m', '', $text);
-
-		# Run document gamut methods.
-		foreach ($this->document_gamut as $method => $priority) {
-			$text = $this->{$method}($text);
-		}
-		
-		$this->teardown();
-
-		return $text . "\n";
-	}
-	
-	protected $document_gamut = array(
-		# Strip link definitions, store in hashes.
-		"stripLinkDefinitions" => 20,
-		
-		"runBasicBlockGamut"   => 30,
-		);
-
-
-	protected function stripLinkDefinitions($text) {
-	#
-	# Strips link definitions from text, stores the URLs and titles in
-	# hash references.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Link defs are in the form: ^[id]: url "optional title"
-		$text = preg_replace_callback('{
-							^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?:	# id = $1
-							  [ ]*
-							  \n?				# maybe *one* newline
-							  [ ]*
-							(?:
-							  <(.+?)>			# url = $2
-							|
-							  (\S+?)			# url = $3
-							)
-							  [ ]*
-							  \n?				# maybe one newline
-							  [ ]*
-							(?:
-								(?<=\s)			# lookbehind for whitespace
-								["(]
-								(.*?)			# title = $4
-								[")]
-								[ ]*
-							)?	# title is optional
-							(?:\n+|\Z)
-			}xm',
-			array(&$this, '_stripLinkDefinitions_callback'),
-			$text);
-		return $text;
-	}
-	protected function _stripLinkDefinitions_callback($matches) {
-		$link_id = strtolower($matches[1]);
-		$url = $matches[2] == '' ? $matches[3] : $matches[2];
-		$this->urls[$link_id] = $url;
-		$this->titles[$link_id] =& $matches[4];
-		return ''; # String that will replace the block
-	}
-
-
-	protected function hashHTMLBlocks($text) {
-		if ($this->no_markup)  return $text;
-
-		$less_than_tab = $this->tab_width - 1;
-
-		# Hashify HTML blocks:
-		# We only want to do this for block-level HTML tags, such as headers,
-		# lists, and tables. That's because we still want to wrap <p>s around
-		# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
-		# phrase emphasis, and spans. The list of tags we're looking for is
-		# hard-coded:
-		#
-		# *  List "a" is made of tags which can be both inline or block-level.
-		#    These will be treated block-level when the start tag is alone on 
-		#    its line, otherwise they're not matched here and will be taken as 
-		#    inline later.
-		# *  List "b" is made of tags which are always block-level;
-		#
-		$block_tags_a_re = 'ins|del';
-		$block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'.
-						   'script|noscript|form|fieldset|iframe|math|svg|'.
-						   'article|section|nav|aside|hgroup|header|footer|'.
-						   'figure';
-
-		# Regular expression for the content of a block tag.
-		$nested_tags_level = 4;
-		$attr = '
-			(?>				# optional tag attributes
-			  \s			# starts with whitespace
-			  (?>
-				[^>"/]+		# text outside quotes
-			  |
-				/+(?!>)		# slash not followed by ">"
-			  |
-				"[^"]*"		# text inside double quotes (tolerate ">")
-			  |
-				\'[^\']*\'	# text inside single quotes (tolerate ">")
-			  )*
-			)?	
-			';
-		$content =
-			str_repeat('
-				(?>
-				  [^<]+			# content without tag
-				|
-				  <\2			# nested opening tag
-					'.$attr.'	# attributes
-					(?>
-					  />
-					|
-					  >', $nested_tags_level).	# end of opening tag
-					  '.*?'.					# last level nested tag content
-			str_repeat('
-					  </\2\s*>	# closing nested tag
-					)
-				  |				
-					<(?!/\2\s*>	# other tags with a different name
-				  )
-				)*',
-				$nested_tags_level);
-		$content2 = str_replace('\2', '\3', $content);
-
-		# First, look for nested blocks, e.g.:
-		# 	<div>
-		# 		<div>
-		# 		tags for inner block must be indented.
-		# 		</div>
-		# 	</div>
-		#
-		# The outermost tags must start at the left margin for this to match, and
-		# the inner nested divs must be indented.
-		# We need to do this before the next, more liberal match, because the next
-		# match will start at the first `<div>` and stop at the first `</div>`.
-		$text = preg_replace_callback('{(?>
-			(?>
-				(?<=\n\n)		# Starting after a blank line
-				|				# or
-				\A\n?			# the beginning of the doc
-			)
-			(						# save in $1
-
-			  # Match from `\n<tag>` to `</tag>\n`, handling nested tags 
-			  # in between.
-					
-						[ ]{0,'.$less_than_tab.'}
-						<('.$block_tags_b_re.')# start tag = $2
-						'.$attr.'>			# attributes followed by > and \n
-						'.$content.'		# content, support nesting
-						</\2>				# the matching end tag
-						[ ]*				# trailing spaces/tabs
-						(?=\n+|\Z)	# followed by a newline or end of document
-
-			| # Special version for tags of group a.
-
-						[ ]{0,'.$less_than_tab.'}
-						<('.$block_tags_a_re.')# start tag = $3
-						'.$attr.'>[ ]*\n	# attributes followed by >
-						'.$content2.'		# content, support nesting
-						</\3>				# the matching end tag
-						[ ]*				# trailing spaces/tabs
-						(?=\n+|\Z)	# followed by a newline or end of document
-					
-			| # Special case just for <hr />. It was easier to make a special 
-			  # case than to make the other regex more complicated.
-			
-						[ ]{0,'.$less_than_tab.'}
-						<(hr)				# start tag = $2
-						'.$attr.'			# attributes
-						/?>					# the matching end tag
-						[ ]*
-						(?=\n{2,}|\Z)		# followed by a blank line or end of document
-			
-			| # Special case for standalone HTML comments:
-			
-					[ ]{0,'.$less_than_tab.'}
-					(?s:
-						<!-- .*? -->
-					)
-					[ ]*
-					(?=\n{2,}|\Z)		# followed by a blank line or end of document
-			
-			| # PHP and ASP-style processor instructions (<? and <%)
-			
-					[ ]{0,'.$less_than_tab.'}
-					(?s:
-						<([?%])			# $2
-						.*?
-						\2>
-					)
-					[ ]*
-					(?=\n{2,}|\Z)		# followed by a blank line or end of document
-					
-			)
-			)}Sxmi',
-			array(&$this, '_hashHTMLBlocks_callback'),
-			$text);
-
-		return $text;
-	}
-	protected function _hashHTMLBlocks_callback($matches) {
-		$text = $matches[1];
-		$key  = $this->hashBlock($text);
-		return "\n\n$key\n\n";
-	}
-	
-	
-	protected function hashPart($text, $boundary = 'X') {
-	#
-	# Called whenever a tag must be hashed when a function insert an atomic 
-	# element in the text stream. Passing $text to through this function gives
-	# a unique text-token which will be reverted back when calling unhash.
-	#
-	# The $boundary argument specify what character should be used to surround
-	# the token. By convension, "B" is used for block elements that needs not
-	# to be wrapped into paragraph tags at the end, ":" is used for elements
-	# that are word separators and "X" is used in the general case.
-	#
-		# Swap back any tag hash found in $text so we do not have to `unhash`
-		# multiple times at the end.
-		$text = $this->unhash($text);
-		
-		# Then hash the block.
-		static $i = 0;
-		$key = "$boundary\x1A" . ++$i . $boundary;
-		$this->html_hashes[$key] = $text;
-		return $key; # String that will replace the tag.
-	}
-
-
-	protected function hashBlock($text) {
-	#
-	# Shortcut function for hashPart with block-level boundaries.
-	#
-		return $this->hashPart($text, 'B');
-	}
-
-
-	protected $block_gamut = array(
-	#
-	# These are all the transformations that form block-level
-	# tags like paragraphs, headers, and list items.
-	#
-		"doHeaders"         => 10,
-		"doHorizontalRules" => 20,
-		
-		"doLists"           => 40,
-		"doCodeBlocks"      => 50,
-		"doBlockQuotes"     => 60,
-		);
-
-	protected function runBlockGamut($text) {
-	#
-	# Run block gamut tranformations.
-	#
-		# We need to escape raw HTML in Markdown source before doing anything 
-		# else. This need to be done for each block, and not only at the 
-		# begining in the Markdown function since hashed blocks can be part of
-		# list items and could have been indented. Indented blocks would have 
-		# been seen as a code block in a previous pass of hashHTMLBlocks.
-		$text = $this->hashHTMLBlocks($text);
-		
-		return $this->runBasicBlockGamut($text);
-	}
-	
-	protected function runBasicBlockGamut($text) {
-	#
-	# Run block gamut tranformations, without hashing HTML blocks. This is 
-	# useful when HTML blocks are known to be already hashed, like in the first
-	# whole-document pass.
-	#
-		foreach ($this->block_gamut as $method => $priority) {
-			$text = $this->{$method}($text);
-		}
-		
-		# Finally form paragraph and restore hashed blocks.
-		$text = $this->formParagraphs($text);
-
-		return $text;
-	}
-	
-	
-	protected function doHorizontalRules($text) {
-		# Do Horizontal Rules:
-		return preg_replace(
-			'{
-				^[ ]{0,3}	# Leading space
-				([-*_])		# $1: First marker
-				(?>			# Repeated marker group
-					[ ]{0,2}	# Zero, one, or two spaces.
-					\1			# Marker character
-				){2,}		# Group repeated at least twice
-				[ ]*		# Tailing spaces
-				$			# End of line.
-			}mx',
-			"\n".$this->hashBlock("<hr$this->empty_element_suffix")."\n", 
-			$text);
-	}
-
-
-	protected $span_gamut = array(
-	#
-	# These are all the transformations that occur *within* block-level
-	# tags like paragraphs, headers, and list items.
-	#
-		# Process character escapes, code spans, and inline HTML
-		# in one shot.
-		"parseSpan"           => -30,
-
-		# Process anchor and image tags. Images must come first,
-		# because ![foo][f] looks like an anchor.
-		"doImages"            =>  10,
-		"doAnchors"           =>  20,
-		
-		# Make links out of things like `<http://example.com/>`
-		# Must come after doAnchors, because you can use < and >
-		# delimiters in inline links like [this](<url>).
-		"doAutoLinks"         =>  30,
-		"encodeAmpsAndAngles" =>  40,
-
-		"doItalicsAndBold"    =>  50,
-		"doHardBreaks"        =>  60,
-		);
-
-	protected function runSpanGamut($text) {
-	#
-	# Run span gamut tranformations.
-	#
-		foreach ($this->span_gamut as $method => $priority) {
-			$text = $this->{$method}($text);
-		}
-
-		return $text;
-	}
-	
-	
-	protected function doHardBreaks($text) {
-		# Do hard breaks:
-		return preg_replace_callback('/ {2,}\n/', 
-			array(&$this, '_doHardBreaks_callback'), $text);
-	}
-	protected function _doHardBreaks_callback($matches) {
-		return $this->hashPart("<br$this->empty_element_suffix\n");
-	}
-
-
-	protected function doAnchors($text) {
-	#
-	# Turn Markdown link shortcuts into XHTML <a> tags.
-	#
-		if ($this->in_anchor) return $text;
-		$this->in_anchor = true;
-		
-		#
-		# First, handle reference-style links: [link text] [id]
-		#
-		$text = preg_replace_callback('{
-			(					# wrap whole match in $1
-			  \[
-				('.$this->nested_brackets_re.')	# link text = $2
-			  \]
-
-			  [ ]?				# one optional space
-			  (?:\n[ ]*)?		# one optional newline followed by spaces
-
-			  \[
-				(.*?)		# id = $3
-			  \]
-			)
-			}xs',
-			array(&$this, '_doAnchors_reference_callback'), $text);
-
-		#
-		# Next, inline-style links: [link text](url "optional title")
-		#
-		$text = preg_replace_callback('{
-			(				# wrap whole match in $1
-			  \[
-				('.$this->nested_brackets_re.')	# link text = $2
-			  \]
-			  \(			# literal paren
-				[ \n]*
-				(?:
-					<(.+?)>	# href = $3
-				|
-					('.$this->nested_url_parenthesis_re.')	# href = $4
-				)
-				[ \n]*
-				(			# $5
-				  ([\'"])	# quote char = $6
-				  (.*?)		# Title = $7
-				  \6		# matching quote
-				  [ \n]*	# ignore any spaces/tabs between closing quote and )
-				)?			# title is optional
-			  \)
-			)
-			}xs',
-			array(&$this, '_doAnchors_inline_callback'), $text);
-
-		#
-		# Last, handle reference-style shortcuts: [link text]
-		# These must come last in case you've also got [link text][1]
-		# or [link text](/foo)
-		#
-		$text = preg_replace_callback('{
-			(					# wrap whole match in $1
-			  \[
-				([^\[\]]+)		# link text = $2; can\'t contain [ or ]
-			  \]
-			)
-			}xs',
-			array(&$this, '_doAnchors_reference_callback'), $text);
-
-		$this->in_anchor = false;
-		return $text;
-	}
-	protected function _doAnchors_reference_callback($matches) {
-		$whole_match =  $matches[1];
-		$link_text   =  $matches[2];
-		$link_id     =& $matches[3];
-
-		if ($link_id == "") {
-			# for shortcut links like [this][] or [this].
-			$link_id = $link_text;
-		}
-		
-		# lower-case and turn embedded newlines into spaces
-		$link_id = strtolower($link_id);
-		$link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
-
-		if (isset($this->urls[$link_id])) {
-			$url = $this->urls[$link_id];
-			$url = $this->encodeAttribute($url);
-			
-			$result = "<a href=\"$url\"";
-			if ( isset( $this->titles[$link_id] ) ) {
-				$title = $this->titles[$link_id];
-				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
-			}
-		
-			$link_text = $this->runSpanGamut($link_text);
-			$result .= ">$link_text</a>";
-			$result = $this->hashPart($result);
-		}
-		else {
-			$result = $whole_match;
-		}
-		return $result;
-	}
-	protected function _doAnchors_inline_callback($matches) {
-		$whole_match	=  $matches[1];
-		$link_text		=  $this->runSpanGamut($matches[2]);
-		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-
-		$url = $this->encodeAttribute($url);
-
-		$result = "<a href=\"$url\"";
-		if (isset($title)) {
-			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\"";
-		}
-		
-		$link_text = $this->runSpanGamut($link_text);
-		$result .= ">$link_text</a>";
-
-		return $this->hashPart($result);
-	}
-
-
-	protected function doImages($text) {
-	#
-	# Turn Markdown image shortcuts into <img> tags.
-	#
-		#
-		# First, handle reference-style labeled images: ![alt text][id]
-		#
-		$text = preg_replace_callback('{
-			(				# wrap whole match in $1
-			  !\[
-				('.$this->nested_brackets_re.')		# alt text = $2
-			  \]
-
-			  [ ]?				# one optional space
-			  (?:\n[ ]*)?		# one optional newline followed by spaces
-
-			  \[
-				(.*?)		# id = $3
-			  \]
-
-			)
-			}xs', 
-			array(&$this, '_doImages_reference_callback'), $text);
-
-		#
-		# Next, handle inline images:  ![alt text](url "optional title")
-		# Don't forget: encode * and _
-		#
-		$text = preg_replace_callback('{
-			(				# wrap whole match in $1
-			  !\[
-				('.$this->nested_brackets_re.')		# alt text = $2
-			  \]
-			  \s?			# One optional whitespace character
-			  \(			# literal paren
-				[ \n]*
-				(?:
-					<(\S*)>	# src url = $3
-				|
-					('.$this->nested_url_parenthesis_re.')	# src url = $4
-				)
-				[ \n]*
-				(			# $5
-				  ([\'"])	# quote char = $6
-				  (.*?)		# title = $7
-				  \6		# matching quote
-				  [ \n]*
-				)?			# title is optional
-			  \)
-			)
-			}xs',
-			array(&$this, '_doImages_inline_callback'), $text);
-
-		return $text;
-	}
-	protected function _doImages_reference_callback($matches) {
-		$whole_match = $matches[1];
-		$alt_text    = $matches[2];
-		$link_id     = strtolower($matches[3]);
-
-		if ($link_id == "") {
-			$link_id = strtolower($alt_text); # for shortcut links like ![this][].
-		}
-
-		$alt_text = $this->encodeAttribute($alt_text);
-		if (isset($this->urls[$link_id])) {
-			$url = $this->encodeAttribute($this->urls[$link_id]);
-			$result = "<img src=\"$url\" alt=\"$alt_text\"";
-			if (isset($this->titles[$link_id])) {
-				$title = $this->titles[$link_id];
-				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
-			}
-			$result .= $this->empty_element_suffix;
-			$result = $this->hashPart($result);
-		}
-		else {
-			# If there's no such link ID, leave intact:
-			$result = $whole_match;
-		}
-
-		return $result;
-	}
-	protected function _doImages_inline_callback($matches) {
-		$whole_match	= $matches[1];
-		$alt_text		= $matches[2];
-		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-
-		$alt_text = $this->encodeAttribute($alt_text);
-		$url = $this->encodeAttribute($url);
-		$result = "<img src=\"$url\" alt=\"$alt_text\"";
-		if (isset($title)) {
-			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\""; # $title already quoted
-		}
-		$result .= $this->empty_element_suffix;
-
-		return $this->hashPart($result);
-	}
-
-
-	protected function doHeaders($text) {
-		# Setext-style headers:
-		#	  Header 1
-		#	  ========
-		#  
-		#	  Header 2
-		#	  --------
-		#
-		$text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx',
-			array(&$this, '_doHeaders_callback_setext'), $text);
-
-		# atx-style headers:
-		#	# Header 1
-		#	## Header 2
-		#	## Header 2 with closing hashes ##
-		#	...
-		#	###### Header 6
-		#
-		$text = preg_replace_callback('{
-				^(\#{1,6})	# $1 = string of #\'s
-				[ ]*
-				(.+?)		# $2 = Header text
-				[ ]*
-				\#*			# optional closing #\'s (not counted)
-				\n+
-			}xm',
-			array(&$this, '_doHeaders_callback_atx'), $text);
-
-		return $text;
-	}
-	protected function _doHeaders_callback_setext($matches) {
-		# Terrible hack to check we haven't found an empty list item.
-		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
-			return $matches[0];
-		
-		$level = $matches[2]{0} == '=' ? 1 : 2;
-		$block = "<h$level>".$this->runSpanGamut($matches[1])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-	protected function _doHeaders_callback_atx($matches) {
-		$level = strlen($matches[1]);
-		$block = "<h$level>".$this->runSpanGamut($matches[2])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-
-
-	protected function doLists($text) {
-	#
-	# Form HTML ordered (numbered) and unordered (bulleted) lists.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Re-usable patterns to match list item bullets and number markers:
-		$marker_ul_re  = '[*+-]';
-		$marker_ol_re  = '\d+[\.]';
-		$marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
-
-		$markers_relist = array(
-			$marker_ul_re => $marker_ol_re,
-			$marker_ol_re => $marker_ul_re,
-			);
-
-		foreach ($markers_relist as $marker_re => $other_marker_re) {
-			# Re-usable pattern to match any entirel ul or ol list:
-			$whole_list_re = '
-				(								# $1 = whole list
-				  (								# $2
-					([ ]{0,'.$less_than_tab.'})	# $3 = number of spaces
-					('.$marker_re.')			# $4 = first list item marker
-					[ ]+
-				  )
-				  (?s:.+?)
-				  (								# $5
-					  \z
-					|
-					  \n{2,}
-					  (?=\S)
-					  (?!						# Negative lookahead for another list item marker
-						[ ]*
-						'.$marker_re.'[ ]+
-					  )
-					|
-					  (?=						# Lookahead for another kind of list
-					    \n
-						\3						# Must have the same indentation
-						'.$other_marker_re.'[ ]+
-					  )
-				  )
-				)
-			'; // mx
-			
-			# We use a different prefix before nested lists than top-level lists.
-			# See extended comment in _ProcessListItems().
-		
-			if ($this->list_level) {
-				$text = preg_replace_callback('{
-						^
-						'.$whole_list_re.'
-					}mx',
-					array(&$this, '_doLists_callback'), $text);
-			}
-			else {
-				$text = preg_replace_callback('{
-						(?:(?<=\n)\n|\A\n?) # Must eat the newline
-						'.$whole_list_re.'
-					}mx',
-					array(&$this, '_doLists_callback'), $text);
-			}
-		}
-
-		return $text;
-	}
-	protected function _doLists_callback($matches) {
-		# Re-usable patterns to match list item bullets and number markers:
-		$marker_ul_re  = '[*+-]';
-		$marker_ol_re  = '\d+[\.]';
-		$marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
-		
-		$list = $matches[1];
-		$list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol";
-		
-		$marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
-		
-		$list .= "\n";
-		$result = $this->processListItems($list, $marker_any_re);
-		
-		$result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
-		return "\n". $result ."\n\n";
-	}
-
-	protected $list_level = 0;
-
-	protected function processListItems($list_str, $marker_any_re) {
-	#
-	#	Process the contents of a single ordered or unordered list, splitting it
-	#	into individual list items.
-	#
-		# The $this->list_level global keeps track of when we're inside a list.
-		# Each time we enter a list, we increment it; when we leave a list,
-		# we decrement. If it's zero, we're not in a list anymore.
-		#
-		# We do this because when we're not inside a list, we want to treat
-		# something like this:
-		#
-		#		I recommend upgrading to version
-		#		8. Oops, now this line is treated
-		#		as a sub-list.
-		#
-		# As a single paragraph, despite the fact that the second line starts
-		# with a digit-period-space sequence.
-		#
-		# Whereas when we're inside a list (or sub-list), that line will be
-		# treated as the start of a sub-list. What a kludge, huh? This is
-		# an aspect of Markdown's syntax that's hard to parse perfectly
-		# without resorting to mind-reading. Perhaps the solution is to
-		# change the syntax rules such that sub-lists must start with a
-		# starting cardinal number; e.g. "1." or "a.".
-		
-		$this->list_level++;
-
-		# trim trailing blank lines:
-		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
-
-		$list_str = preg_replace_callback('{
-			(\n)?							# leading line = $1
-			(^[ ]*)							# leading whitespace = $2
-			('.$marker_any_re.'				# list marker and space = $3
-				(?:[ ]+|(?=\n))	# space only required if item is not empty
-			)
-			((?s:.*?))						# list item text   = $4
-			(?:(\n+(?=\n))|\n)				# tailing blank line = $5
-			(?= \n* (\z | \2 ('.$marker_any_re.') (?:[ ]+|(?=\n))))
-			}xm',
-			array(&$this, '_processListItems_callback'), $list_str);
-
-		$this->list_level--;
-		return $list_str;
-	}
-	protected function _processListItems_callback($matches) {
-		$item = $matches[4];
-		$leading_line =& $matches[1];
-		$leading_space =& $matches[2];
-		$marker_space = $matches[3];
-		$tailing_blank_line =& $matches[5];
-
-		if ($leading_line || $tailing_blank_line || 
-			preg_match('/\n{2,}/', $item))
-		{
-			# Replace marker with the appropriate whitespace indentation
-			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
-			$item = $this->runBlockGamut($this->outdent($item)."\n");
-		}
-		else {
-			# Recursion for sub-lists:
-			$item = $this->doLists($this->outdent($item));
-			$item = preg_replace('/\n+$/', '', $item);
-			$item = $this->runSpanGamut($item);
-		}
-
-		return "<li>" . $item . "</li>\n";
-	}
-
-
-	protected function doCodeBlocks($text) {
-	#
-	#	Process Markdown `<pre><code>` blocks.
-	#
-		$text = preg_replace_callback('{
-				(?:\n\n|\A\n?)
-				(	            # $1 = the code block -- one or more lines, starting with a space/tab
-				  (?>
-					[ ]{'.$this->tab_width.'}  # Lines must start with a tab or a tab-width of spaces
-					.*\n+
-				  )+
-				)
-				((?=^[ ]{0,'.$this->tab_width.'}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
-			}xm',
-			array(&$this, '_doCodeBlocks_callback'), $text);
-
-		return $text;
-	}
-	protected function _doCodeBlocks_callback($matches) {
-		$codeblock = $matches[1];
-
-		$codeblock = $this->outdent($codeblock);
-		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
-
-		# trim leading newlines and trailing newlines
-		$codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
-
-		$codeblock = "<pre><code>$codeblock\n</code></pre>";
-		return "\n\n".$this->hashBlock($codeblock)."\n\n";
-	}
-
-
-	protected function makeCodeSpan($code) {
-	#
-	# Create a code span markup for $code. Called from handleSpanToken.
-	#
-		$code = htmlspecialchars(trim($code), ENT_NOQUOTES);
-		return $this->hashPart("<code>$code</code>");
-	}
-
-
-	protected $em_relist = array(
-		''  => '(?:(?<!\*)\*(?!\*)|(?<!_)_(?!_))(?=\S|$)(?![\.,:;]\s)',
-		'*' => '(?<=\S|^)(?<!\*)\*(?!\*)',
-		'_' => '(?<=\S|^)(?<!_)_(?!_)',
-		);
-	protected $strong_relist = array(
-		''   => '(?:(?<!\*)\*\*(?!\*)|(?<!_)__(?!_))(?=\S|$)(?![\.,:;]\s)',
-		'**' => '(?<=\S|^)(?<!\*)\*\*(?!\*)',
-		'__' => '(?<=\S|^)(?<!_)__(?!_)',
-		);
-	protected $em_strong_relist = array(
-		''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<!_)___(?!_))(?=\S|$)(?![\.,:;]\s)',
-		'***' => '(?<=\S|^)(?<!\*)\*\*\*(?!\*)',
-		'___' => '(?<=\S|^)(?<!_)___(?!_)',
-		);
-	protected $em_strong_prepared_relist;
-	
-	protected function prepareItalicsAndBold() {
-	#
-	# Prepare regular expressions for searching emphasis tokens in any
-	# context.
-	#
-		foreach ($this->em_relist as $em => $em_re) {
-			foreach ($this->strong_relist as $strong => $strong_re) {
-				# Construct list of allowed token expressions.
-				$token_relist = array();
-				if (isset($this->em_strong_relist["$em$strong"])) {
-					$token_relist[] = $this->em_strong_relist["$em$strong"];
-				}
-				$token_relist[] = $em_re;
-				$token_relist[] = $strong_re;
-				
-				# Construct master expression from list.
-				$token_re = '{('. implode('|', $token_relist) .')}';
-				$this->em_strong_prepared_relist["$em$strong"] = $token_re;
-			}
-		}
-	}
-	
-	protected function doItalicsAndBold($text) {
-		$token_stack = array('');
-		$text_stack = array('');
-		$em = '';
-		$strong = '';
-		$tree_char_em = false;
-		
-		while (1) {
-			#
-			# Get prepared regular expression for seraching emphasis tokens
-			# in current context.
-			#
-			$token_re = $this->em_strong_prepared_relist["$em$strong"];
-			
-			#
-			# Each loop iteration search for the next emphasis token. 
-			# Each token is then passed to handleSpanToken.
-			#
-			$parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
-			$text_stack[0] .= $parts[0];
-			$token =& $parts[1];
-			$text =& $parts[2];
-			
-			if (empty($token)) {
-				# Reached end of text span: empty stack without emitting.
-				# any more emphasis.
-				while ($token_stack[0]) {
-					$text_stack[1] .= array_shift($token_stack);
-					$text_stack[0] .= array_shift($text_stack);
-				}
-				break;
-			}
-			
-			$token_len = strlen($token);
-			if ($tree_char_em) {
-				# Reached closing marker while inside a three-char emphasis.
-				if ($token_len == 3) {
-					# Three-char closing marker, close em and strong.
-					array_shift($token_stack);
-					$span = array_shift($text_stack);
-					$span = $this->runSpanGamut($span);
-					$span = "<strong><em>$span</em></strong>";
-					$text_stack[0] .= $this->hashPart($span);
-					$em = '';
-					$strong = '';
-				} else {
-					# Other closing marker: close one em or strong and
-					# change current token state to match the other
-					$token_stack[0] = str_repeat($token{0}, 3-$token_len);
-					$tag = $token_len == 2 ? "strong" : "em";
-					$span = $text_stack[0];
-					$span = $this->runSpanGamut($span);
-					$span = "<$tag>$span</$tag>";
-					$text_stack[0] = $this->hashPart($span);
-					$$tag = ''; # $$tag stands for $em or $strong
-				}
-				$tree_char_em = false;
-			} else if ($token_len == 3) {
-				if ($em) {
-					# Reached closing marker for both em and strong.
-					# Closing strong marker:
-					for ($i = 0; $i < 2; ++$i) {
-						$shifted_token = array_shift($token_stack);
-						$tag = strlen($shifted_token) == 2 ? "strong" : "em";
-						$span = array_shift($text_stack);
-						$span = $this->runSpanGamut($span);
-						$span = "<$tag>$span</$tag>";
-						$text_stack[0] .= $this->hashPart($span);
-						$$tag = ''; # $$tag stands for $em or $strong
-					}
-				} else {
-					# Reached opening three-char emphasis marker. Push on token 
-					# stack; will be handled by the special condition above.
-					$em = $token{0};
-					$strong = "$em$em";
-					array_unshift($token_stack, $token);
-					array_unshift($text_stack, '');
-					$tree_char_em = true;
-				}
-			} else if ($token_len == 2) {
-				if ($strong) {
-					# Unwind any dangling emphasis marker:
-					if (strlen($token_stack[0]) == 1) {
-						$text_stack[1] .= array_shift($token_stack);
-						$text_stack[0] .= array_shift($text_stack);
-					}
-					# Closing strong marker:
-					array_shift($token_stack);
-					$span = array_shift($text_stack);
-					$span = $this->runSpanGamut($span);
-					$span = "<strong>$span</strong>";
-					$text_stack[0] .= $this->hashPart($span);
-					$strong = '';
-				} else {
-					array_unshift($token_stack, $token);
-					array_unshift($text_stack, '');
-					$strong = $token;
-				}
-			} else {
-				# Here $token_len == 1
-				if ($em) {
-					if (strlen($token_stack[0]) == 1) {
-						# Closing emphasis marker:
-						array_shift($token_stack);
-						$span = array_shift($text_stack);
-						$span = $this->runSpanGamut($span);
-						$span = "<em>$span</em>";
-						$text_stack[0] .= $this->hashPart($span);
-						$em = '';
-					} else {
-						$text_stack[0] .= $token;
-					}
-				} else {
-					array_unshift($token_stack, $token);
-					array_unshift($text_stack, '');
-					$em = $token;
-				}
-			}
-		}
-		return $text_stack[0];
-	}
-
-
-	protected function doBlockQuotes($text) {
-		$text = preg_replace_callback('/
-			  (								# Wrap whole match in $1
-				(?>
-				  ^[ ]*>[ ]?			# ">" at the start of a line
-					.+\n					# rest of the first line
-				  (.+\n)*					# subsequent consecutive lines
-				  \n*						# blanks
-				)+
-			  )
-			/xm',
-			array(&$this, '_doBlockQuotes_callback'), $text);
-
-		return $text;
-	}
-	protected function _doBlockQuotes_callback($matches) {
-		$bq = $matches[1];
-		# trim one level of quoting - trim whitespace-only lines
-		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
-		$bq = $this->runBlockGamut($bq);		# recurse
-
-		$bq = preg_replace('/^/m', "  ", $bq);
-		# These leading spaces cause problem with <pre> content, 
-		# so we need to fix that:
-		$bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx', 
-			array(&$this, '_doBlockQuotes_callback2'), $bq);
-
-		return "\n". $this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
-	}
-	protected function _doBlockQuotes_callback2($matches) {
-		$pre = $matches[1];
-		$pre = preg_replace('/^  /m', '', $pre);
-		return $pre;
-	}
-
-
-	protected function formParagraphs($text) {
-	#
-	#	Params:
-	#		$text - string to process with html <p> tags
-	#
-		# Strip leading and trailing lines:
-		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
-
-		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
-
-		#
-		# Wrap <p> tags and unhashify HTML blocks
-		#
-		foreach ($grafs as $key => $value) {
-			if (!preg_match('/^B\x1A[0-9]+B$/', $value)) {
-				# Is a paragraph.
-				$value = $this->runSpanGamut($value);
-				$value = preg_replace('/^([ ]*)/', "<p>", $value);
-				$value .= "</p>";
-				$grafs[$key] = $this->unhash($value);
-			}
-			else {
-				# Is a block.
-				# Modify elements of @grafs in-place...
-				$graf = $value;
-				$block = $this->html_hashes[$graf];
-				$graf = $block;
-//				if (preg_match('{
-//					\A
-//					(							# $1 = <div> tag
-//					  <div  \s+
-//					  [^>]*
-//					  \b
-//					  markdown\s*=\s*  ([\'"])	#	$2 = attr quote char
-//					  1
-//					  \2
-//					  [^>]*
-//					  >
-//					)
-//					(							# $3 = contents
-//					.*
-//					)
-//					(</div>)					# $4 = closing tag
-//					\z
-//					}xs', $block, $matches))
-//				{
-//					list(, $div_open, , $div_content, $div_close) = $matches;
-//
-//					# We can't call Markdown(), because that resets the hash;
-//					# that initialization code should be pulled into its own sub, though.
-//					$div_content = $this->hashHTMLBlocks($div_content);
-//					
-//					# Run document gamut methods on the content.
-//					foreach ($this->document_gamut as $method => $priority) {
-//						$div_content = $this->{$method}($div_content);
-//					}
-//
-//					$div_open = preg_replace(
-//						'{\smarkdown\s*=\s*([\'"]).+?\1}', '', $div_open);
-//
-//					$graf = $div_open . "\n" . $div_content . "\n" . $div_close;
-//				}
-				$grafs[$key] = $graf;
-			}
-		}
-
-		return implode("\n\n", $grafs);
-	}
-
-
-	protected function encodeAttribute($text) {
-	#
-	# Encode text for a double-quoted HTML attribute. This function
-	# is *not* suitable for attributes enclosed in single quotes.
-	#
-		$text = $this->encodeAmpsAndAngles($text);
-		$text = str_replace('"', '&quot;', $text);
-		return $text;
-	}
-	
-	
-	protected function encodeAmpsAndAngles($text) {
-	#
-	# Smart processing for ampersands and angle brackets that need to 
-	# be encoded. Valid character entities are left alone unless the
-	# no-entities mode is set.
-	#
-		if ($this->no_entities) {
-			$text = str_replace('&', '&amp;', $text);
-		} else {
-			# Ampersand-encoding based entirely on Nat Irons's Amputator
-			# MT plugin: <http://bumppo.net/projects/amputator/>
-			$text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/', 
-								'&amp;', $text);;
-		}
-		# Encode remaining <'s
-		$text = str_replace('<', '&lt;', $text);
-
-		return $text;
-	}
-
-
-	protected function doAutoLinks($text) {
-		$text = preg_replace_callback('{<((https?|ftp|dict):[^\'">\s]+)>}i', 
-			array(&$this, '_doAutoLinks_url_callback'), $text);
-
-		# Email addresses: <address@domain.foo>
-		$text = preg_replace_callback('{
-			<
-			(?:mailto:)?
-			(
-				(?:
-					[-!#$%&\'*+/=?^_`.{|}~\w\x80-\xFF]+
-				|
-					".*?"
-				)
-				\@
-				(?:
-					[-a-z0-9\x80-\xFF]+(\.[-a-z0-9\x80-\xFF]+)*\.[a-z]+
-				|
-					\[[\d.a-fA-F:]+\]	# IPv4 & IPv6
-				)
-			)
-			>
-			}xi',
-			array(&$this, '_doAutoLinks_email_callback'), $text);
-
-		return $text;
-	}
-	protected function _doAutoLinks_url_callback($matches) {
-		$url = $this->encodeAttribute($matches[1]);
-		$link = "<a href=\"$url\">$url</a>";
-		return $this->hashPart($link);
-	}
-	protected function _doAutoLinks_email_callback($matches) {
-		$address = $matches[1];
-		$link = $this->encodeEmailAddress($address);
-		return $this->hashPart($link);
-	}
-
-
-	protected function encodeEmailAddress($addr) {
-	#
-	#	Input: an email address, e.g. "foo@example.com"
-	#
-	#	Output: the email address as a mailto link, with each character
-	#		of the address encoded as either a decimal or hex entity, in
-	#		the hopes of foiling most address harvesting spam bots. E.g.:
-	#
-	#	  <p><a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#x66;o&#111;
-	#        &#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;&#101;&#46;&#x63;&#111;
-	#        &#x6d;">&#x66;o&#111;&#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;
-	#        &#101;&#46;&#x63;&#111;&#x6d;</a></p>
-	#
-	#	Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
-	#   With some optimizations by Milian Wolff.
-	#
-		$addr = "mailto:" . $addr;
-		$chars = preg_split('/(?<!^)(?!$)/', $addr);
-		$seed = (int)abs(crc32($addr) / strlen($addr)); # Deterministic seed.
-		
-		foreach ($chars as $key => $char) {
-			$ord = ord($char);
-			# Ignore non-ascii chars.
-			if ($ord < 128) {
-				$r = ($seed * (1 + $key)) % 100; # Pseudo-random function.
-				# roughly 10% raw, 45% hex, 45% dec
-				# '@' *must* be encoded. I insist.
-				if ($r > 90 && $char != '@') /* do nothing */;
-				else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
-				else              $chars[$key] = '&#'.$ord.';';
-			}
-		}
-		
-		$addr = implode('', $chars);
-		$text = implode('', array_slice($chars, 7)); # text without `mailto:`
-		$addr = "<a href=\"$addr\">$text</a>";
-
-		return $addr;
-	}
-
-
-	protected function parseSpan($str) {
-	#
-	# Take the string $str and parse it into tokens, hashing embeded HTML,
-	# escaped characters and handling code spans.
-	#
-		$output = '';
-		
-		$span_re = '{
-				(
-					\\\\'.$this->escape_chars_re.'
-				|
-					(?<![`\\\\])
-					`+						# code span marker
-			'.( $this->no_markup ? '' : '
-				|
-					<!--    .*?     -->		# comment
-				|
-					<\?.*?\?> | <%.*?%>		# processing instruction
-				|
-					<[!$]?[-a-zA-Z0-9:_]+	# regular tags
-					(?>
-						\s
-						(?>[^"\'>]+|"[^"]*"|\'[^\']*\')*
-					)?
-					>
-				|
-					<[-a-zA-Z0-9:_]+\s*/> # xml-style empty tag
-				|
-					</[-a-zA-Z0-9:_]+\s*> # closing tag
-			').'
-				)
-				}xs';
-
-		while (1) {
-			#
-			# Each loop iteration seach for either the next tag, the next 
-			# openning code span marker, or the next escaped character. 
-			# Each token is then passed to handleSpanToken.
-			#
-			$parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
-			
-			# Create token from text preceding tag.
-			if ($parts[0] != "") {
-				$output .= $parts[0];
-			}
-			
-			# Check if we reach the end.
-			if (isset($parts[1])) {
-				$output .= $this->handleSpanToken($parts[1], $parts[2]);
-				$str = $parts[2];
-			}
-			else {
-				break;
-			}
-		}
-		
-		return $output;
-	}
-	
-	
-	protected function handleSpanToken($token, &$str) {
-	#
-	# Handle $token provided by parseSpan by determining its nature and 
-	# returning the corresponding value that should replace it.
-	#
-		switch ($token{0}) {
-			case "\\":
-				return $this->hashPart("&#". ord($token{1}). ";");
-			case "`":
-				# Search for end marker in remaining text.
-				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', 
-					$str, $matches))
-				{
-					$str = $matches[2];
-					$codespan = $this->makeCodeSpan($matches[1]);
-					return $this->hashPart($codespan);
-				}
-				return $token; // return as text since no ending marker found.
-			default:
-				return $this->hashPart($token);
-		}
-	}
-
-
-	protected function outdent($text) {
-	#
-	# Remove one level of line-leading tabs or spaces
-	#
-		return preg_replace('/^(\t|[ ]{1,'.$this->tab_width.'})/m', '', $text);
-	}
-
-
-	# String length function for detab. `_initDetab` will create a function to 
-	# hanlde UTF-8 if the default function does not exist.
-	protected $utf8_strlen = 'mb_strlen';
-	
-	protected function detab($text) {
-	#
-	# Replace tabs with the appropriate amount of space.
-	#
-		# For each line we separate the line in blocks delemited by
-		# tab characters. Then we reconstruct every line by adding the 
-		# appropriate number of space between each blocks.
-		
-		$text = preg_replace_callback('/^.*\t.*$/m',
-			array(&$this, '_detab_callback'), $text);
-
-		return $text;
-	}
-	protected function _detab_callback($matches) {
-		$line = $matches[0];
-		$strlen = $this->utf8_strlen; # strlen function for UTF-8.
-		
-		# Split in blocks.
-		$blocks = explode("\t", $line);
-		# Add each blocks to the line.
-		$line = $blocks[0];
-		unset($blocks[0]); # Do not add first block twice.
-		foreach ($blocks as $block) {
-			# Calculate amount of space, insert spaces, insert block.
-			$amount = $this->tab_width - 
-				$strlen($line, 'UTF-8') % $this->tab_width;
-			$line .= str_repeat(" ", $amount) . $block;
-		}
-		return $line;
-	}
-	protected function _initDetab() {
-	#
-	# Check for the availability of the function in the `utf8_strlen` property
-	# (initially `mb_strlen`). If the function is not available, create a 
-	# function that will loosely count the number of UTF-8 characters with a
-	# regular expression.
-	#
-		if (function_exists($this->utf8_strlen)) return;
-		$this->utf8_strlen = create_function('$text', 'return preg_match_all(
-			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/", 
-			$text, $m);');
-	}
-
-
-	protected function unhash($text) {
-	#
-	# Swap back in all the tags hashed by _HashHTMLBlocks.
-	#
-		return preg_replace_callback('/(.)\x1A[0-9]+\1/', 
-			array(&$this, '_unhash_callback'), $text);
-	}
-	protected function _unhash_callback($matches) {
-		return $this->html_hashes[$matches[0]];
-	}
-
-}
-
-
-#
-# Temporary Markdown Extra Parser Implementation Class
-#
-# NOTE: DON'T USE THIS CLASS
-# Currently the implementation of of Extra resides here in this temporary class.
-# This makes it easier to propagate the changes between the three different
-# packaging styles of PHP Markdown. When this issue is resolved, this
-# MarkdownExtra_TmpImpl class here will disappear and \Michelf\MarkdownExtra
-# will contain the code. So please use \Michelf\MarkdownExtra and ignore this
-# one.
-#
-
-class _MarkdownExtra_TmpImpl extends \Michelf\Markdown {
-
-	### Configuration Variables ###
-
-	# Prefix for footnote ids.
-	public $fn_id_prefix = "";
-	
-	# Optional title attribute for footnote links and backlinks.
-	public $fn_link_title = "";
-	public $fn_backlink_title = "";
-	
-	# Optional class attribute for footnote links and backlinks.
-	public $fn_link_class = "footnote-ref";
-	public $fn_backlink_class = "footnote-backref";
-
-	# Class name for table cell alignment (%% replaced left/center/right)
-	# For instance: 'go-%%' becomes 'go-left' or 'go-right' or 'go-center'
-	# If empty, the align attribute is used instead of a class name.
-	public $table_align_class_tmpl = '';
-
-	# Optional class prefix for fenced code block.
-	public $code_class_prefix = "";
-	# Class attribute for code blocks goes on the `code` tag;
-	# setting this to true will put attributes on the `pre` tag instead.
-	public $code_attr_on_pre = false;
-	
-	# Predefined abbreviations.
-	public $predef_abbr = array();
-
-
-	### Parser Implementation ###
-
-	public function __construct() {
-	#
-	# Constructor function. Initialize the parser object.
-	#
-		# Add extra escapable characters before parent constructor 
-		# initialize the table.
-		$this->escape_chars .= ':|';
-		
-		# Insert extra document, block, and span transformations. 
-		# Parent constructor will do the sorting.
-		$this->document_gamut += array(
-			"doFencedCodeBlocks" => 5,
-			"stripFootnotes"     => 15,
-			"stripAbbreviations" => 25,
-			"appendFootnotes"    => 50,
-			);
-		$this->block_gamut += array(
-			"doFencedCodeBlocks" => 5,
-			"doTables"           => 15,
-			"doDefLists"         => 45,
-			);
-		$this->span_gamut += array(
-			"doFootnotes"        => 5,
-			"doAbbreviations"    => 70,
-			);
-		
-		parent::__construct();
-	}
-	
-	
-	# Extra variables used during extra transformations.
-	protected $footnotes = array();
-	protected $footnotes_ordered = array();
-	protected $footnotes_ref_count = array();
-	protected $footnotes_numbers = array();
-	protected $abbr_desciptions = array();
-	protected $abbr_word_re = '';
-	
-	# Give the current footnote number.
-	protected $footnote_counter = 1;
-	
-	
-	protected function setup() {
-	#
-	# Setting up Extra-specific variables.
-	#
-		parent::setup();
-		
-		$this->footnotes = array();
-		$this->footnotes_ordered = array();
-		$this->footnotes_ref_count = array();
-		$this->footnotes_numbers = array();
-		$this->abbr_desciptions = array();
-		$this->abbr_word_re = '';
-		$this->footnote_counter = 1;
-		
-		foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
-			if ($this->abbr_word_re)
-				$this->abbr_word_re .= '|';
-			$this->abbr_word_re .= preg_quote($abbr_word);
-			$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
-		}
-	}
-	
-	protected function teardown() {
-	#
-	# Clearing Extra-specific variables.
-	#
-		$this->footnotes = array();
-		$this->footnotes_ordered = array();
-		$this->footnotes_ref_count = array();
-		$this->footnotes_numbers = array();
-		$this->abbr_desciptions = array();
-		$this->abbr_word_re = '';
-		
-		parent::teardown();
-	}
-	
-	
-	### Extra Attribute Parser ###
-
-	# Expression to use to catch attributes (includes the braces)
-	protected $id_class_attr_catch_re = '\{((?:[ ]*[#.][-_:a-zA-Z0-9]+){1,})[ ]*\}';
-	# Expression to use when parsing in a context when no capture is desired
-	protected $id_class_attr_nocatch_re = '\{(?:[ ]*[#.][-_:a-zA-Z0-9]+){1,}[ ]*\}';
-
-	protected function doExtraAttributes($tag_name, $attr) {
-	#
-	# Parse attributes caught by the $this->id_class_attr_catch_re expression
-	# and return the HTML-formatted list of attributes.
-	#
-	# Currently supported attributes are .class and #id.
-	#
-		if (empty($attr)) return "";
-		
-		# Split on components
-		preg_match_all('/[#.][-_:a-zA-Z0-9]+/', $attr, $matches);
-		$elements = $matches[0];
-
-		# handle classes and ids (only first id taken into account)
-		$classes = array();
-		$id = false;
-		foreach ($elements as $element) {
-			if ($element{0} == '.') {
-				$classes[] = substr($element, 1);
-			} else if ($element{0} == '#') {
-				if ($id === false) $id = substr($element, 1);
-			}
-		}
-
-		# compose attributes as string
-		$attr_str = "";
-		if (!empty($id)) {
-			$attr_str .= ' id="'.$id.'"';
-		}
-		if (!empty($classes)) {
-			$attr_str .= ' class="'.implode(" ", $classes).'"';
-		}
-		return $attr_str;
-	}
-
-
-	protected function stripLinkDefinitions($text) {
-	#
-	# Strips link definitions from text, stores the URLs and titles in
-	# hash references.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Link defs are in the form: ^[id]: url "optional title"
-		$text = preg_replace_callback('{
-							^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?:	# id = $1
-							  [ ]*
-							  \n?				# maybe *one* newline
-							  [ ]*
-							(?:
-							  <(.+?)>			# url = $2
-							|
-							  (\S+?)			# url = $3
-							)
-							  [ ]*
-							  \n?				# maybe one newline
-							  [ ]*
-							(?:
-								(?<=\s)			# lookbehind for whitespace
-								["(]
-								(.*?)			# title = $4
-								[")]
-								[ ]*
-							)?	# title is optional
-					(?:[ ]* '.$this->id_class_attr_catch_re.' )?  # $5 = extra id & class attr
-							(?:\n+|\Z)
-			}xm',
-			array(&$this, '_stripLinkDefinitions_callback'),
-			$text);
-		return $text;
-	}
-	protected function _stripLinkDefinitions_callback($matches) {
-		$link_id = strtolower($matches[1]);
-		$url = $matches[2] == '' ? $matches[3] : $matches[2];
-		$this->urls[$link_id] = $url;
-		$this->titles[$link_id] =& $matches[4];
-		$this->ref_attr[$link_id] = $this->doExtraAttributes("", $dummy =& $matches[5]);
-		return ''; # String that will replace the block
-	}
-
-
-	### HTML Block Parser ###
-	
-	# Tags that are always treated as block tags:
-	protected $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend|article|section|nav|aside|hgroup|header|footer|figcaption';
-						   
-	# Tags treated as block tags only if the opening tag is alone on its line:
-	protected $context_block_tags_re = 'script|noscript|ins|del|iframe|object|source|track|param|math|svg|canvas|audio|video';
-	
-	# Tags where markdown="1" default to span mode:
-	protected $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address';
-	
-	# Tags which must not have their contents modified, no matter where 
-	# they appear:
-	protected $clean_tags_re = 'script|math|svg';
-	
-	# Tags that do not need to be closed.
-	protected $auto_close_tags_re = 'hr|img|param|source|track';
-	
-
-	protected function hashHTMLBlocks($text) {
-	#
-	# Hashify HTML Blocks and "clean tags".
-	#
-	# We only want to do this for block-level HTML tags, such as headers,
-	# lists, and tables. That's because we still want to wrap <p>s around
-	# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
-	# phrase emphasis, and spans. The list of tags we're looking for is
-	# hard-coded.
-	#
-	# This works by calling _HashHTMLBlocks_InMarkdown, which then calls
-	# _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1" 
-	# attribute is found within a tag, _HashHTMLBlocks_InHTML calls back
-	#  _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag.
-	# These two functions are calling each other. It's recursive!
-	#
-		if ($this->no_markup)  return $text;
-
-		#
-		# Call the HTML-in-Markdown hasher.
-		#
-		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
-		
-		return $text;
-	}
-	protected function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
-										$enclosing_tag_re = '', $span = false)
-	{
-	#
-	# Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags.
-	#
-	# *   $indent is the number of space to be ignored when checking for code 
-	#     blocks. This is important because if we don't take the indent into 
-	#     account, something like this (which looks right) won't work as expected:
-	#
-	#     <div>
-	#         <div markdown="1">
-	#         Hello World.  <-- Is this a Markdown code block or text?
-	#         </div>  <-- Is this a Markdown code block or a real tag?
-	#     <div>
-	#
-	#     If you don't like this, just don't indent the tag on which
-	#     you apply the markdown="1" attribute.
-	#
-	# *   If $enclosing_tag_re is not empty, stops at the first unmatched closing 
-	#     tag with that name. Nested tags supported.
-	#
-	# *   If $span is true, text inside must treated as span. So any double 
-	#     newline will be replaced by a single newline so that it does not create 
-	#     paragraphs.
-	#
-	# Returns an array of that form: ( processed text , remaining text )
-	#
-		if ($text === '') return array('', '');
-
-		# Regex to check for the presense of newlines around a block tag.
-		$newline_before_re = '/(?:^\n?|\n\n)*$/';
-		$newline_after_re = 
-			'{
-				^						# Start of text following the tag.
-				(?>[ ]*<!--.*?-->)?		# Optional comment.
-				[ ]*\n					# Must be followed by newline.
-			}xs';
-		
-		# Regex to match any tag.
-		$block_tag_re =
-			'{
-				(					# $2: Capture whole tag.
-					</?					# Any opening or closing tag.
-						(?>				# Tag name.
-							'.$this->block_tags_re.'			|
-							'.$this->context_block_tags_re.'	|
-							'.$this->clean_tags_re.'        	|
-							(?!\s)'.$enclosing_tag_re.'
-						)
-						(?:
-							(?=[\s"\'/a-zA-Z0-9])	# Allowed characters after tag name.
-							(?>
-								".*?"		|	# Double quotes (can contain `>`)
-								\'.*?\'   	|	# Single quotes (can contain `>`)
-								.+?				# Anything but quotes and `>`.
-							)*?
-						)?
-					>					# End of tag.
-				|
-					<!--    .*?     -->	# HTML Comment
-				|
-					<\?.*?\?> | <%.*?%>	# Processing instruction
-				|
-					<!\[CDATA\[.*?\]\]>	# CData Block
-				|
-					# Code span marker
-					`+
-				'. ( !$span ? ' # If not in span.
-				|
-					# Indented code block
-					(?: ^[ ]*\n | ^ | \n[ ]*\n )
-					[ ]{'.($indent+4).'}[^\n]* \n
-					(?>
-						(?: [ ]{'.($indent+4).'}[^\n]* | [ ]* ) \n
-					)*
-				|
-					# Fenced code block marker
-					(?<= ^ | \n )
-					[ ]{0,'.($indent+3).'}~{3,}
-									[ ]*
-					(?:
-					\.?[-_:a-zA-Z0-9]+ # standalone class name
-					|
-						'.$this->id_class_attr_nocatch_re.' # extra attributes
-					)?
-					[ ]*
-					\n
-				' : '' ). ' # End (if not is span).
-				)
-			}xs';
-
-		
-		$depth = 0;		# Current depth inside the tag tree.
-		$parsed = "";	# Parsed text that will be returned.
-
-		#
-		# Loop through every tag until we find the closing tag of the parent
-		# or loop until reaching the end of text if no parent tag specified.
-		#
-		do {
-			#
-			# Split the text using the first $tag_match pattern found.
-			# Text before  pattern will be first in the array, text after
-			# pattern will be at the end, and between will be any catches made 
-			# by the pattern.
-			#
-			$parts = preg_split($block_tag_re, $text, 2, 
-								PREG_SPLIT_DELIM_CAPTURE);
-			
-			# If in Markdown span mode, add a empty-string span-level hash 
-			# after each newline to prevent triggering any block element.
-			if ($span) {
-				$void = $this->hashPart("", ':');
-				$newline = "$void\n";
-				$parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
-			}
-			
-			$parsed .= $parts[0]; # Text before current tag.
-			
-			# If end of $text has been reached. Stop loop.
-			if (count($parts) < 3) {
-				$text = "";
-				break;
-			}
-			
-			$tag  = $parts[1]; # Tag to handle.
-			$text = $parts[2]; # Remaining text after current tag.
-			$tag_re = preg_quote($tag); # For use in a regular expression.
-			
-			#
-			# Check for: Code span marker
-			#
-			if ($tag{0} == "`") {
-				# Find corresponding end marker.
-				$tag_re = preg_quote($tag);
-				if (preg_match('{^(?>.+?|\n(?!\n))*?(?<!`)'.$tag_re.'(?!`)}',
-					$text, $matches))
-				{
-					# End marker found: pass text unchanged until marker.
-					$parsed .= $tag . $matches[0];
-					$text = substr($text, strlen($matches[0]));
-				}
-				else {
-					# Unmatched marker: just skip it.
-					$parsed .= $tag;
-				}
-			}
-			#
-			# Check for: Fenced code block marker.
-			#
-			else if (preg_match('{^\n?([ ]{0,'.($indent+3).'})(~+)}', $tag, $capture)) {
-				# Fenced code block marker: find matching end marker.
-				$fence_indent = strlen($capture[1]); # use captured indent in re
-				$fence_re = $capture[2]; # use captured fence in re
-				if (preg_match('{^(?>.*\n)*?[ ]{'.($fence_indent).'}'.$fence_re.'[ ]*(?:\n|$)}', $text,
-					$matches)) 
-				{
-					# End marker found: pass text unchanged until marker.
-					$parsed .= $tag . $matches[0];
-					$text = substr($text, strlen($matches[0]));
-				}
-				else {
-					# No end marker: just skip it.
-					$parsed .= $tag;
-				}
-			}
-			#
-			# Check for: Indented code block.
-			#
-			else if ($tag{0} == "\n" || $tag{0} == " ") {
-				# Indented code block: pass it unchanged, will be handled 
-				# later.
-				$parsed .= $tag;
-			}
-			#
-			# Check for: Opening Block level tag or
-			#            Opening Context Block tag (like ins and del) 
-			#               used as a block tag (tag is alone on it's line).
-			#
-			else if (preg_match('{^<(?:'.$this->block_tags_re.')\b}', $tag) ||
-				(	preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) &&
-					preg_match($newline_before_re, $parsed) &&
-					preg_match($newline_after_re, $text)	)
-				)
-			{
-				# Need to parse tag and following text using the HTML parser.
-				list($block_text, $text) = 
-					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
-				
-				# Make sure it stays outside of any paragraph by adding newlines.
-				$parsed .= "\n\n$block_text\n\n";
-			}
-			#
-			# Check for: Clean tag (like script, math)
-			#            HTML Comments, processing instructions.
-			#
-			else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) ||
-				$tag{1} == '!' || $tag{1} == '?')
-			{
-				# Need to parse tag and following text using the HTML parser.
-				# (don't check for markdown attribute)
-				list($block_text, $text) = 
-					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
-				
-				$parsed .= $block_text;
-			}
-			#
-			# Check for: Tag with same name as enclosing tag.
-			#
-			else if ($enclosing_tag_re !== '' &&
-				# Same name as enclosing tag.
-				preg_match('{^</?(?:'.$enclosing_tag_re.')\b}', $tag))
-			{
-				#
-				# Increase/decrease nested tag count.
-				#
-				if ($tag{1} == '/')						$depth--;
-				else if ($tag{strlen($tag)-2} != '/')	$depth++;
-
-				if ($depth < 0) {
-					#
-					# Going out of parent element. Clean up and break so we
-					# return to the calling function.
-					#
-					$text = $tag . $text;
-					break;
-				}
-				
-				$parsed .= $tag;
-			}
-			else {
-				$parsed .= $tag;
-			}
-		} while ($depth >= 0);
-		
-		return array($parsed, $text);
-	}
-	protected function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
-	#
-	# Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
-	#
-	# *   Calls $hash_method to convert any blocks.
-	# *   Stops when the first opening tag closes.
-	# *   $md_attr indicate if the use of the `markdown="1"` attribute is allowed.
-	#     (it is not inside clean tags)
-	#
-	# Returns an array of that form: ( processed text , remaining text )
-	#
-		if ($text === '') return array('', '');
-		
-		# Regex to match `markdown` attribute inside of a tag.
-		$markdown_attr_re = '
-			{
-				\s*			# Eat whitespace before the `markdown` attribute
-				markdown
-				\s*=\s*
-				(?>
-					(["\'])		# $1: quote delimiter		
-					(.*?)		# $2: attribute value
-					\1			# matching delimiter	
-				|
-					([^\s>]*)	# $3: unquoted attribute value
-				)
-				()				# $4: make $3 always defined (avoid warnings)
-			}xs';
-		
-		# Regex to match any tag.
-		$tag_re = '{
-				(					# $2: Capture whole tag.
-					</?					# Any opening or closing tag.
-						[\w:$]+			# Tag name.
-						(?:
-							(?=[\s"\'/a-zA-Z0-9])	# Allowed characters after tag name.
-							(?>
-								".*?"		|	# Double quotes (can contain `>`)
-								\'.*?\'   	|	# Single quotes (can contain `>`)
-								.+?				# Anything but quotes and `>`.
-							)*?
-						)?
-					>					# End of tag.
-				|
-					<!--    .*?     -->	# HTML Comment
-				|
-					<\?.*?\?> | <%.*?%>	# Processing instruction
-				|
-					<!\[CDATA\[.*?\]\]>	# CData Block
-				)
-			}xs';
-		
-		$original_text = $text;		# Save original text in case of faliure.
-		
-		$depth		= 0;	# Current depth inside the tag tree.
-		$block_text	= "";	# Temporary text holder for current text.
-		$parsed		= "";	# Parsed text that will be returned.
-
-		#
-		# Get the name of the starting tag.
-		# (This pattern makes $base_tag_name_re safe without quoting.)
-		#
-		if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
-			$base_tag_name_re = $matches[1];
-
-		#
-		# Loop through every tag until we find the corresponding closing tag.
-		#
-		do {
-			#
-			# Split the text using the first $tag_match pattern found.
-			# Text before  pattern will be first in the array, text after
-			# pattern will be at the end, and between will be any catches made 
-			# by the pattern.
-			#
-			$parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
-			
-			if (count($parts) < 3) {
-				#
-				# End of $text reached with unbalenced tag(s).
-				# In that case, we return original text unchanged and pass the
-				# first character as filtered to prevent an infinite loop in the 
-				# parent function.
-				#
-				return array($original_text{0}, substr($original_text, 1));
-			}
-			
-			$block_text .= $parts[0]; # Text before current tag.
-			$tag         = $parts[1]; # Tag to handle.
-			$text        = $parts[2]; # Remaining text after current tag.
-			
-			#
-			# Check for: Auto-close tag (like <hr/>)
-			#			 Comments and Processing Instructions.
-			#
-			if (preg_match('{^</?(?:'.$this->auto_close_tags_re.')\b}', $tag) ||
-				$tag{1} == '!' || $tag{1} == '?')
-			{
-				# Just add the tag to the block as if it was text.
-				$block_text .= $tag;
-			}
-			else {
-				#
-				# Increase/decrease nested tag count. Only do so if
-				# the tag's name match base tag's.
-				#
-				if (preg_match('{^</?'.$base_tag_name_re.'\b}', $tag)) {
-					if ($tag{1} == '/')						$depth--;
-					else if ($tag{strlen($tag)-2} != '/')	$depth++;
-				}
-				
-				#
-				# Check for `markdown="1"` attribute and handle it.
-				#
-				if ($md_attr && 
-					preg_match($markdown_attr_re, $tag, $attr_m) &&
-					preg_match('/^1|block|span$/', $attr_m[2] . $attr_m[3]))
-				{
-					# Remove `markdown` attribute from opening tag.
-					$tag = preg_replace($markdown_attr_re, '', $tag);
-					
-					# Check if text inside this tag must be parsed in span mode.
-					$this->mode = $attr_m[2] . $attr_m[3];
-					$span_mode = $this->mode == 'span' || $this->mode != 'block' &&
-						preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag);
-					
-					# Calculate indent before tag.
-					if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
-						$strlen = $this->utf8_strlen;
-						$indent = $strlen($matches[1], 'UTF-8');
-					} else {
-						$indent = 0;
-					}
-					
-					# End preceding block with this tag.
-					$block_text .= $tag;
-					$parsed .= $this->{$hash_method}($block_text);
-					
-					# Get enclosing tag name for the ParseMarkdown function.
-					# (This pattern makes $tag_name_re safe without quoting.)
-					preg_match('/^<([\w:$]*)\b/', $tag, $matches);
-					$tag_name_re = $matches[1];
-					
-					# Parse the content using the HTML-in-Markdown parser.
-					list ($block_text, $text)
-						= $this->_hashHTMLBlocks_inMarkdown($text, $indent, 
-							$tag_name_re, $span_mode);
-					
-					# Outdent markdown text.
-					if ($indent > 0) {
-						$block_text = preg_replace("/^[ ]{1,$indent}/m", "", 
-													$block_text);
-					}
-					
-					# Append tag content to parsed text.
-					if (!$span_mode)	$parsed .= "\n\n$block_text\n\n";
-					else				$parsed .= "$block_text";
-					
-					# Start over with a new block.
-					$block_text = "";
-				}
-				else $block_text .= $tag;
-			}
-			
-		} while ($depth > 0);
-		
-		#
-		# Hash last block text that wasn't processed inside the loop.
-		#
-		$parsed .= $this->{$hash_method}($block_text);
-		
-		return array($parsed, $text);
-	}
-
-
-	protected function hashClean($text) {
-	#
-	# Called whenever a tag must be hashed when a function inserts a "clean" tag
-	# in $text, it passes through this function and is automaticaly escaped, 
-	# blocking invalid nested overlap.
-	#
-		return $this->hashPart($text, 'C');
-	}
-
-
-	protected function doAnchors($text) {
-	#
-	# Turn Markdown link shortcuts into XHTML <a> tags.
-	#
-		if ($this->in_anchor) return $text;
-		$this->in_anchor = true;
-		
-		#
-		# First, handle reference-style links: [link text] [id]
-		#
-		$text = preg_replace_callback('{
-			(					# wrap whole match in $1
-			  \[
-				('.$this->nested_brackets_re.')	# link text = $2
-			  \]
-
-			  [ ]?				# one optional space
-			  (?:\n[ ]*)?		# one optional newline followed by spaces
-
-			  \[
-				(.*?)		# id = $3
-			  \]
-			)
-			}xs',
-			array(&$this, '_doAnchors_reference_callback'), $text);
-
-		#
-		# Next, inline-style links: [link text](url "optional title")
-		#
-		$text = preg_replace_callback('{
-			(				# wrap whole match in $1
-			  \[
-				('.$this->nested_brackets_re.')	# link text = $2
-			  \]
-			  \(			# literal paren
-				[ \n]*
-				(?:
-					<(.+?)>	# href = $3
-				|
-					('.$this->nested_url_parenthesis_re.')	# href = $4
-				)
-				[ \n]*
-				(			# $5
-				  ([\'"])	# quote char = $6
-				  (.*?)		# Title = $7
-				  \6		# matching quote
-				  [ \n]*	# ignore any spaces/tabs between closing quote and )
-				)?			# title is optional
-			  \)
-			  (?:[ ]? '.$this->id_class_attr_catch_re.' )?	 # $8 = id/class attributes
-			)
-			}xs',
-			array(&$this, '_doAnchors_inline_callback'), $text);
-
-		#
-		# Last, handle reference-style shortcuts: [link text]
-		# These must come last in case you've also got [link text][1]
-		# or [link text](/foo)
-		#
-		$text = preg_replace_callback('{
-			(					# wrap whole match in $1
-			  \[
-				([^\[\]]+)		# link text = $2; can\'t contain [ or ]
-			  \]
-			)
-			}xs',
-			array(&$this, '_doAnchors_reference_callback'), $text);
-
-		$this->in_anchor = false;
-		return $text;
-	}
-	protected function _doAnchors_reference_callback($matches) {
-		$whole_match =  $matches[1];
-		$link_text   =  $matches[2];
-		$link_id     =& $matches[3];
-
-		if ($link_id == "") {
-			# for shortcut links like [this][] or [this].
-			$link_id = $link_text;
-		}
-		
-		# lower-case and turn embedded newlines into spaces
-		$link_id = strtolower($link_id);
-		$link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
-
-		if (isset($this->urls[$link_id])) {
-			$url = $this->urls[$link_id];
-			$url = $this->encodeAttribute($url);
-			
-			$result = "<a href=\"$url\"";
-			if ( isset( $this->titles[$link_id] ) ) {
-				$title = $this->titles[$link_id];
-				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
-			}
-			if (isset($this->ref_attr[$link_id]))
-				$result .= $this->ref_attr[$link_id];
-		
-			$link_text = $this->runSpanGamut($link_text);
-			$result .= ">$link_text</a>";
-			$result = $this->hashPart($result);
-		}
-		else {
-			$result = $whole_match;
-		}
-		return $result;
-	}
-	protected function _doAnchors_inline_callback($matches) {
-		$whole_match	=  $matches[1];
-		$link_text		=  $this->runSpanGamut($matches[2]);
-		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-		$attr  = $this->doExtraAttributes("a", $dummy =& $matches[8]);
-
-
-		$url = $this->encodeAttribute($url);
-
-		$result = "<a href=\"$url\"";
-		if (isset($title)) {
-			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\"";
-		}
-		$result .= $attr;
-		
-		$link_text = $this->runSpanGamut($link_text);
-		$result .= ">$link_text</a>";
-
-		return $this->hashPart($result);
-	}
-
-
-	protected function doImages($text) {
-	#
-	# Turn Markdown image shortcuts into <img> tags.
-	#
-		#
-		# First, handle reference-style labeled images: ![alt text][id]
-		#
-		$text = preg_replace_callback('{
-			(				# wrap whole match in $1
-			  !\[
-				('.$this->nested_brackets_re.')		# alt text = $2
-			  \]
-
-			  [ ]?				# one optional space
-			  (?:\n[ ]*)?		# one optional newline followed by spaces
-
-			  \[
-				(.*?)		# id = $3
-			  \]
-
-			)
-			}xs', 
-			array(&$this, '_doImages_reference_callback'), $text);
-
-		#
-		# Next, handle inline images:  ![alt text](url "optional title")
-		# Don't forget: encode * and _
-		#
-		$text = preg_replace_callback('{
-			(				# wrap whole match in $1
-			  !\[
-				('.$this->nested_brackets_re.')		# alt text = $2
-			  \]
-			  \s?			# One optional whitespace character
-			  \(			# literal paren
-				[ \n]*
-				(?:
-					<(\S*)>	# src url = $3
-				|
-					('.$this->nested_url_parenthesis_re.')	# src url = $4
-				)
-				[ \n]*
-				(			# $5
-				  ([\'"])	# quote char = $6
-				  (.*?)		# title = $7
-				  \6		# matching quote
-				  [ \n]*
-				)?			# title is optional
-			  \)
-			  (?:[ ]? '.$this->id_class_attr_catch_re.' )?	 # $8 = id/class attributes
-			)
-			}xs',
-			array(&$this, '_doImages_inline_callback'), $text);
-
-		return $text;
-	}
-	protected function _doImages_reference_callback($matches) {
-		$whole_match = $matches[1];
-		$alt_text    = $matches[2];
-		$link_id     = strtolower($matches[3]);
-
-		if ($link_id == "") {
-			$link_id = strtolower($alt_text); # for shortcut links like ![this][].
-		}
-
-		$alt_text = $this->encodeAttribute($alt_text);
-		if (isset($this->urls[$link_id])) {
-			$url = $this->encodeAttribute($this->urls[$link_id]);
-			$result = "<img src=\"$url\" alt=\"$alt_text\"";
-			if (isset($this->titles[$link_id])) {
-				$title = $this->titles[$link_id];
-				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
-			}
-			if (isset($this->ref_attr[$link_id]))
-				$result .= $this->ref_attr[$link_id];
-			$result .= $this->empty_element_suffix;
-			$result = $this->hashPart($result);
-		}
-		else {
-			# If there's no such link ID, leave intact:
-			$result = $whole_match;
-		}
-
-		return $result;
-	}
-	protected function _doImages_inline_callback($matches) {
-		$whole_match	= $matches[1];
-		$alt_text		= $matches[2];
-		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-		$attr  = $this->doExtraAttributes("img", $dummy =& $matches[8]);
-
-		$alt_text = $this->encodeAttribute($alt_text);
-		$url = $this->encodeAttribute($url);
-		$result = "<img src=\"$url\" alt=\"$alt_text\"";
-		if (isset($title)) {
-			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\""; # $title already quoted
-		}
-		$result .= $attr;
-		$result .= $this->empty_element_suffix;
-
-		return $this->hashPart($result);
-	}
-
-
-	protected function doHeaders($text) {
-	#
-	# Redefined to add id and class attribute support.
-	#
-		# Setext-style headers:
-		#	  Header 1  {#header1}
-		#	  ========
-		#  
-		#	  Header 2  {#header2 .class1 .class2}
-		#	  --------
-		#
-		$text = preg_replace_callback(
-			'{
-				(^.+?)								# $1: Header text
-				(?:[ ]+ '.$this->id_class_attr_catch_re.' )?	 # $3 = id/class attributes
-				[ ]*\n(=+|-+)[ ]*\n+				# $3: Header footer
-			}mx',
-			array(&$this, '_doHeaders_callback_setext'), $text);
-
-		# atx-style headers:
-		#	# Header 1        {#header1}
-		#	## Header 2       {#header2}
-		#	## Header 2 with closing hashes ##  {#header3.class1.class2}
-		#	...
-		#	###### Header 6   {.class2}
-		#
-		$text = preg_replace_callback('{
-				^(\#{1,6})	# $1 = string of #\'s
-				[ ]*
-				(.+?)		# $2 = Header text
-				[ ]*
-				\#*			# optional closing #\'s (not counted)
-				(?:[ ]+ '.$this->id_class_attr_catch_re.' )?	 # $3 = id/class attributes
-				[ ]*
-				\n+
-			}xm',
-			array(&$this, '_doHeaders_callback_atx'), $text);
-
-		return $text;
-	}
-	protected function _doHeaders_callback_setext($matches) {
-		if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
-			return $matches[0];
-		$level = $matches[3]{0} == '=' ? 1 : 2;
-		$attr  = $this->doExtraAttributes("h$level", $dummy =& $matches[2]);
-		$block = "<h$level$attr>".$this->runSpanGamut($matches[1])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-	protected function _doHeaders_callback_atx($matches) {
-		$level = strlen($matches[1]);
-		$attr  = $this->doExtraAttributes("h$level", $dummy =& $matches[3]);
-		$block = "<h$level$attr>".$this->runSpanGamut($matches[2])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-
-
-	protected function doTables($text) {
-	#
-	# Form HTML tables.
-	#
-		$less_than_tab = $this->tab_width - 1;
-		#
-		# Find tables with leading pipe.
-		#
-		#	| Header 1 | Header 2
-		#	| -------- | --------
-		#	| Cell 1   | Cell 2
-		#	| Cell 3   | Cell 4
-		#
-		$text = preg_replace_callback('
-			{
-				^							# Start of a line
-				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
-				[|]							# Optional leading pipe (present)
-				(.+) \n						# $1: Header row (at least one pipe)
-				
-				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
-				[|] ([ ]*[-:]+[-| :]*) \n	# $2: Header underline
-				
-				(							# $3: Cells
-					(?>
-						[ ]*				# Allowed whitespace.
-						[|] .* \n			# Row content.
-					)*
-				)
-				(?=\n|\Z)					# Stop at final double newline.
-			}xm',
-			array(&$this, '_doTable_leadingPipe_callback'), $text);
-		
-		#
-		# Find tables without leading pipe.
-		#
-		#	Header 1 | Header 2
-		#	-------- | --------
-		#	Cell 1   | Cell 2
-		#	Cell 3   | Cell 4
-		#
-		$text = preg_replace_callback('
-			{
-				^							# Start of a line
-				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
-				(\S.*[|].*) \n				# $1: Header row (at least one pipe)
-				
-				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
-				([-:]+[ ]*[|][-| :]*) \n	# $2: Header underline
-				
-				(							# $3: Cells
-					(?>
-						.* [|] .* \n		# Row content
-					)*
-				)
-				(?=\n|\Z)					# Stop at final double newline.
-			}xm',
-			array(&$this, '_DoTable_callback'), $text);
-
-		return $text;
-	}
-	protected function _doTable_leadingPipe_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
-		$content	= $matches[3];
-		
-		# Remove leading pipe for each row.
-		$content	= preg_replace('/^ *[|]/m', '', $content);
-		
-		return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
-	}
-	protected function _doTable_makeAlignAttr($alignname)
-	{
-		if (empty($this->table_align_class_tmpl))
-			return " align=\"$alignname\"";
-
-		$classname = str_replace('%%', $alignname, $this->table_align_class_tmpl);
-		return " class=\"$classname\"";
-	}
-	protected function _doTable_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
-		$content	= $matches[3];
-
-		# Remove any tailing pipes for each line.
-		$head		= preg_replace('/[|] *$/m', '', $head);
-		$underline	= preg_replace('/[|] *$/m', '', $underline);
-		$content	= preg_replace('/[|] *$/m', '', $content);
-		
-		# Reading alignement from header underline.
-		$separators	= preg_split('/ *[|] */', $underline);
-		foreach ($separators as $n => $s) {
-			if (preg_match('/^ *-+: *$/', $s))
-				$attr[$n] = $this->_doTable_makeAlignAttr('right');
-			else if (preg_match('/^ *:-+: *$/', $s))
-				$attr[$n] = $this->_doTable_makeAlignAttr('center');
-			else if (preg_match('/^ *:-+ *$/', $s))
-				$attr[$n] = $this->_doTable_makeAlignAttr('left');
-			else
-				$attr[$n] = '';
-		}
-		
-		# Parsing span elements, including code spans, character escapes, 
-		# and inline HTML tags, so that pipes inside those gets ignored.
-		$head		= $this->parseSpan($head);
-		$headers	= preg_split('/ *[|] */', $head);
-		$col_count	= count($headers);
-		$attr       = array_pad($attr, $col_count, '');
-		
-		# Write column headers.
-		$text = "<table>\n";
-		$text .= "<thead>\n";
-		$text .= "<tr>\n";
-		foreach ($headers as $n => $header)
-			$text .= "  <th$attr[$n]>".$this->runSpanGamut(trim($header))."</th>\n";
-		$text .= "</tr>\n";
-		$text .= "</thead>\n";
-		
-		# Split content by row.
-		$rows = explode("\n", trim($content, "\n"));
-		
-		$text .= "<tbody>\n";
-		foreach ($rows as $row) {
-			# Parsing span elements, including code spans, character escapes, 
-			# and inline HTML tags, so that pipes inside those gets ignored.
-			$row = $this->parseSpan($row);
-			
-			# Split row by cell.
-			$row_cells = preg_split('/ *[|] */', $row, $col_count);
-			$row_cells = array_pad($row_cells, $col_count, '');
-			
-			$text .= "<tr>\n";
-			foreach ($row_cells as $n => $cell)
-				$text .= "  <td$attr[$n]>".$this->runSpanGamut(trim($cell))."</td>\n";
-			$text .= "</tr>\n";
-		}
-		$text .= "</tbody>\n";
-		$text .= "</table>";
-		
-		return $this->hashBlock($text) . "\n";
-	}
-
-	
-	protected function doDefLists($text) {
-	#
-	# Form HTML definition lists.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Re-usable pattern to match any entire dl list:
-		$whole_list_re = '(?>
-			(								# $1 = whole list
-			  (								# $2
-				[ ]{0,'.$less_than_tab.'}
-				((?>.*\S.*\n)+)				# $3 = defined term
-				\n?
-				[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
-			  )
-			  (?s:.+?)
-			  (								# $4
-				  \z
-				|
-				  \n{2,}
-				  (?=\S)
-				  (?!						# Negative lookahead for another term
-					[ ]{0,'.$less_than_tab.'}
-					(?: \S.*\n )+?			# defined term
-					\n?
-					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
-				  )
-				  (?!						# Negative lookahead for another definition
-					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
-				  )
-			  )
-			)
-		)'; // mx
-
-		$text = preg_replace_callback('{
-				(?>\A\n?|(?<=\n\n))
-				'.$whole_list_re.'
-			}mx',
-			array(&$this, '_doDefLists_callback'), $text);
-
-		return $text;
-	}
-	protected function _doDefLists_callback($matches) {
-		# Re-usable patterns to match list item bullets and number markers:
-		$list = $matches[1];
-		
-		# Turn double returns into triple returns, so that we can make a
-		# paragraph for the last item in a list, if necessary:
-		$result = trim($this->processDefListItems($list));
-		$result = "<dl>\n" . $result . "\n</dl>";
-		return $this->hashBlock($result) . "\n\n";
-	}
-
-
-	protected function processDefListItems($list_str) {
-	#
-	#	Process the contents of a single definition list, splitting it
-	#	into individual term and definition list items.
-	#
-		$less_than_tab = $this->tab_width - 1;
-		
-		# trim trailing blank lines:
-		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
-
-		# Process definition terms.
-		$list_str = preg_replace_callback('{
-			(?>\A\n?|\n\n+)					# leading line
-			(								# definition terms = $1
-				[ ]{0,'.$less_than_tab.'}	# leading whitespace
-				(?!\:[ ]|[ ])				# negative lookahead for a definition
-											#   mark (colon) or more whitespace.
-				(?> \S.* \n)+?				# actual term (not whitespace).	
-			)			
-			(?=\n?[ ]{0,3}:[ ])				# lookahead for following line feed 
-											#   with a definition mark.
-			}xm',
-			array(&$this, '_processDefListItems_callback_dt'), $list_str);
-
-		# Process actual definitions.
-		$list_str = preg_replace_callback('{
-			\n(\n+)?						# leading line = $1
-			(								# marker space = $2
-				[ ]{0,'.$less_than_tab.'}	# whitespace before colon
-				\:[ ]+						# definition mark (colon)
-			)
-			((?s:.+?))						# definition text = $3
-			(?= \n+ 						# stop at next definition mark,
-				(?:							# next term or end of text
-					[ ]{0,'.$less_than_tab.'} \:[ ]	|
-					<dt> | \z
-				)						
-			)					
-			}xm',
-			array(&$this, '_processDefListItems_callback_dd'), $list_str);
-
-		return $list_str;
-	}
-	protected function _processDefListItems_callback_dt($matches) {
-		$terms = explode("\n", trim($matches[1]));
-		$text = '';
-		foreach ($terms as $term) {
-			$term = $this->runSpanGamut(trim($term));
-			$text .= "\n<dt>" . $term . "</dt>";
-		}
-		return $text . "\n";
-	}
-	protected function _processDefListItems_callback_dd($matches) {
-		$leading_line	= $matches[1];
-		$marker_space	= $matches[2];
-		$def			= $matches[3];
-
-		if ($leading_line || preg_match('/\n{2,}/', $def)) {
-			# Replace marker with the appropriate whitespace indentation
-			$def = str_repeat(' ', strlen($marker_space)) . $def;
-			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
-			$def = "\n". $def ."\n";
-		}
-		else {
-			$def = rtrim($def);
-			$def = $this->runSpanGamut($this->outdent($def));
-		}
-
-		return "\n<dd>" . $def . "</dd>\n";
-	}
-
-
-	protected function doFencedCodeBlocks($text) {
-	#
-	# Adding the fenced code block syntax to regular Markdown:
-	#
-	# ~~~
-	# Code block
-	# ~~~
-	#
-		$less_than_tab = $this->tab_width;
-		
-		$text = preg_replace_callback('{
-				(?:\n|\A)
-				# 1: Opening marker
-				(
-					~{3,} # Marker: three tilde or more.
-				)
-				[ ]*
-				(?:
-					\.?([-_:a-zA-Z0-9]+) # 2: standalone class name
-				|
-					'.$this->id_class_attr_catch_re.' # 3: Extra attributes
-				)?
-				[ ]* \n # Whitespace and newline following marker.
-				
-				# 4: Content
-				(
-					(?>
-						(?!\1 [ ]* \n)	# Not a closing marker.
-						.*\n+
-					)+
-				)
-				
-				# Closing marker.
-				\1 [ ]* \n
-			}xm',
-			array(&$this, '_doFencedCodeBlocks_callback'), $text);
-
-		return $text;
-	}
-	protected function _doFencedCodeBlocks_callback($matches) {
-		$classname =& $matches[2];
-		$attrs     =& $matches[3];
-		$codeblock = $matches[4];
-		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
-		$codeblock = preg_replace_callback('/^\n+/',
-			array(&$this, '_doFencedCodeBlocks_newlines'), $codeblock);
-
-		if ($classname != "") {
-			if ($classname{0} == '.')
-				$classname = substr($classname, 1);
-			$attr_str = ' class="'.$this->code_class_prefix.$classname.'"';
-		} else {
-			$attr_str = $this->doExtraAttributes($this->code_attr_on_pre ? "pre" : "code", $attrs);
-		}
-		$pre_attr_str  = $this->code_attr_on_pre ? $attr_str : '';
-		$code_attr_str = $this->code_attr_on_pre ? '' : $attr_str;
-		$codeblock  = "<pre$pre_attr_str><code$code_attr_str>$codeblock</code></pre>";
-		
-		return "\n\n".$this->hashBlock($codeblock)."\n\n";
-	}
-	protected function _doFencedCodeBlocks_newlines($matches) {
-		return str_repeat("<br$this->empty_element_suffix", 
-			strlen($matches[0]));
-	}
-
-
-	#
-	# Redefining emphasis markers so that emphasis by underscore does not
-	# work in the middle of a word.
-	#
-	protected $em_relist = array(
-		''  => '(?:(?<!\*)\*(?!\*)|(?<![a-zA-Z0-9_])_(?!_))(?=\S|$)(?![\.,:;]\s)',
-		'*' => '(?<=\S|^)(?<!\*)\*(?!\*)',
-		'_' => '(?<=\S|^)(?<!_)_(?![a-zA-Z0-9_])',
-		);
-	protected $strong_relist = array(
-		''   => '(?:(?<!\*)\*\*(?!\*)|(?<![a-zA-Z0-9_])__(?!_))(?=\S|$)(?![\.,:;]\s)',
-		'**' => '(?<=\S|^)(?<!\*)\*\*(?!\*)',
-		'__' => '(?<=\S|^)(?<!_)__(?![a-zA-Z0-9_])',
-		);
-	protected $em_strong_relist = array(
-		''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<![a-zA-Z0-9_])___(?!_))(?=\S|$)(?![\.,:;]\s)',
-		'***' => '(?<=\S|^)(?<!\*)\*\*\*(?!\*)',
-		'___' => '(?<=\S|^)(?<!_)___(?![a-zA-Z0-9_])',
-		);
-
-
-	protected function formParagraphs($text) {
-	#
-	#	Params:
-	#		$text - string to process with html <p> tags
-	#
-		# Strip leading and trailing lines:
-		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
-		
-		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
-
-		#
-		# Wrap <p> tags and unhashify HTML blocks
-		#
-		foreach ($grafs as $key => $value) {
-			$value = trim($this->runSpanGamut($value));
-			
-			# Check if this should be enclosed in a paragraph.
-			# Clean tag hashes & block tag hashes are left alone.
-			$is_p = !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value);
-			
-			if ($is_p) {
-				$value = "<p>$value</p>";
-			}
-			$grafs[$key] = $value;
-		}
-		
-		# Join grafs in one text, then unhash HTML tags. 
-		$text = implode("\n\n", $grafs);
-		
-		# Finish by removing any tag hashes still present in $text.
-		$text = $this->unhash($text);
-		
-		return $text;
-	}
-	
-	
-	### Footnotes
-	
-	protected function stripFootnotes($text) {
-	#
-	# Strips link definitions from text, stores the URLs and titles in
-	# hash references.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Link defs are in the form: [^id]: url "optional title"
-		$text = preg_replace_callback('{
-			^[ ]{0,'.$less_than_tab.'}\[\^(.+?)\][ ]?:	# note_id = $1
-			  [ ]*
-			  \n?					# maybe *one* newline
-			(						# text = $2 (no blank lines allowed)
-				(?:					
-					.+				# actual text
-				|
-					\n				# newlines but 
-					(?!\[\^.+?\]:\s)# negative lookahead for footnote marker.
-					(?!\n+[ ]{0,3}\S)# ensure line is not blank and followed 
-									# by non-indented content
-				)*
-			)		
-			}xm',
-			array(&$this, '_stripFootnotes_callback'),
-			$text);
-		return $text;
-	}
-	protected function _stripFootnotes_callback($matches) {
-		$note_id = $this->fn_id_prefix . $matches[1];
-		$this->footnotes[$note_id] = $this->outdent($matches[2]);
-		return ''; # String that will replace the block
-	}
-
-
-	protected function doFootnotes($text) {
-	#
-	# Replace footnote references in $text [^id] with a special text-token 
-	# which will be replaced by the actual footnote marker in appendFootnotes.
-	#
-		if (!$this->in_anchor) {
-			$text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text);
-		}
-		return $text;
-	}
-
-	
-	protected function appendFootnotes($text) {
-	#
-	# Append footnote list to text.
-	#
-		$text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
-			array(&$this, '_appendFootnotes_callback'), $text);
-	
-		if (!empty($this->footnotes_ordered)) {
-			$text .= "\n\n";
-			$text .= "<div class=\"footnotes\">\n";
-			$text .= "<hr". $this->empty_element_suffix ."\n";
-			$text .= "<ol>\n\n";
-			
-			$attr = " rev=\"footnote\"";
-			if ($this->fn_backlink_class != "") {
-				$class = $this->fn_backlink_class;
-				$class = $this->encodeAttribute($class);
-				$attr .= " class=\"$class\"";
-			}
-			if ($this->fn_backlink_title != "") {
-				$title = $this->fn_backlink_title;
-				$title = $this->encodeAttribute($title);
-				$attr .= " title=\"$title\"";
-			}
-			$num = 0;
-			
-			while (!empty($this->footnotes_ordered)) {
-				$footnote = reset($this->footnotes_ordered);
-				$note_id = key($this->footnotes_ordered);
-				unset($this->footnotes_ordered[$note_id]);
-				$ref_count = $this->footnotes_ref_count[$note_id];
-				unset($this->footnotes_ref_count[$note_id]);
-				unset($this->footnotes[$note_id]);
-				
-				$footnote .= "\n"; # Need to append newline before parsing.
-				$footnote = $this->runBlockGamut("$footnote\n");				
-				$footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
-					array(&$this, '_appendFootnotes_callback'), $footnote);
-				
-				$attr = str_replace("%%", ++$num, $attr);
-				$note_id = $this->encodeAttribute($note_id);
-
-				# Prepare backlink, multiple backlinks if multiple references
-				$backlink = "<a href=\"#fnref:$note_id\"$attr>&#8617;</a>";
-				for ($ref_num = 2; $ref_num <= $ref_count; ++$ref_num) {
-					$backlink .= " <a href=\"#fnref$ref_num:$note_id\"$attr>&#8617;</a>";
-				}
-				# Add backlink to last paragraph; create new paragraph if needed.
-				if (preg_match('{</p>$}', $footnote)) {
-					$footnote = substr($footnote, 0, -4) . "&#160;$backlink</p>";
-				} else {
-					$footnote .= "\n\n<p>$backlink</p>";
-				}
-				
-				$text .= "<li id=\"fn:$note_id\">\n";
-				$text .= $footnote . "\n";
-				$text .= "</li>\n\n";
-			}
-			
-			$text .= "</ol>\n";
-			$text .= "</div>";
-		}
-		return $text;
-	}
-	protected function _appendFootnotes_callback($matches) {
-		$node_id = $this->fn_id_prefix . $matches[1];
-		
-		# Create footnote marker only if it has a corresponding footnote *and*
-		# the footnote hasn't been used by another marker.
-		if (isset($this->footnotes[$node_id])) {
-			$num =& $this->footnotes_numbers[$node_id];
-			if (!isset($num)) {
-				# Transfer footnote content to the ordered list and give it its
-				# number
-				$this->footnotes_ordered[$node_id] = $this->footnotes[$node_id];
-				$this->footnotes_ref_count[$node_id] = 1;
-				$num = $this->footnote_counter++;
-				$ref_count_mark = '';
-			} else {
-				$ref_count_mark = $this->footnotes_ref_count[$node_id] += 1;
-			}
-
-			$attr = "";
-			if ($this->fn_link_class != "") {
-				$class = $this->fn_link_class;
-				$class = $this->encodeAttribute($class);
-				$attr .= " class=\"$class\"";
-			}
-			if ($this->fn_link_title != "") {
-				$title = $this->fn_link_title;
-				$title = $this->encodeAttribute($title);
-				$attr .= " title=\"$title\"";
-			}
-			
-			$attr = str_replace("%%", $num, $attr);
-			$node_id = $this->encodeAttribute($node_id);
-			
-			return
-				"<sup id=\"fnref$ref_count_mark:$node_id\">".
-				"<a href=\"#fn:$node_id\"$attr>$num</a>".
-				"</sup>";
-		}
-		
-		return "[^".$matches[1]."]";
-	}
-		
-	
-	### Abbreviations ###
-	
-	protected function stripAbbreviations($text) {
-	#
-	# Strips abbreviations from text, stores titles in hash references.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Link defs are in the form: [id]*: url "optional title"
-		$text = preg_replace_callback('{
-			^[ ]{0,'.$less_than_tab.'}\*\[(.+?)\][ ]?:	# abbr_id = $1
-			(.*)					# text = $2 (no blank lines allowed)	
-			}xm',
-			array(&$this, '_stripAbbreviations_callback'),
-			$text);
-		return $text;
-	}
-	protected function _stripAbbreviations_callback($matches) {
-		$abbr_word = $matches[1];
-		$abbr_desc = $matches[2];
-		if ($this->abbr_word_re)
-			$this->abbr_word_re .= '|';
-		$this->abbr_word_re .= preg_quote($abbr_word);
-		$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
-		return ''; # String that will replace the block
-	}
-	
-	
-	protected function doAbbreviations($text) {
-	#
-	# Find defined abbreviations in text and wrap them in <abbr> elements.
-	#
-		if ($this->abbr_word_re) {
-			// cannot use the /x modifier because abbr_word_re may 
-			// contain significant spaces:
-			$text = preg_replace_callback('{'.
-				'(?<![\w\x1A])'.
-				'(?:'.$this->abbr_word_re.')'.
-				'(?![\w\x1A])'.
-				'}', 
-				array(&$this, '_doAbbreviations_callback'), $text);
-		}
-		return $text;
-	}
-	protected function _doAbbreviations_callback($matches) {
-		$abbr = $matches[0];
-		if (isset($this->abbr_desciptions[$abbr])) {
-			$desc = $this->abbr_desciptions[$abbr];
-			if (empty($desc)) {
-				return $this->hashPart("<abbr>$abbr</abbr>");
-			} else {
-				$desc = $this->encodeAttribute($desc);
-				return $this->hashPart("<abbr title=\"$desc\">$abbr</abbr>");
-			}
-		} else {
-			return $matches[0];
-		}
-	}
-
-}
-
diff --git a/vendor/traq/plugins/markdown/Michelf/MarkdownExtra.php b/vendor/traq/plugins/markdown/Michelf/MarkdownExtra.php
deleted file mode 100755
index 04e45292a..000000000
--- a/vendor/traq/plugins/markdown/Michelf/MarkdownExtra.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-#
-# Markdown Extra  -  A text-to-HTML conversion tool for web writers
-#
-# PHP Markdown Extra
-# Copyright (c) 2004-2013 Michel Fortin  
-# <http://michelf.com/projects/php-markdown/>
-#
-# Original Markdown
-# Copyright (c) 2004-2006 John Gruber  
-# <http://daringfireball.net/projects/markdown/>
-#
-namespace Michelf;
-
-
-# Just force Michelf/Markdown.php to load. This is needed to load
-# the temporary implementation class. See below for details.
-\Michelf\Markdown::MARKDOWNLIB_VERSION;
-
-#
-# Markdown Extra Parser Class
-#
-# Note: Currently the implementation resides in the temporary class
-# \Michelf\MarkdownExtra_TmpImpl (in the same file as \Michelf\Markdown).
-# This makes it easier to propagate the changes between the three different
-# packaging styles of PHP Markdown. Once this issue is resolved, the
-# _MarkdownExtra_TmpImpl will disappear and this one will contain the code.
-#
-
-class MarkdownExtra extends \Michelf\_MarkdownExtra_TmpImpl {
-
-	### Parser Implementation ###
-
-	# Temporarily, the implemenation is in the _MarkdownExtra_TmpImpl class.
-	# See note above.
-
-}
-
diff --git a/vendor/traq/plugins/markdown/Parsedown.php b/vendor/traq/plugins/markdown/Parsedown.php
new file mode 100644
index 000000000..1832db7ce
--- /dev/null
+++ b/vendor/traq/plugins/markdown/Parsedown.php
@@ -0,0 +1,1994 @@
+<?php
+
+#
+#
+# Parsedown
+# http://parsedown.org
+#
+# (c) Emanuil Rusev
+# http://erusev.com
+#
+# For the full license information, view the LICENSE file that was distributed
+# with this source code.
+#
+#
+
+class Parsedown
+{
+    # ~
+
+    const version = '1.8.0-beta-7';
+
+    # ~
+
+    function text($text)
+    {
+        $Elements = $this->textElements($text);
+
+        # convert to markup
+        $markup = $this->elements($Elements);
+
+        # trim line breaks
+        $markup = trim($markup, "\n");
+
+        return $markup;
+    }
+
+    protected function textElements($text)
+    {
+        # make sure no definitions are set
+        $this->DefinitionData = array();
+
+        # standardize line breaks
+        $text = str_replace(array("\r\n", "\r"), "\n", $text);
+
+        # remove surrounding line breaks
+        $text = trim($text, "\n");
+
+        # split text into lines
+        $lines = explode("\n", $text);
+
+        # iterate through lines to identify blocks
+        return $this->linesElements($lines);
+    }
+
+    #
+    # Setters
+    #
+
+    function setBreaksEnabled($breaksEnabled)
+    {
+        $this->breaksEnabled = $breaksEnabled;
+
+        return $this;
+    }
+
+    protected $breaksEnabled;
+
+    function setMarkupEscaped($markupEscaped)
+    {
+        $this->markupEscaped = $markupEscaped;
+
+        return $this;
+    }
+
+    protected $markupEscaped;
+
+    function setUrlsLinked($urlsLinked)
+    {
+        $this->urlsLinked = $urlsLinked;
+
+        return $this;
+    }
+
+    protected $urlsLinked = true;
+
+    function setSafeMode($safeMode)
+    {
+        $this->safeMode = (bool) $safeMode;
+
+        return $this;
+    }
+
+    protected $safeMode;
+
+    function setStrictMode($strictMode)
+    {
+        $this->strictMode = (bool) $strictMode;
+
+        return $this;
+    }
+
+    protected $strictMode;
+
+    protected $safeLinksWhitelist = array(
+        'http://',
+        'https://',
+        'ftp://',
+        'ftps://',
+        'mailto:',
+        'tel:',
+        'data:image/png;base64,',
+        'data:image/gif;base64,',
+        'data:image/jpeg;base64,',
+        'irc:',
+        'ircs:',
+        'git:',
+        'ssh:',
+        'news:',
+        'steam:',
+    );
+
+    #
+    # Lines
+    #
+
+    protected $BlockTypes = array(
+        '#' => array('Header'),
+        '*' => array('Rule', 'List'),
+        '+' => array('List'),
+        '-' => array('SetextHeader', 'Table', 'Rule', 'List'),
+        '0' => array('List'),
+        '1' => array('List'),
+        '2' => array('List'),
+        '3' => array('List'),
+        '4' => array('List'),
+        '5' => array('List'),
+        '6' => array('List'),
+        '7' => array('List'),
+        '8' => array('List'),
+        '9' => array('List'),
+        ':' => array('Table'),
+        '<' => array('Comment', 'Markup'),
+        '=' => array('SetextHeader'),
+        '>' => array('Quote'),
+        '[' => array('Reference'),
+        '_' => array('Rule'),
+        '`' => array('FencedCode'),
+        '|' => array('Table'),
+        '~' => array('FencedCode'),
+    );
+
+    # ~
+
+    protected $unmarkedBlockTypes = array(
+        'Code',
+    );
+
+    #
+    # Blocks
+    #
+
+    protected function lines(array $lines)
+    {
+        return $this->elements($this->linesElements($lines));
+    }
+
+    protected function linesElements(array $lines)
+    {
+        $Elements = array();
+        $CurrentBlock = null;
+
+        foreach ($lines as $line)
+        {
+            if (chop($line) === '')
+            {
+                if (isset($CurrentBlock))
+                {
+                    $CurrentBlock['interrupted'] = (isset($CurrentBlock['interrupted'])
+                        ? $CurrentBlock['interrupted'] + 1 : 1
+                    );
+                }
+
+                continue;
+            }
+
+            while (($beforeTab = strstr($line, "\t", true)) !== false)
+            {
+                $shortage = 4 - mb_strlen($beforeTab, 'utf-8') % 4;
+
+                $line = $beforeTab
+                    . str_repeat(' ', $shortage)
+                    . substr($line, strlen($beforeTab) + 1)
+                ;
+            }
+
+            $indent = strspn($line, ' ');
+
+            $text = $indent > 0 ? substr($line, $indent) : $line;
+
+            # ~
+
+            $Line = array('body' => $line, 'indent' => $indent, 'text' => $text);
+
+            # ~
+
+            if (isset($CurrentBlock['continuable']))
+            {
+                $methodName = 'block' . $CurrentBlock['type'] . 'Continue';
+                $Block = $this->$methodName($Line, $CurrentBlock);
+
+                if (isset($Block))
+                {
+                    $CurrentBlock = $Block;
+
+                    continue;
+                }
+                else
+                {
+                    if ($this->isBlockCompletable($CurrentBlock['type']))
+                    {
+                        $methodName = 'block' . $CurrentBlock['type'] . 'Complete';
+                        $CurrentBlock = $this->$methodName($CurrentBlock);
+                    }
+                }
+            }
+
+            # ~
+
+            $marker = $text[0];
+
+            # ~
+
+            $blockTypes = $this->unmarkedBlockTypes;
+
+            if (isset($this->BlockTypes[$marker]))
+            {
+                foreach ($this->BlockTypes[$marker] as $blockType)
+                {
+                    $blockTypes []= $blockType;
+                }
+            }
+
+            #
+            # ~
+
+            foreach ($blockTypes as $blockType)
+            {
+                $Block = $this->{"block$blockType"}($Line, $CurrentBlock);
+
+                if (isset($Block))
+                {
+                    $Block['type'] = $blockType;
+
+                    if ( ! isset($Block['identified']))
+                    {
+                        if (isset($CurrentBlock))
+                        {
+                            $Elements[] = $this->extractElement($CurrentBlock);
+                        }
+
+                        $Block['identified'] = true;
+                    }
+
+                    if ($this->isBlockContinuable($blockType))
+                    {
+                        $Block['continuable'] = true;
+                    }
+
+                    $CurrentBlock = $Block;
+
+                    continue 2;
+                }
+            }
+
+            # ~
+
+            if (isset($CurrentBlock) and $CurrentBlock['type'] === 'Paragraph')
+            {
+                $Block = $this->paragraphContinue($Line, $CurrentBlock);
+            }
+
+            if (isset($Block))
+            {
+                $CurrentBlock = $Block;
+            }
+            else
+            {
+                if (isset($CurrentBlock))
+                {
+                    $Elements[] = $this->extractElement($CurrentBlock);
+                }
+
+                $CurrentBlock = $this->paragraph($Line);
+
+                $CurrentBlock['identified'] = true;
+            }
+        }
+
+        # ~
+
+        if (isset($CurrentBlock['continuable']) and $this->isBlockCompletable($CurrentBlock['type']))
+        {
+            $methodName = 'block' . $CurrentBlock['type'] . 'Complete';
+            $CurrentBlock = $this->$methodName($CurrentBlock);
+        }
+
+        # ~
+
+        if (isset($CurrentBlock))
+        {
+            $Elements[] = $this->extractElement($CurrentBlock);
+        }
+
+        # ~
+
+        return $Elements;
+    }
+
+    protected function extractElement(array $Component)
+    {
+        if ( ! isset($Component['element']))
+        {
+            if (isset($Component['markup']))
+            {
+                $Component['element'] = array('rawHtml' => $Component['markup']);
+            }
+            elseif (isset($Component['hidden']))
+            {
+                $Component['element'] = array();
+            }
+        }
+
+        return $Component['element'];
+    }
+
+    protected function isBlockContinuable($Type)
+    {
+        return method_exists($this, 'block' . $Type . 'Continue');
+    }
+
+    protected function isBlockCompletable($Type)
+    {
+        return method_exists($this, 'block' . $Type . 'Complete');
+    }
+
+    #
+    # Code
+
+    protected function blockCode($Line, $Block = null)
+    {
+        if (isset($Block) and $Block['type'] === 'Paragraph' and ! isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if ($Line['indent'] >= 4)
+        {
+            $text = substr($Line['body'], 4);
+
+            $Block = array(
+                'element' => array(
+                    'name' => 'pre',
+                    'element' => array(
+                        'name' => 'code',
+                        'text' => $text,
+                    ),
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    protected function blockCodeContinue($Line, $Block)
+    {
+        if ($Line['indent'] >= 4)
+        {
+            if (isset($Block['interrupted']))
+            {
+                $Block['element']['element']['text'] .= str_repeat("\n", $Block['interrupted']);
+
+                unset($Block['interrupted']);
+            }
+
+            $Block['element']['element']['text'] .= "\n";
+
+            $text = substr($Line['body'], 4);
+
+            $Block['element']['element']['text'] .= $text;
+
+            return $Block;
+        }
+    }
+
+    protected function blockCodeComplete($Block)
+    {
+        return $Block;
+    }
+
+    #
+    # Comment
+
+    protected function blockComment($Line)
+    {
+        if ($this->markupEscaped or $this->safeMode)
+        {
+            return;
+        }
+
+        if (strpos($Line['text'], '<!--') === 0)
+        {
+            $Block = array(
+                'element' => array(
+                    'rawHtml' => $Line['body'],
+                    'autobreak' => true,
+                ),
+            );
+
+            if (strpos($Line['text'], '-->') !== false)
+            {
+                $Block['closed'] = true;
+            }
+
+            return $Block;
+        }
+    }
+
+    protected function blockCommentContinue($Line, array $Block)
+    {
+        if (isset($Block['closed']))
+        {
+            return;
+        }
+
+        $Block['element']['rawHtml'] .= "\n" . $Line['body'];
+
+        if (strpos($Line['text'], '-->') !== false)
+        {
+            $Block['closed'] = true;
+        }
+
+        return $Block;
+    }
+
+    #
+    # Fenced Code
+
+    protected function blockFencedCode($Line)
+    {
+        $marker = $Line['text'][0];
+
+        $openerLength = strspn($Line['text'], $marker);
+
+        if ($openerLength < 3)
+        {
+            return;
+        }
+
+        $infostring = trim(substr($Line['text'], $openerLength), "\t ");
+
+        if (strpos($infostring, '`') !== false)
+        {
+            return;
+        }
+
+        $Element = array(
+            'name' => 'code',
+            'text' => '',
+        );
+
+        if ($infostring !== '')
+        {
+            /**
+             * https://www.w3.org/TR/2011/WD-html5-20110525/elements.html#classes
+             * Every HTML element may have a class attribute specified.
+             * The attribute, if specified, must have a value that is a set
+             * of space-separated tokens representing the various classes
+             * that the element belongs to.
+             * [...]
+             * The space characters, for the purposes of this specification,
+             * are U+0020 SPACE, U+0009 CHARACTER TABULATION (tab),
+             * U+000A LINE FEED (LF), U+000C FORM FEED (FF), and
+             * U+000D CARRIAGE RETURN (CR).
+             */
+            $language = substr($infostring, 0, strcspn($infostring, " \t\n\f\r"));
+
+            $Element['attributes'] = array('class' => "language-$language");
+        }
+
+        $Block = array(
+            'char' => $marker,
+            'openerLength' => $openerLength,
+            'element' => array(
+                'name' => 'pre',
+                'element' => $Element,
+            ),
+        );
+
+        return $Block;
+    }
+
+    protected function blockFencedCodeContinue($Line, $Block)
+    {
+        if (isset($Block['complete']))
+        {
+            return;
+        }
+
+        if (isset($Block['interrupted']))
+        {
+            $Block['element']['element']['text'] .= str_repeat("\n", $Block['interrupted']);
+
+            unset($Block['interrupted']);
+        }
+
+        if (($len = strspn($Line['text'], $Block['char'])) >= $Block['openerLength']
+            and chop(substr($Line['text'], $len), ' ') === ''
+        ) {
+            $Block['element']['element']['text'] = substr($Block['element']['element']['text'], 1);
+
+            $Block['complete'] = true;
+
+            return $Block;
+        }
+
+        $Block['element']['element']['text'] .= "\n" . $Line['body'];
+
+        return $Block;
+    }
+
+    protected function blockFencedCodeComplete($Block)
+    {
+        return $Block;
+    }
+
+    #
+    # Header
+
+    protected function blockHeader($Line)
+    {
+        $level = strspn($Line['text'], '#');
+
+        if ($level > 6)
+        {
+            return;
+        }
+
+        $text = trim($Line['text'], '#');
+
+        if ($this->strictMode and isset($text[0]) and $text[0] !== ' ')
+        {
+            return;
+        }
+
+        $text = trim($text, ' ');
+
+        $Block = array(
+            'element' => array(
+                'name' => 'h' . $level,
+                'handler' => array(
+                    'function' => 'lineElements',
+                    'argument' => $text,
+                    'destination' => 'elements',
+                )
+            ),
+        );
+
+        return $Block;
+    }
+
+    #
+    # List
+
+    protected function blockList($Line, array $CurrentBlock = null)
+    {
+        list($name, $pattern) = $Line['text'][0] <= '-' ? array('ul', '[*+-]') : array('ol', '[0-9]{1,9}+[.\)]');
+
+        if (preg_match('/^('.$pattern.'([ ]++|$))(.*+)/', $Line['text'], $matches))
+        {
+            $contentIndent = strlen($matches[2]);
+
+            if ($contentIndent >= 5)
+            {
+                $contentIndent -= 1;
+                $matches[1] = substr($matches[1], 0, -$contentIndent);
+                $matches[3] = str_repeat(' ', $contentIndent) . $matches[3];
+            }
+            elseif ($contentIndent === 0)
+            {
+                $matches[1] .= ' ';
+            }
+
+            $markerWithoutWhitespace = strstr($matches[1], ' ', true);
+
+            $Block = array(
+                'indent' => $Line['indent'],
+                'pattern' => $pattern,
+                'data' => array(
+                    'type' => $name,
+                    'marker' => $matches[1],
+                    'markerType' => ($name === 'ul' ? $markerWithoutWhitespace : substr($markerWithoutWhitespace, -1)),
+                ),
+                'element' => array(
+                    'name' => $name,
+                    'elements' => array(),
+                ),
+            );
+            $Block['data']['markerTypeRegex'] = preg_quote($Block['data']['markerType'], '/');
+
+            if ($name === 'ol')
+            {
+                $listStart = ltrim(strstr($matches[1], $Block['data']['markerType'], true), '0') ?: '0';
+
+                if ($listStart !== '1')
+                {
+                    if (
+                        isset($CurrentBlock)
+                        and $CurrentBlock['type'] === 'Paragraph'
+                        and ! isset($CurrentBlock['interrupted'])
+                    ) {
+                        return;
+                    }
+
+                    $Block['element']['attributes'] = array('start' => $listStart);
+                }
+            }
+
+            $Block['li'] = array(
+                'name' => 'li',
+                'handler' => array(
+                    'function' => 'li',
+                    'argument' => !empty($matches[3]) ? array($matches[3]) : array(),
+                    'destination' => 'elements'
+                )
+            );
+
+            $Block['element']['elements'] []= & $Block['li'];
+
+            return $Block;
+        }
+    }
+
+    protected function blockListContinue($Line, array $Block)
+    {
+        if (isset($Block['interrupted']) and empty($Block['li']['handler']['argument']))
+        {
+            return null;
+        }
+
+        $requiredIndent = ($Block['indent'] + strlen($Block['data']['marker']));
+
+        if ($Line['indent'] < $requiredIndent
+            and (
+                (
+                    $Block['data']['type'] === 'ol'
+                    and preg_match('/^[0-9]++'.$Block['data']['markerTypeRegex'].'(?:[ ]++(.*)|$)/', $Line['text'], $matches)
+                ) or (
+                    $Block['data']['type'] === 'ul'
+                    and preg_match('/^'.$Block['data']['markerTypeRegex'].'(?:[ ]++(.*)|$)/', $Line['text'], $matches)
+                )
+            )
+        ) {
+            if (isset($Block['interrupted']))
+            {
+                $Block['li']['handler']['argument'] []= '';
+
+                $Block['loose'] = true;
+
+                unset($Block['interrupted']);
+            }
+
+            unset($Block['li']);
+
+            $text = isset($matches[1]) ? $matches[1] : '';
+
+            $Block['indent'] = $Line['indent'];
+
+            $Block['li'] = array(
+                'name' => 'li',
+                'handler' => array(
+                    'function' => 'li',
+                    'argument' => array($text),
+                    'destination' => 'elements'
+                )
+            );
+
+            $Block['element']['elements'] []= & $Block['li'];
+
+            return $Block;
+        }
+        elseif ($Line['indent'] < $requiredIndent and $this->blockList($Line))
+        {
+            return null;
+        }
+
+        if ($Line['text'][0] === '[' and $this->blockReference($Line))
+        {
+            return $Block;
+        }
+
+        if ($Line['indent'] >= $requiredIndent)
+        {
+            if (isset($Block['interrupted']))
+            {
+                $Block['li']['handler']['argument'] []= '';
+
+                $Block['loose'] = true;
+
+                unset($Block['interrupted']);
+            }
+
+            $text = substr($Line['body'], $requiredIndent);
+
+            $Block['li']['handler']['argument'] []= $text;
+
+            return $Block;
+        }
+
+        if ( ! isset($Block['interrupted']))
+        {
+            $text = preg_replace('/^[ ]{0,'.$requiredIndent.'}+/', '', $Line['body']);
+
+            $Block['li']['handler']['argument'] []= $text;
+
+            return $Block;
+        }
+    }
+
+    protected function blockListComplete(array $Block)
+    {
+        if (isset($Block['loose']))
+        {
+            foreach ($Block['element']['elements'] as &$li)
+            {
+                if (end($li['handler']['argument']) !== '')
+                {
+                    $li['handler']['argument'] []= '';
+                }
+            }
+        }
+
+        return $Block;
+    }
+
+    #
+    # Quote
+
+    protected function blockQuote($Line)
+    {
+        if (preg_match('/^>[ ]?+(.*+)/', $Line['text'], $matches))
+        {
+            $Block = array(
+                'element' => array(
+                    'name' => 'blockquote',
+                    'handler' => array(
+                        'function' => 'linesElements',
+                        'argument' => (array) $matches[1],
+                        'destination' => 'elements',
+                    )
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    protected function blockQuoteContinue($Line, array $Block)
+    {
+        if (isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if ($Line['text'][0] === '>' and preg_match('/^>[ ]?+(.*+)/', $Line['text'], $matches))
+        {
+            $Block['element']['handler']['argument'] []= $matches[1];
+
+            return $Block;
+        }
+
+        if ( ! isset($Block['interrupted']))
+        {
+            $Block['element']['handler']['argument'] []= $Line['text'];
+
+            return $Block;
+        }
+    }
+
+    #
+    # Rule
+
+    protected function blockRule($Line)
+    {
+        $marker = $Line['text'][0];
+
+        if (substr_count($Line['text'], $marker) >= 3 and chop($Line['text'], " $marker") === '')
+        {
+            $Block = array(
+                'element' => array(
+                    'name' => 'hr',
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    #
+    # Setext
+
+    protected function blockSetextHeader($Line, array $Block = null)
+    {
+        if ( ! isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if ($Line['indent'] < 4 and chop(chop($Line['text'], ' '), $Line['text'][0]) === '')
+        {
+            $Block['element']['name'] = $Line['text'][0] === '=' ? 'h1' : 'h2';
+
+            return $Block;
+        }
+    }
+
+    #
+    # Markup
+
+    protected function blockMarkup($Line)
+    {
+        if ($this->markupEscaped or $this->safeMode)
+        {
+            return;
+        }
+
+        if (preg_match('/^<[\/]?+(\w*)(?:[ ]*+'.$this->regexHtmlAttribute.')*+[ ]*+(\/)?>/', $Line['text'], $matches))
+        {
+            $element = strtolower($matches[1]);
+
+            if (in_array($element, $this->textLevelElements))
+            {
+                return;
+            }
+
+            $Block = array(
+                'name' => $matches[1],
+                'element' => array(
+                    'rawHtml' => $Line['text'],
+                    'autobreak' => true,
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
+    protected function blockMarkupContinue($Line, array $Block)
+    {
+        if (isset($Block['closed']) or isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        $Block['element']['rawHtml'] .= "\n" . $Line['body'];
+
+        return $Block;
+    }
+
+    #
+    # Reference
+
+    protected function blockReference($Line)
+    {
+        if (strpos($Line['text'], ']') !== false
+            and preg_match('/^\[(.+?)\]:[ ]*+<?(\S+?)>?(?:[ ]+["\'(](.+)["\')])?[ ]*+$/', $Line['text'], $matches)
+        ) {
+            $id = strtolower($matches[1]);
+
+            $Data = array(
+                'url' => $matches[2],
+                'title' => isset($matches[3]) ? $matches[3] : null,
+            );
+
+            $this->DefinitionData['Reference'][$id] = $Data;
+
+            $Block = array(
+                'element' => array(),
+            );
+
+            return $Block;
+        }
+    }
+
+    #
+    # Table
+
+    protected function blockTable($Line, array $Block = null)
+    {
+        if ( ! isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if (
+            strpos($Block['element']['handler']['argument'], '|') === false
+            and strpos($Line['text'], '|') === false
+            and strpos($Line['text'], ':') === false
+            or strpos($Block['element']['handler']['argument'], "\n") !== false
+        ) {
+            return;
+        }
+
+        if (chop($Line['text'], ' -:|') !== '')
+        {
+            return;
+        }
+
+        $alignments = array();
+
+        $divider = $Line['text'];
+
+        $divider = trim($divider);
+        $divider = trim($divider, '|');
+
+        $dividerCells = explode('|', $divider);
+
+        foreach ($dividerCells as $dividerCell)
+        {
+            $dividerCell = trim($dividerCell);
+
+            if ($dividerCell === '')
+            {
+                return;
+            }
+
+            $alignment = null;
+
+            if ($dividerCell[0] === ':')
+            {
+                $alignment = 'left';
+            }
+
+            if (substr($dividerCell, - 1) === ':')
+            {
+                $alignment = $alignment === 'left' ? 'center' : 'right';
+            }
+
+            $alignments []= $alignment;
+        }
+
+        # ~
+
+        $HeaderElements = array();
+
+        $header = $Block['element']['handler']['argument'];
+
+        $header = trim($header);
+        $header = trim($header, '|');
+
+        $headerCells = explode('|', $header);
+
+        if (count($headerCells) !== count($alignments))
+        {
+            return;
+        }
+
+        foreach ($headerCells as $index => $headerCell)
+        {
+            $headerCell = trim($headerCell);
+
+            $HeaderElement = array(
+                'name' => 'th',
+                'handler' => array(
+                    'function' => 'lineElements',
+                    'argument' => $headerCell,
+                    'destination' => 'elements',
+                )
+            );
+
+            if (isset($alignments[$index]))
+            {
+                $alignment = $alignments[$index];
+
+                $HeaderElement['attributes'] = array(
+                    'style' => "text-align: $alignment;",
+                );
+            }
+
+            $HeaderElements []= $HeaderElement;
+        }
+
+        # ~
+
+        $Block = array(
+            'alignments' => $alignments,
+            'identified' => true,
+            'element' => array(
+                'name' => 'table',
+                'elements' => array(),
+            ),
+        );
+
+        $Block['element']['elements'] []= array(
+            'name' => 'thead',
+        );
+
+        $Block['element']['elements'] []= array(
+            'name' => 'tbody',
+            'elements' => array(),
+        );
+
+        $Block['element']['elements'][0]['elements'] []= array(
+            'name' => 'tr',
+            'elements' => $HeaderElements,
+        );
+
+        return $Block;
+    }
+
+    protected function blockTableContinue($Line, array $Block)
+    {
+        if (isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        if (count($Block['alignments']) === 1 or $Line['text'][0] === '|' or strpos($Line['text'], '|'))
+        {
+            $Elements = array();
+
+            $row = $Line['text'];
+
+            $row = trim($row);
+            $row = trim($row, '|');
+
+            preg_match_all('/(?:(\\\\[|])|[^|`]|`[^`]++`|`)++/', $row, $matches);
+
+            $cells = array_slice($matches[0], 0, count($Block['alignments']));
+
+            foreach ($cells as $index => $cell)
+            {
+                $cell = trim($cell);
+
+                $Element = array(
+                    'name' => 'td',
+                    'handler' => array(
+                        'function' => 'lineElements',
+                        'argument' => $cell,
+                        'destination' => 'elements',
+                    )
+                );
+
+                if (isset($Block['alignments'][$index]))
+                {
+                    $Element['attributes'] = array(
+                        'style' => 'text-align: ' . $Block['alignments'][$index] . ';',
+                    );
+                }
+
+                $Elements []= $Element;
+            }
+
+            $Element = array(
+                'name' => 'tr',
+                'elements' => $Elements,
+            );
+
+            $Block['element']['elements'][1]['elements'] []= $Element;
+
+            return $Block;
+        }
+    }
+
+    #
+    # ~
+    #
+
+    protected function paragraph($Line)
+    {
+        return array(
+            'type' => 'Paragraph',
+            'element' => array(
+                'name' => 'p',
+                'handler' => array(
+                    'function' => 'lineElements',
+                    'argument' => $Line['text'],
+                    'destination' => 'elements',
+                ),
+            ),
+        );
+    }
+
+    protected function paragraphContinue($Line, array $Block)
+    {
+        if (isset($Block['interrupted']))
+        {
+            return;
+        }
+
+        $Block['element']['handler']['argument'] .= "\n".$Line['text'];
+
+        return $Block;
+    }
+
+    #
+    # Inline Elements
+    #
+
+    protected $InlineTypes = array(
+        '!' => array('Image'),
+        '&' => array('SpecialCharacter'),
+        '*' => array('Emphasis'),
+        ':' => array('Url'),
+        '<' => array('UrlTag', 'EmailTag', 'Markup'),
+        '[' => array('Link'),
+        '_' => array('Emphasis'),
+        '`' => array('Code'),
+        '~' => array('Strikethrough'),
+        '\\' => array('EscapeSequence'),
+    );
+
+    # ~
+
+    protected $inlineMarkerList = '!*_&[:<`~\\';
+
+    #
+    # ~
+    #
+
+    public function line($text, $nonNestables = array())
+    {
+        return $this->elements($this->lineElements($text, $nonNestables));
+    }
+
+    protected function lineElements($text, $nonNestables = array())
+    {
+        # standardize line breaks
+        $text = str_replace(array("\r\n", "\r"), "\n", $text);
+
+        $Elements = array();
+
+        $nonNestables = (empty($nonNestables)
+            ? array()
+            : array_combine($nonNestables, $nonNestables)
+        );
+
+        # $excerpt is based on the first occurrence of a marker
+
+        while ($excerpt = strpbrk($text, $this->inlineMarkerList))
+        {
+            $marker = $excerpt[0];
+
+            $markerPosition = strlen($text) - strlen($excerpt);
+
+            $Excerpt = array('text' => $excerpt, 'context' => $text);
+
+            foreach ($this->InlineTypes[$marker] as $inlineType)
+            {
+                # check to see if the current inline type is nestable in the current context
+
+                if (isset($nonNestables[$inlineType]))
+                {
+                    continue;
+                }
+
+                $Inline = $this->{"inline$inlineType"}($Excerpt);
+
+                if ( ! isset($Inline))
+                {
+                    continue;
+                }
+
+                # makes sure that the inline belongs to "our" marker
+
+                if (isset($Inline['position']) and $Inline['position'] > $markerPosition)
+                {
+                    continue;
+                }
+
+                # sets a default inline position
+
+                if ( ! isset($Inline['position']))
+                {
+                    $Inline['position'] = $markerPosition;
+                }
+
+                # cause the new element to 'inherit' our non nestables
+
+
+                $Inline['element']['nonNestables'] = isset($Inline['element']['nonNestables'])
+                    ? array_merge($Inline['element']['nonNestables'], $nonNestables)
+                    : $nonNestables
+                ;
+
+                # the text that comes before the inline
+                $unmarkedText = substr($text, 0, $Inline['position']);
+
+                # compile the unmarked text
+                $InlineText = $this->inlineText($unmarkedText);
+                $Elements[] = $InlineText['element'];
+
+                # compile the inline
+                $Elements[] = $this->extractElement($Inline);
+
+                # remove the examined text
+                $text = substr($text, $Inline['position'] + $Inline['extent']);
+
+                continue 2;
+            }
+
+            # the marker does not belong to an inline
+
+            $unmarkedText = substr($text, 0, $markerPosition + 1);
+
+            $InlineText = $this->inlineText($unmarkedText);
+            $Elements[] = $InlineText['element'];
+
+            $text = substr($text, $markerPosition + 1);
+        }
+
+        $InlineText = $this->inlineText($text);
+        $Elements[] = $InlineText['element'];
+
+        foreach ($Elements as &$Element)
+        {
+            if ( ! isset($Element['autobreak']))
+            {
+                $Element['autobreak'] = false;
+            }
+        }
+
+        return $Elements;
+    }
+
+    #
+    # ~
+    #
+
+    protected function inlineText($text)
+    {
+        $Inline = array(
+            'extent' => strlen($text),
+            'element' => array(),
+        );
+
+        $Inline['element']['elements'] = self::pregReplaceElements(
+            $this->breaksEnabled ? '/[ ]*+\n/' : '/(?:[ ]*+\\\\|[ ]{2,}+)\n/',
+            array(
+                array('name' => 'br'),
+                array('text' => "\n"),
+            ),
+            $text
+        );
+
+        return $Inline;
+    }
+
+    protected function inlineCode($Excerpt)
+    {
+        $marker = $Excerpt['text'][0];
+
+        if (preg_match('/^(['.$marker.']++)[ ]*+(.+?)[ ]*+(?<!['.$marker.'])\1(?!'.$marker.')/s', $Excerpt['text'], $matches))
+        {
+            $text = $matches[2];
+            $text = preg_replace('/[ ]*+\n/', ' ', $text);
+
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => array(
+                    'name' => 'code',
+                    'text' => $text,
+                ),
+            );
+        }
+    }
+
+    protected function inlineEmailTag($Excerpt)
+    {
+        $hostnameLabel = '[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?';
+
+        $commonMarkEmail = '[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]++@'
+            . $hostnameLabel . '(?:\.' . $hostnameLabel . ')*';
+
+        if (strpos($Excerpt['text'], '>') !== false
+            and preg_match("/^<((mailto:)?$commonMarkEmail)>/i", $Excerpt['text'], $matches)
+        ){
+            $url = $matches[1];
+
+            if ( ! isset($matches[2]))
+            {
+                $url = "mailto:$url";
+            }
+
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => array(
+                    'name' => 'a',
+                    'text' => $matches[1],
+                    'attributes' => array(
+                        'href' => $url,
+                    ),
+                ),
+            );
+        }
+    }
+
+    protected function inlineEmphasis($Excerpt)
+    {
+        if ( ! isset($Excerpt['text'][1]))
+        {
+            return;
+        }
+
+        $marker = $Excerpt['text'][0];
+
+        if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches))
+        {
+            $emphasis = 'strong';
+        }
+        elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
+        {
+            $emphasis = 'em';
+        }
+        else
+        {
+            return;
+        }
+
+        return array(
+            'extent' => strlen($matches[0]),
+            'element' => array(
+                'name' => $emphasis,
+                'handler' => array(
+                    'function' => 'lineElements',
+                    'argument' => $matches[1],
+                    'destination' => 'elements',
+                )
+            ),
+        );
+    }
+
+    protected function inlineEscapeSequence($Excerpt)
+    {
+        if (isset($Excerpt['text'][1]) and in_array($Excerpt['text'][1], $this->specialCharacters))
+        {
+            return array(
+                'element' => array('rawHtml' => $Excerpt['text'][1]),
+                'extent' => 2,
+            );
+        }
+    }
+
+    protected function inlineImage($Excerpt)
+    {
+        if ( ! isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[')
+        {
+            return;
+        }
+
+        $Excerpt['text']= substr($Excerpt['text'], 1);
+
+        $Link = $this->inlineLink($Excerpt);
+
+        if ($Link === null)
+        {
+            return;
+        }
+
+        $Inline = array(
+            'extent' => $Link['extent'] + 1,
+            'element' => array(
+                'name' => 'img',
+                'attributes' => array(
+                    'src' => $Link['element']['attributes']['href'],
+                    'alt' => $Link['element']['handler']['argument'],
+                ),
+                'autobreak' => true,
+            ),
+        );
+
+        $Inline['element']['attributes'] += $Link['element']['attributes'];
+
+        unset($Inline['element']['attributes']['href']);
+
+        return $Inline;
+    }
+
+    protected function inlineLink($Excerpt)
+    {
+        $Element = array(
+            'name' => 'a',
+            'handler' => array(
+                'function' => 'lineElements',
+                'argument' => null,
+                'destination' => 'elements',
+            ),
+            'nonNestables' => array('Url', 'Link'),
+            'attributes' => array(
+                'href' => null,
+                'title' => null,
+            ),
+        );
+
+        $extent = 0;
+
+        $remainder = $Excerpt['text'];
+
+        if (preg_match('/\[((?:[^][]++|(?R))*+)\]/', $remainder, $matches))
+        {
+            $Element['handler']['argument'] = $matches[1];
+
+            $extent += strlen($matches[0]);
+
+            $remainder = substr($remainder, $extent);
+        }
+        else
+        {
+            return;
+        }
+
+        if (preg_match('/^[(]\s*+((?:[^ ()]++|[(][^ )]+[)])++)(?:[ ]+("[^"]*+"|\'[^\']*+\'))?\s*+[)]/', $remainder, $matches))
+        {
+            $Element['attributes']['href'] = $matches[1];
+
+            if (isset($matches[2]))
+            {
+                $Element['attributes']['title'] = substr($matches[2], 1, - 1);
+            }
+
+            $extent += strlen($matches[0]);
+        }
+        else
+        {
+            if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches))
+            {
+                $definition = strlen($matches[1]) ? $matches[1] : $Element['handler']['argument'];
+                $definition = strtolower($definition);
+
+                $extent += strlen($matches[0]);
+            }
+            else
+            {
+                $definition = strtolower($Element['handler']['argument']);
+            }
+
+            if ( ! isset($this->DefinitionData['Reference'][$definition]))
+            {
+                return;
+            }
+
+            $Definition = $this->DefinitionData['Reference'][$definition];
+
+            $Element['attributes']['href'] = $Definition['url'];
+            $Element['attributes']['title'] = $Definition['title'];
+        }
+
+        return array(
+            'extent' => $extent,
+            'element' => $Element,
+        );
+    }
+
+    protected function inlineMarkup($Excerpt)
+    {
+        if ($this->markupEscaped or $this->safeMode or strpos($Excerpt['text'], '>') === false)
+        {
+            return;
+        }
+
+        if ($Excerpt['text'][1] === '/' and preg_match('/^<\/\w[\w-]*+[ ]*+>/s', $Excerpt['text'], $matches))
+        {
+            return array(
+                'element' => array('rawHtml' => $matches[0]),
+                'extent' => strlen($matches[0]),
+            );
+        }
+
+        if ($Excerpt['text'][1] === '!' and preg_match('/^<!---?[^>-](?:-?+[^-])*-->/s', $Excerpt['text'], $matches))
+        {
+            return array(
+                'element' => array('rawHtml' => $matches[0]),
+                'extent' => strlen($matches[0]),
+            );
+        }
+
+        if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w[\w-]*+(?:[ ]*+'.$this->regexHtmlAttribute.')*+[ ]*+\/?>/s', $Excerpt['text'], $matches))
+        {
+            return array(
+                'element' => array('rawHtml' => $matches[0]),
+                'extent' => strlen($matches[0]),
+            );
+        }
+    }
+
+    protected function inlineSpecialCharacter($Excerpt)
+    {
+        if (substr($Excerpt['text'], 1, 1) !== ' ' and strpos($Excerpt['text'], ';') !== false
+            and preg_match('/^&(#?+[0-9a-zA-Z]++);/', $Excerpt['text'], $matches)
+        ) {
+            return array(
+                'element' => array('rawHtml' => '&' . $matches[1] . ';'),
+                'extent' => strlen($matches[0]),
+            );
+        }
+
+        return;
+    }
+
+    protected function inlineStrikethrough($Excerpt)
+    {
+        if ( ! isset($Excerpt['text'][1]))
+        {
+            return;
+        }
+
+        if ($Excerpt['text'][1] === '~' and preg_match('/^~~(?=\S)(.+?)(?<=\S)~~/', $Excerpt['text'], $matches))
+        {
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => array(
+                    'name' => 'del',
+                    'handler' => array(
+                        'function' => 'lineElements',
+                        'argument' => $matches[1],
+                        'destination' => 'elements',
+                    )
+                ),
+            );
+        }
+    }
+
+    protected function inlineUrl($Excerpt)
+    {
+        if ($this->urlsLinked !== true or ! isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/')
+        {
+            return;
+        }
+
+        if (strpos($Excerpt['context'], 'http') !== false
+            and preg_match('/\bhttps?+:[\/]{2}[^\s<]+\b\/*+/ui', $Excerpt['context'], $matches, PREG_OFFSET_CAPTURE)
+        ) {
+            $url = $matches[0][0];
+
+            $Inline = array(
+                'extent' => strlen($matches[0][0]),
+                'position' => $matches[0][1],
+                'element' => array(
+                    'name' => 'a',
+                    'text' => $url,
+                    'attributes' => array(
+                        'href' => $url,
+                    ),
+                ),
+            );
+
+            return $Inline;
+        }
+    }
+
+    protected function inlineUrlTag($Excerpt)
+    {
+        if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<(\w++:\/{2}[^ >]++)>/i', $Excerpt['text'], $matches))
+        {
+            $url = $matches[1];
+
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => array(
+                    'name' => 'a',
+                    'text' => $url,
+                    'attributes' => array(
+                        'href' => $url,
+                    ),
+                ),
+            );
+        }
+    }
+
+    # ~
+
+    protected function unmarkedText($text)
+    {
+        $Inline = $this->inlineText($text);
+        return $this->element($Inline['element']);
+    }
+
+    #
+    # Handlers
+    #
+
+    protected function handle(array $Element)
+    {
+        if (isset($Element['handler']))
+        {
+            if (!isset($Element['nonNestables']))
+            {
+                $Element['nonNestables'] = array();
+            }
+
+            if (is_string($Element['handler']))
+            {
+                $function = $Element['handler'];
+                $argument = $Element['text'];
+                unset($Element['text']);
+                $destination = 'rawHtml';
+            }
+            else
+            {
+                $function = $Element['handler']['function'];
+                $argument = $Element['handler']['argument'];
+                $destination = $Element['handler']['destination'];
+            }
+
+            $Element[$destination] = $this->{$function}($argument, $Element['nonNestables']);
+
+            if ($destination === 'handler')
+            {
+                $Element = $this->handle($Element);
+            }
+
+            unset($Element['handler']);
+        }
+
+        return $Element;
+    }
+
+    protected function handleElementRecursive(array $Element)
+    {
+        return $this->elementApplyRecursive(array($this, 'handle'), $Element);
+    }
+
+    protected function handleElementsRecursive(array $Elements)
+    {
+        return $this->elementsApplyRecursive(array($this, 'handle'), $Elements);
+    }
+
+    protected function elementApplyRecursive($closure, array $Element)
+    {
+        $Element = call_user_func($closure, $Element);
+
+        if (isset($Element['elements']))
+        {
+            $Element['elements'] = $this->elementsApplyRecursive($closure, $Element['elements']);
+        }
+        elseif (isset($Element['element']))
+        {
+            $Element['element'] = $this->elementApplyRecursive($closure, $Element['element']);
+        }
+
+        return $Element;
+    }
+
+    protected function elementApplyRecursiveDepthFirst($closure, array $Element)
+    {
+        if (isset($Element['elements']))
+        {
+            $Element['elements'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['elements']);
+        }
+        elseif (isset($Element['element']))
+        {
+            $Element['element'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['element']);
+        }
+
+        $Element = call_user_func($closure, $Element);
+
+        return $Element;
+    }
+
+    protected function elementsApplyRecursive($closure, array $Elements)
+    {
+        foreach ($Elements as &$Element)
+        {
+            $Element = $this->elementApplyRecursive($closure, $Element);
+        }
+
+        return $Elements;
+    }
+
+    protected function elementsApplyRecursiveDepthFirst($closure, array $Elements)
+    {
+        foreach ($Elements as &$Element)
+        {
+            $Element = $this->elementApplyRecursiveDepthFirst($closure, $Element);
+        }
+
+        return $Elements;
+    }
+
+    protected function element(array $Element)
+    {
+        if ($this->safeMode)
+        {
+            $Element = $this->sanitiseElement($Element);
+        }
+
+        # identity map if element has no handler
+        $Element = $this->handle($Element);
+
+        $hasName = isset($Element['name']);
+
+        $markup = '';
+
+        if ($hasName)
+        {
+            $markup .= '<' . $Element['name'];
+
+            if (isset($Element['attributes']))
+            {
+                foreach ($Element['attributes'] as $name => $value)
+                {
+                    if ($value === null)
+                    {
+                        continue;
+                    }
+
+                    $markup .= " $name=\"".self::escape($value).'"';
+                }
+            }
+        }
+
+        $permitRawHtml = false;
+
+        if (isset($Element['text']))
+        {
+            $text = $Element['text'];
+        }
+        // very strongly consider an alternative if you're writing an
+        // extension
+        elseif (isset($Element['rawHtml']))
+        {
+            $text = $Element['rawHtml'];
+
+            $allowRawHtmlInSafeMode = isset($Element['allowRawHtmlInSafeMode']) && $Element['allowRawHtmlInSafeMode'];
+            $permitRawHtml = !$this->safeMode || $allowRawHtmlInSafeMode;
+        }
+
+        $hasContent = isset($text) || isset($Element['element']) || isset($Element['elements']);
+
+        if ($hasContent)
+        {
+            $markup .= $hasName ? '>' : '';
+
+            if (isset($Element['elements']))
+            {
+                $markup .= $this->elements($Element['elements']);
+            }
+            elseif (isset($Element['element']))
+            {
+                $markup .= $this->element($Element['element']);
+            }
+            else
+            {
+                if (!$permitRawHtml)
+                {
+                    $markup .= self::escape($text, true);
+                }
+                else
+                {
+                    $markup .= $text;
+                }
+            }
+
+            $markup .= $hasName ? '</' . $Element['name'] . '>' : '';
+        }
+        elseif ($hasName)
+        {
+            $markup .= ' />';
+        }
+
+        return $markup;
+    }
+
+    protected function elements(array $Elements)
+    {
+        $markup = '';
+
+        $autoBreak = true;
+
+        foreach ($Elements as $Element)
+        {
+            if (empty($Element))
+            {
+                continue;
+            }
+
+            $autoBreakNext = (isset($Element['autobreak'])
+                ? $Element['autobreak'] : isset($Element['name'])
+            );
+            // (autobreak === false) covers both sides of an element
+            $autoBreak = !$autoBreak ? $autoBreak : $autoBreakNext;
+
+            $markup .= ($autoBreak ? "\n" : '') . $this->element($Element);
+            $autoBreak = $autoBreakNext;
+        }
+
+        $markup .= $autoBreak ? "\n" : '';
+
+        return $markup;
+    }
+
+    # ~
+
+    protected function li($lines)
+    {
+        $Elements = $this->linesElements($lines);
+
+        if ( ! in_array('', $lines)
+            and isset($Elements[0]) and isset($Elements[0]['name'])
+            and $Elements[0]['name'] === 'p'
+        ) {
+            unset($Elements[0]['name']);
+        }
+
+        return $Elements;
+    }
+
+    #
+    # AST Convenience
+    #
+
+    /**
+     * Replace occurrences $regexp with $Elements in $text. Return an array of
+     * elements representing the replacement.
+     */
+    protected static function pregReplaceElements($regexp, $Elements, $text)
+    {
+        $newElements = array();
+
+        while (preg_match($regexp, $text, $matches, PREG_OFFSET_CAPTURE))
+        {
+            $offset = $matches[0][1];
+            $before = substr($text, 0, $offset);
+            $after = substr($text, $offset + strlen($matches[0][0]));
+
+            $newElements[] = array('text' => $before);
+
+            foreach ($Elements as $Element)
+            {
+                $newElements[] = $Element;
+            }
+
+            $text = $after;
+        }
+
+        $newElements[] = array('text' => $text);
+
+        return $newElements;
+    }
+
+    #
+    # Deprecated Methods
+    #
+
+    function parse($text)
+    {
+        $markup = $this->text($text);
+
+        return $markup;
+    }
+
+    protected function sanitiseElement(array $Element)
+    {
+        static $goodAttribute = '/^[a-zA-Z0-9][a-zA-Z0-9-_]*+$/';
+        static $safeUrlNameToAtt  = array(
+            'a'   => 'href',
+            'img' => 'src',
+        );
+
+        if ( ! isset($Element['name']))
+        {
+            unset($Element['attributes']);
+            return $Element;
+        }
+
+        if (isset($safeUrlNameToAtt[$Element['name']]))
+        {
+            $Element = $this->filterUnsafeUrlInAttribute($Element, $safeUrlNameToAtt[$Element['name']]);
+        }
+
+        if ( ! empty($Element['attributes']))
+        {
+            foreach ($Element['attributes'] as $att => $val)
+            {
+                # filter out badly parsed attribute
+                if ( ! preg_match($goodAttribute, $att))
+                {
+                    unset($Element['attributes'][$att]);
+                }
+                # dump onevent attribute
+                elseif (self::striAtStart($att, 'on'))
+                {
+                    unset($Element['attributes'][$att]);
+                }
+            }
+        }
+
+        return $Element;
+    }
+
+    protected function filterUnsafeUrlInAttribute(array $Element, $attribute)
+    {
+        foreach ($this->safeLinksWhitelist as $scheme)
+        {
+            if (self::striAtStart($Element['attributes'][$attribute], $scheme))
+            {
+                return $Element;
+            }
+        }
+
+        $Element['attributes'][$attribute] = str_replace(':', '%3A', $Element['attributes'][$attribute]);
+
+        return $Element;
+    }
+
+    #
+    # Static Methods
+    #
+
+    protected static function escape($text, $allowQuotes = false)
+    {
+        return htmlspecialchars($text, $allowQuotes ? ENT_NOQUOTES : ENT_QUOTES, 'UTF-8');
+    }
+
+    protected static function striAtStart($string, $needle)
+    {
+        $len = strlen($needle);
+
+        if ($len > strlen($string))
+        {
+            return false;
+        }
+        else
+        {
+            return strtolower(substr($string, 0, $len)) === strtolower($needle);
+        }
+    }
+
+    static function instance($name = 'default')
+    {
+        if (isset(self::$instances[$name]))
+        {
+            return self::$instances[$name];
+        }
+
+        $instance = new static();
+
+        self::$instances[$name] = $instance;
+
+        return $instance;
+    }
+
+    private static $instances = array();
+
+    #
+    # Fields
+    #
+
+    protected $DefinitionData;
+
+    #
+    # Read-Only
+
+    protected $specialCharacters = array(
+        '\\', '`', '*', '_', '{', '}', '[', ']', '(', ')', '>', '#', '+', '-', '.', '!', '|', '~'
+    );
+
+    protected $StrongRegex = array(
+        '*' => '/^[*]{2}((?:\\\\\*|[^*]|[*][^*]*+[*])+?)[*]{2}(?![*])/s',
+        '_' => '/^__((?:\\\\_|[^_]|_[^_]*+_)+?)__(?!_)/us',
+    );
+
+    protected $EmRegex = array(
+        '*' => '/^[*]((?:\\\\\*|[^*]|[*][*][^*]+?[*][*])+?)[*](?![*])/s',
+        '_' => '/^_((?:\\\\_|[^_]|__[^_]*__)+?)_(?!_)\b/us',
+    );
+
+    protected $regexHtmlAttribute = '[a-zA-Z_:][\w:.-]*+(?:\s*+=\s*+(?:[^"\'=<>`\s]+|"[^"]*+"|\'[^\']*+\'))?+';
+
+    protected $voidElements = array(
+        'area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source',
+    );
+
+    protected $textLevelElements = array(
+        'a', 'br', 'bdo', 'abbr', 'blink', 'nextid', 'acronym', 'basefont',
+        'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing',
+        'i', 'rp', 'del', 'code',          'strike', 'marquee',
+        'q', 'rt', 'ins', 'font',          'strong',
+        's', 'tt', 'kbd', 'mark',
+        'u', 'xm', 'sub', 'nobr',
+                   'sup', 'ruby',
+                   'var', 'span',
+                   'wbr', 'time',
+    );
+}
\ No newline at end of file
diff --git a/vendor/traq/plugins/markdown/ParsedownExtra.php b/vendor/traq/plugins/markdown/ParsedownExtra.php
new file mode 100644
index 000000000..cc32d0425
--- /dev/null
+++ b/vendor/traq/plugins/markdown/ParsedownExtra.php
@@ -0,0 +1,686 @@
+<?php
+
+#
+#
+# Parsedown Extra
+# https://github.com/erusev/parsedown-extra
+#
+# (c) Emanuil Rusev
+# http://erusev.com
+#
+# For the full license information, view the LICENSE file that was distributed
+# with this source code.
+#
+#
+
+class ParsedownExtra extends Parsedown
+{
+    # ~
+
+    const version = '0.8.0';
+
+    # ~
+
+    function __construct()
+    {
+        if (version_compare(parent::version, '1.7.1') < 0)
+        {
+            throw new Exception('ParsedownExtra requires a later version of Parsedown');
+        }
+
+        $this->BlockTypes[':'] []= 'DefinitionList';
+        $this->BlockTypes['*'] []= 'Abbreviation';
+
+        # identify footnote definitions before reference definitions
+        array_unshift($this->BlockTypes['['], 'Footnote');
+
+        # identify footnote markers before before links
+        array_unshift($this->InlineTypes['['], 'FootnoteMarker');
+    }
+
+    #
+    # ~
+
+    function text($text)
+    {
+        $Elements = $this->textElements($text);
+
+        # convert to markup
+        $markup = $this->elements($Elements);
+
+        # trim line breaks
+        $markup = trim($markup, "\n");
+
+        # merge consecutive dl elements
+
+        $markup = preg_replace('/<\/dl>\s+<dl>\s+/', '', $markup);
+
+        # add footnotes
+
+        if (isset($this->DefinitionData['Footnote']))
+        {
+            $Element = $this->buildFootnoteElement();
+
+            $markup .= "\n" . $this->element($Element);
+        }
+
+        return $markup;
+    }
+
+    #
+    # Blocks
+    #
+
+    #
+    # Abbreviation
+
+    protected function blockAbbreviation($Line)
+    {
+        if (preg_match('/^\*\[(.+?)\]:[ ]*(.+?)[ ]*$/', $Line['text'], $matches))
+        {
+            $this->DefinitionData['Abbreviation'][$matches[1]] = $matches[2];
+
+            $Block = array(
+                'hidden' => true,
+            );
+
+            return $Block;
+        }
+    }
+
+    #
+    # Footnote
+
+    protected function blockFootnote($Line)
+    {
+        if (preg_match('/^\[\^(.+?)\]:[ ]?(.*)$/', $Line['text'], $matches))
+        {
+            $Block = array(
+                'label' => $matches[1],
+                'text' => $matches[2],
+                'hidden' => true,
+            );
+
+            return $Block;
+        }
+    }
+
+    protected function blockFootnoteContinue($Line, $Block)
+    {
+        if ($Line['text'][0] === '[' and preg_match('/^\[\^(.+?)\]:/', $Line['text']))
+        {
+            return;
+        }
+
+        if (isset($Block['interrupted']))
+        {
+            if ($Line['indent'] >= 4)
+            {
+                $Block['text'] .= "\n\n" . $Line['text'];
+
+                return $Block;
+            }
+        }
+        else
+        {
+            $Block['text'] .= "\n" . $Line['text'];
+
+            return $Block;
+        }
+    }
+
+    protected function blockFootnoteComplete($Block)
+    {
+        $this->DefinitionData['Footnote'][$Block['label']] = array(
+            'text' => $Block['text'],
+            'count' => null,
+            'number' => null,
+        );
+
+        return $Block;
+    }
+
+    #
+    # Definition List
+
+    protected function blockDefinitionList($Line, $Block)
+    {
+        if ( ! isset($Block) or $Block['type'] !== 'Paragraph')
+        {
+            return;
+        }
+
+        $Element = array(
+            'name' => 'dl',
+            'elements' => array(),
+        );
+
+        $terms = explode("\n", $Block['element']['handler']['argument']);
+
+        foreach ($terms as $term)
+        {
+            $Element['elements'] []= array(
+                'name' => 'dt',
+                'handler' => array(
+                    'function' => 'lineElements',
+                    'argument' => $term,
+                    'destination' => 'elements'
+                ),
+            );
+        }
+
+        $Block['element'] = $Element;
+
+        $Block = $this->addDdElement($Line, $Block);
+
+        return $Block;
+    }
+
+    protected function blockDefinitionListContinue($Line, array $Block)
+    {
+        if ($Line['text'][0] === ':')
+        {
+            $Block = $this->addDdElement($Line, $Block);
+
+            return $Block;
+        }
+        else
+        {
+            if (isset($Block['interrupted']) and $Line['indent'] === 0)
+            {
+                return;
+            }
+
+            if (isset($Block['interrupted']))
+            {
+                $Block['dd']['handler']['function'] = 'textElements';
+                $Block['dd']['handler']['argument'] .= "\n\n";
+
+                $Block['dd']['handler']['destination'] = 'elements';
+
+                unset($Block['interrupted']);
+            }
+
+            $text = substr($Line['body'], min($Line['indent'], 4));
+
+            $Block['dd']['handler']['argument'] .= "\n" . $text;
+
+            return $Block;
+        }
+    }
+
+    #
+    # Header
+
+    protected function blockHeader($Line)
+    {
+        $Block = parent::blockHeader($Line);
+
+        if ($Block !== null && preg_match('/[ #]*{('.$this->regexAttribute.'+)}[ ]*$/', $Block['element']['handler']['argument'], $matches, PREG_OFFSET_CAPTURE))
+        {
+            $attributeString = $matches[1][0];
+
+            $Block['element']['attributes'] = $this->parseAttributeData($attributeString);
+
+            $Block['element']['handler']['argument'] = substr($Block['element']['handler']['argument'], 0, $matches[0][1]);
+        }
+
+        return $Block;
+    }
+
+    #
+    # Markup
+
+    protected function blockMarkup($Line)
+    {
+        if ($this->markupEscaped or $this->safeMode)
+        {
+            return;
+        }
+
+        if (preg_match('/^<(\w[\w-]*)(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*(\/)?>/', $Line['text'], $matches))
+        {
+            $element = strtolower($matches[1]);
+
+            if (in_array($element, $this->textLevelElements))
+            {
+                return;
+            }
+
+            $Block = array(
+                'name' => $matches[1],
+                'depth' => 0,
+                'element' => array(
+                    'rawHtml' => $Line['text'],
+                    'autobreak' => true,
+                ),
+            );
+
+            $length = strlen($matches[0]);
+            $remainder = substr($Line['text'], $length);
+
+            if (trim($remainder) === '')
+            {
+                if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
+                {
+                    $Block['closed'] = true;
+                    $Block['void'] = true;
+                }
+            }
+            else
+            {
+                if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
+                {
+                    return;
+                }
+                if (preg_match('/<\/'.$matches[1].'>[ ]*$/i', $remainder))
+                {
+                    $Block['closed'] = true;
+                }
+            }
+
+            return $Block;
+        }
+    }
+
+    protected function blockMarkupContinue($Line, array $Block)
+    {
+        if (isset($Block['closed']))
+        {
+            return;
+        }
+
+        if (preg_match('/^<'.$Block['name'].'(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*>/i', $Line['text'])) # open
+        {
+            $Block['depth'] ++;
+        }
+
+        if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) # close
+        {
+            if ($Block['depth'] > 0)
+            {
+                $Block['depth'] --;
+            }
+            else
+            {
+                $Block['closed'] = true;
+            }
+        }
+
+        if (isset($Block['interrupted']))
+        {
+            $Block['element']['rawHtml'] .= "\n";
+            unset($Block['interrupted']);
+        }
+
+        $Block['element']['rawHtml'] .= "\n".$Line['body'];
+
+        return $Block;
+    }
+
+    protected function blockMarkupComplete($Block)
+    {
+        if ( ! isset($Block['void']))
+        {
+            $Block['element']['rawHtml'] = $this->processTag($Block['element']['rawHtml']);
+        }
+
+        return $Block;
+    }
+
+    #
+    # Setext
+
+    protected function blockSetextHeader($Line, array $Block = null)
+    {
+        $Block = parent::blockSetextHeader($Line, $Block);
+
+        if ($Block !== null && preg_match('/[ ]*{('.$this->regexAttribute.'+)}[ ]*$/', $Block['element']['handler']['argument'], $matches, PREG_OFFSET_CAPTURE))
+        {
+            $attributeString = $matches[1][0];
+
+            $Block['element']['attributes'] = $this->parseAttributeData($attributeString);
+
+            $Block['element']['handler']['argument'] = substr($Block['element']['handler']['argument'], 0, $matches[0][1]);
+        }
+
+        return $Block;
+    }
+
+    #
+    # Inline Elements
+    #
+
+    #
+    # Footnote Marker
+
+    protected function inlineFootnoteMarker($Excerpt)
+    {
+        if (preg_match('/^\[\^(.+?)\]/', $Excerpt['text'], $matches))
+        {
+            $name = $matches[1];
+
+            if ( ! isset($this->DefinitionData['Footnote'][$name]))
+            {
+                return;
+            }
+
+            $this->DefinitionData['Footnote'][$name]['count'] ++;
+
+            if ( ! isset($this->DefinitionData['Footnote'][$name]['number']))
+            {
+                $this->DefinitionData['Footnote'][$name]['number'] = ++ $this->footnoteCount; # » &
+            }
+
+            $Element = array(
+                'name' => 'sup',
+                'attributes' => array('id' => 'fnref'.$this->DefinitionData['Footnote'][$name]['count'].':'.$name),
+                'element' => array(
+                    'name' => 'a',
+                    'attributes' => array('href' => '#fn:'.$name, 'class' => 'footnote-ref'),
+                    'text' => $this->DefinitionData['Footnote'][$name]['number'],
+                ),
+            );
+
+            return array(
+                'extent' => strlen($matches[0]),
+                'element' => $Element,
+            );
+        }
+    }
+
+    private $footnoteCount = 0;
+
+    #
+    # Link
+
+    protected function inlineLink($Excerpt)
+    {
+        $Link = parent::inlineLink($Excerpt);
+
+        $remainder = $Link !== null ? substr($Excerpt['text'], $Link['extent']) : '';
+
+        if (preg_match('/^[ ]*{('.$this->regexAttribute.'+)}/', $remainder, $matches))
+        {
+            $Link['element']['attributes'] += $this->parseAttributeData($matches[1]);
+
+            $Link['extent'] += strlen($matches[0]);
+        }
+
+        return $Link;
+    }
+
+    #
+    # ~
+    #
+
+    private $currentAbreviation;
+    private $currentMeaning;
+
+    protected function insertAbreviation(array $Element)
+    {
+        if (isset($Element['text']))
+        {
+            $Element['elements'] = self::pregReplaceElements(
+                '/\b'.preg_quote($this->currentAbreviation, '/').'\b/',
+                array(
+                    array(
+                        'name' => 'abbr',
+                        'attributes' => array(
+                            'title' => $this->currentMeaning,
+                        ),
+                        'text' => $this->currentAbreviation,
+                    )
+                ),
+                $Element['text']
+            );
+
+            unset($Element['text']);
+        }
+
+        return $Element;
+    }
+
+    protected function inlineText($text)
+    {
+        $Inline = parent::inlineText($text);
+
+        if (isset($this->DefinitionData['Abbreviation']))
+        {
+            foreach ($this->DefinitionData['Abbreviation'] as $abbreviation => $meaning)
+            {
+                $this->currentAbreviation = $abbreviation;
+                $this->currentMeaning = $meaning;
+
+                $Inline['element'] = $this->elementApplyRecursiveDepthFirst(
+                    array($this, 'insertAbreviation'),
+                    $Inline['element']
+                );
+            }
+        }
+
+        return $Inline;
+    }
+
+    #
+    # Util Methods
+    #
+
+    protected function addDdElement(array $Line, array $Block)
+    {
+        $text = substr($Line['text'], 1);
+        $text = trim($text);
+
+        unset($Block['dd']);
+
+        $Block['dd'] = array(
+            'name' => 'dd',
+            'handler' => array(
+                'function' => 'lineElements',
+                'argument' => $text,
+                'destination' => 'elements'
+            ),
+        );
+
+        if (isset($Block['interrupted']))
+        {
+            $Block['dd']['handler']['function'] = 'textElements';
+
+            unset($Block['interrupted']);
+        }
+
+        $Block['element']['elements'] []= & $Block['dd'];
+
+        return $Block;
+    }
+
+    protected function buildFootnoteElement()
+    {
+        $Element = array(
+            'name' => 'div',
+            'attributes' => array('class' => 'footnotes'),
+            'elements' => array(
+                array('name' => 'hr'),
+                array(
+                    'name' => 'ol',
+                    'elements' => array(),
+                ),
+            ),
+        );
+
+        uasort($this->DefinitionData['Footnote'], 'self::sortFootnotes');
+
+        foreach ($this->DefinitionData['Footnote'] as $definitionId => $DefinitionData)
+        {
+            if ( ! isset($DefinitionData['number']))
+            {
+                continue;
+            }
+
+            $text = $DefinitionData['text'];
+
+            $textElements = parent::textElements($text);
+
+            $numbers = range(1, $DefinitionData['count']);
+
+            $backLinkElements = array();
+
+            foreach ($numbers as $number)
+            {
+                $backLinkElements[] = array('text' => ' ');
+                $backLinkElements[] = array(
+                    'name' => 'a',
+                    'attributes' => array(
+                        'href' => "#fnref$number:$definitionId",
+                        'rev' => 'footnote',
+                        'class' => 'footnote-backref',
+                    ),
+                    'rawHtml' => '&#8617;',
+                    'allowRawHtmlInSafeMode' => true,
+                    'autobreak' => false,
+                );
+            }
+
+            unset($backLinkElements[0]);
+
+            $n = count($textElements) -1;
+
+            if ($textElements[$n]['name'] === 'p')
+            {
+                $backLinkElements = array_merge(
+                    array(
+                        array(
+                            'rawHtml' => '&#160;',
+                            'allowRawHtmlInSafeMode' => true,
+                        ),
+                    ),
+                    $backLinkElements
+                );
+
+                unset($textElements[$n]['name']);
+
+                $textElements[$n] = array(
+                    'name' => 'p',
+                    'elements' => array_merge(
+                        array($textElements[$n]),
+                        $backLinkElements
+                    ),
+                );
+            }
+            else
+            {
+                $textElements[] = array(
+                    'name' => 'p',
+                    'elements' => $backLinkElements
+                );
+            }
+
+            $Element['elements'][1]['elements'] []= array(
+                'name' => 'li',
+                'attributes' => array('id' => 'fn:'.$definitionId),
+                'elements' => array_merge(
+                    $textElements
+                ),
+            );
+        }
+
+        return $Element;
+    }
+
+    # ~
+
+    protected function parseAttributeData($attributeString)
+    {
+        $Data = array();
+
+        $attributes = preg_split('/[ ]+/', $attributeString, - 1, PREG_SPLIT_NO_EMPTY);
+
+        foreach ($attributes as $attribute)
+        {
+            if ($attribute[0] === '#')
+            {
+                $Data['id'] = substr($attribute, 1);
+            }
+            else # "."
+            {
+                $classes []= substr($attribute, 1);
+            }
+        }
+
+        if (isset($classes))
+        {
+            $Data['class'] = implode(' ', $classes);
+        }
+
+        return $Data;
+    }
+
+    # ~
+
+    protected function processTag($elementMarkup) # recursive
+    {
+        # http://stackoverflow.com/q/1148928/200145
+        libxml_use_internal_errors(true);
+
+        $DOMDocument = new DOMDocument;
+
+        # http://stackoverflow.com/q/11309194/200145
+        $elementMarkup = mb_convert_encoding($elementMarkup, 'HTML-ENTITIES', 'UTF-8');
+
+        # http://stackoverflow.com/q/4879946/200145
+        $DOMDocument->loadHTML($elementMarkup);
+        $DOMDocument->removeChild($DOMDocument->doctype);
+        $DOMDocument->replaceChild($DOMDocument->firstChild->firstChild->firstChild, $DOMDocument->firstChild);
+
+        $elementText = '';
+
+        if ($DOMDocument->documentElement->getAttribute('markdown') === '1')
+        {
+            foreach ($DOMDocument->documentElement->childNodes as $Node)
+            {
+                $elementText .= $DOMDocument->saveHTML($Node);
+            }
+
+            $DOMDocument->documentElement->removeAttribute('markdown');
+
+            $elementText = "\n".$this->text($elementText)."\n";
+        }
+        else
+        {
+            foreach ($DOMDocument->documentElement->childNodes as $Node)
+            {
+                $nodeMarkup = $DOMDocument->saveHTML($Node);
+
+                if ($Node instanceof DOMElement and ! in_array($Node->nodeName, $this->textLevelElements))
+                {
+                    $elementText .= $this->processTag($nodeMarkup);
+                }
+                else
+                {
+                    $elementText .= $nodeMarkup;
+                }
+            }
+        }
+
+        # because we don't want for markup to get encoded
+        $DOMDocument->documentElement->nodeValue = 'placeholder\x1A';
+
+        $markup = $DOMDocument->saveHTML($DOMDocument->documentElement);
+        $markup = str_replace('placeholder\x1A', $elementText, $markup);
+
+        return $markup;
+    }
+
+    # ~
+
+    protected function sortFootnotes($A, $B) # callback
+    {
+        return $A['number'] - $B['number'];
+    }
+
+    #
+    # Fields
+    #
+
+    protected $regexAttribute = '(?:[#.][-\w]+[ ]*)';
+}
\ No newline at end of file
diff --git a/vendor/traq/plugins/markdown/markdown.php b/vendor/traq/plugins/markdown/markdown.php
index c309375ef..792ae8357 100644
--- a/vendor/traq/plugins/markdown/markdown.php
+++ b/vendor/traq/plugins/markdown/markdown.php
@@ -22,10 +22,12 @@
 
 namespace traq\plugins;
 
-require __DIR__ . '/Michelf/Markdown.php';
-require __DIR__ . '/Michelf/MarkdownExtra.php';
+require __DIR__ . '/Parsedown.php';
+require __DIR__ . '/ParsedownExtra.php';
 
 use \FishHook;
+use \Parsedown;
+use \ParsedownExtra;
 
 /**
  * Markdown Plugin.
@@ -41,7 +43,7 @@ class Markdown extends \traq\libraries\Plugin
 
     protected static $info = array(
         'name'    => 'Markdown',
-        'version' => '2.0.1',
+        'version' => '3.0.0',
         'author'  => 'Jack P.'
     );
 
@@ -65,11 +67,10 @@ public static function format_text(&$text, $strip_html)
 
         // Initialise parser
         if (!isset(static::$parser)) {
-            static::$parser = new \Michelf\MarkdownExtra;
-            static::$parser->no_markup = true;
+            static::$parser = new ParsedownExtra();
         }
 
         // Parse the text
-        $text = static::$parser->transform($text);
+        $text = static::$parser->text($text);
     }
 }

From dca340c97479bfb32fd6c314bf234e7803e2ed61 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sat, 2 Jul 2022 11:27:25 +1000
Subject: [PATCH 23/46] Add custom fields API route

---
 vendor/traq/config/routes.php       |  1 +
 vendor/traq/controllers/api.php     |  8 ++++++++
 vendor/traq/models/custom_field.php | 23 +++++++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/vendor/traq/config/routes.php b/vendor/traq/config/routes.php
index dd6e0769d..a1a86d543 100644
--- a/vendor/traq/config/routes.php
+++ b/vendor/traq/config/routes.php
@@ -36,6 +36,7 @@
 Router::add('/api/statuses', 'traq::controllers::API.statuses');
 Router::add('/api/priorities', 'traq::controllers::API.priorities');
 Router::add('/api/'.PROJECT_SLUG.'/components', 'traq::controllers::API.components');
+Router::add('/api/'.PROJECT_SLUG.'/custom-fields', 'traq::controllers::API.customFields');
 
 // Misc
 Router::add('/_js(?:.js)?', 'traq::controllers::Misc.javascript');
diff --git a/vendor/traq/controllers/api.php b/vendor/traq/controllers/api.php
index 8af7e4f69..e82e3ba71 100644
--- a/vendor/traq/controllers/api.php
+++ b/vendor/traq/controllers/api.php
@@ -76,4 +76,12 @@ public function action_components()
     {
         Body::append(to_json($this->project->components->exec()->fetch_all()));
     }
+
+    /**
+     * Project components.
+     */
+    public function action_customFields()
+    {
+        Body::append(to_json($this->project->custom_fields->exec()->fetch_all()));
+    }
 }
diff --git a/vendor/traq/models/custom_field.php b/vendor/traq/models/custom_field.php
index 295102d13..0e120fc8d 100644
--- a/vendor/traq/models/custom_field.php
+++ b/vendor/traq/models/custom_field.php
@@ -379,4 +379,27 @@ public function save()
 
         return false;
     }
+
+    public function __toArray($fields = null)
+    {
+        $ticketTypeIds = array_map(
+            fn($id) => (int) $id,
+            $this->ticket_type_ids
+        );
+
+        return [
+            'id' => (int) $this->id,
+            'name' => $this->name,
+            'slug' => $this->slug,
+            'type' => $this->type,
+            'is_required' => (bool) $this->is_required,
+            'min_length' => (int) $this->min_length,
+            'max_length' => (int) $this->max_length,
+            'multiple' => (bool) $this->multiple,
+            'regex' => $this->regex,
+            'values' => $this->values,
+            'default_value' => $this->default_value,
+            'ticket_type_ids' => $ticketTypeIds,
+        ];
+    }
 }

From fdb898d45a969d26aee19feb9b544113a39a9c6e Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sat, 2 Jul 2022 17:43:19 +1000
Subject: [PATCH 24/46] Add custom fields to Tickets endpoint

---
 vendor/traq/controllers/tickets.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/vendor/traq/controllers/tickets.php b/vendor/traq/controllers/tickets.php
index 18561f885..192178ef4 100644
--- a/vendor/traq/controllers/tickets.php
+++ b/vendor/traq/controllers/tickets.php
@@ -38,6 +38,7 @@
 use traq\models\User;
 use traq\models\Subscription;
 use traq\models\CustomField;
+use traq\models\CustomFieldValue;
 use traq\models\Timeline;
 use traq\helpers\TicketFilterQuery;
 use traq\helpers\Pagination;
@@ -159,9 +160,28 @@ public function action_index()
         View::set(compact('pagination'));
         unset($all_rows);
 
+        $customFields = [];
+        $ticketCustomFields = [];
+        $projectCustomFields = $this->project->custom_fields->exec()->fetch_all();
+
+        foreach ($projectCustomFields as $customField) {
+            $customFields[$customField->id] = $customField;
+        }
+
+        $customFieldValues = CustomFieldValue::fetch_all();
+        foreach ($customFieldValues as $customFieldValue) {
+            // $customFields[$customFieldValue->custom_field_id]['values'][$customFieldValue->ticket_id] = $customFieldValue->value;
+            $customField = $customFields[$customFieldValue->custom_field_id];
+            $slug = str_replace('-', '_', $customField->slug);
+            $ticketCustomFields[$customFieldValue->ticket_id][$slug] = $customFieldValue->value;
+        }
+
         // Add to tickets array
         foreach($rows->exec()->fetch_all() as $row) {
-            $tickets[] = new Ticket($row, false);
+            $ticket = (new Ticket($row, false))->__toArray();
+            $ticket['custom_fields'] = $ticketCustomFields[$ticket['id']] ?? [];
+
+            $tickets[] = $ticket;
         }
 
         // Send the tickets array to the view..

From a17f3f9f0b3a5fe3ebd914e7686b37f03c960186 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sat, 2 Jul 2022 17:43:28 +1000
Subject: [PATCH 25/46] Add custom fields to TicketColumns component

---
 traq-ui/ticket-listing/TicketColumns.vue | 29 +++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/traq-ui/ticket-listing/TicketColumns.vue b/traq-ui/ticket-listing/TicketColumns.vue
index b36dee9f7..d1b3393b4 100644
--- a/traq-ui/ticket-listing/TicketColumns.vue
+++ b/traq-ui/ticket-listing/TicketColumns.vue
@@ -1,4 +1,12 @@
 <script lang="ts">
+import axios from "axios"
+
+export interface CustomField {
+  name: string
+  field: string
+  custom?: boolean
+}
+
 export default {
   data() {
     return {
@@ -12,6 +20,10 @@ export default {
           name: "Summary",
           field: "summary",
         },
+        {
+          name: "Status",
+          field: "status",
+        },
         {
           name: "Owner",
           field: "owner",
@@ -53,10 +65,25 @@ export default {
           field: "votes",
         },
       ],
-      active: ["ticket_id", "summary", "owner", "type", "component", "milestone"],
+      active: ["ticket_id", "summary", "status", "owner", "type", "component", "milestone"],
     }
   },
 
+  mounted() {
+    const customFieldsUrl = `${window.traq.base}api/${window.traq.project_slug}/custom-fields`
+    axios.get(customFieldsUrl).then((resp) => {
+      resp.data.map((field) => {
+        this.columns.push({
+          name: field.name,
+          field: field.slug,
+          custom: true,
+        })
+      })
+    })
+
+    this.$emit("apply-columns", this.active)
+  },
+
   methods: {
     toggleExpand(): void {
       this.isExpanded = !this.isExpanded

From f9ab5b1e914ce086db32ab107bca9e8fca1aadaf Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sat, 2 Jul 2022 18:01:20 +1000
Subject: [PATCH 26/46] Show/hide custom fields

---
 traq-ui/ticket-listing/TicketColumns.vue | 15 ++++++++-----
 traq-ui/ticket-listing/TicketListing.vue | 28 ++++++++++++++++++++----
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/traq-ui/ticket-listing/TicketColumns.vue b/traq-ui/ticket-listing/TicketColumns.vue
index d1b3393b4..d60ed410f 100644
--- a/traq-ui/ticket-listing/TicketColumns.vue
+++ b/traq-ui/ticket-listing/TicketColumns.vue
@@ -8,6 +8,8 @@ export interface CustomField {
 }
 
 export default {
+  props: ["customFields"],
+
   data() {
     return {
       isExpanded: true,
@@ -70,18 +72,19 @@ export default {
   },
 
   mounted() {
-    const customFieldsUrl = `${window.traq.base}api/${window.traq.project_slug}/custom-fields`
-    axios.get(customFieldsUrl).then((resp) => {
-      resp.data.map((field) => {
+    this.$emit("apply-columns", this.active)
+  },
+
+  watch: {
+    customFields() {
+      this.customFields.map((field) => {
         this.columns.push({
           name: field.name,
           field: field.slug,
           custom: true,
         })
       })
-    })
-
-    this.$emit("apply-columns", this.active)
+    },
   },
 
   methods: {
diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
index 0e23e72af..d644ba0b0 100644
--- a/traq-ui/ticket-listing/TicketListing.vue
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -16,8 +16,19 @@ export default {
       sort_order: "desc",
       filters: [],
       columns: ["ticket_id", "summary", "status", "type", "owner", "component", "milestone"],
+      customFields: [],
     }
   },
+
+  mounted() {
+    this.getTickets()
+
+    const customFieldsUrl = `${window.traq.base}api/${window.traq.project_slug}/custom-fields`
+    axios.get(customFieldsUrl).then((resp) => {
+      this.customFields = resp.data
+    })
+  },
+
   computed: {
     getTicketUrl(): string {
       let ticketsUrl = window.traq.base + window.traq.project_slug + "/tickets.json"
@@ -79,9 +90,6 @@ export default {
       history.pushState({}, null, this.getTicketUrl.replace(".json", ""))
     },
   },
-  mounted() {
-    this.getTickets()
-  },
 }
 </script>
 
@@ -90,7 +98,7 @@ export default {
     <h2 id="page_title">Tickets</h2>
   </div>
   <TicketFilters @apply-filters="applyFilters" />
-  <TicketColumns @apply-columns="updateColumns" />
+  <TicketColumns @apply-columns="updateColumns" :custom-fields="customFields" />
   <table id="tickets" class="ticket-listing list">
     <thead>
       <tr>
@@ -185,6 +193,15 @@ export default {
             <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
           </template>
         </th>
+        <template v-for="field in customFields" :key="field.slug">
+          <th v-if="columns.includes(field.slug)">
+            <a href="#" @click="sortTickets(field.slug)">{{ field.name }}</a>
+            <template v-if="sort_by === field.slug">
+              <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
+              <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+            </template>
+          </th>
+        </template>
       </tr>
       <tr v-for="ticket in tickets" :key="ticket.id" :class="'priority-' + ticket.priority.id">
         <td v-if="columns.includes('ticket_id')">{{ ticket.id }}</td>
@@ -209,6 +226,9 @@ export default {
         <td v-if="columns.includes('created_at')">{{ formatDate(ticket.created_at) }}</td>
         <td v-if="columns.includes('updated_at')">{{ formatDate(ticket.updated_at) }}</td>
         <td v-if="columns.includes('votes')">{{ ticket.votes }}</td>
+        <template v-for="field in customFields" :key="field.slug">
+          <td v-if="columns.includes(field.slug)">{{ ticket.custom_fields[field.slug.replaceAll("-", "_")] ?? "-" }}</td>
+        </template>
       </tr>
     </thead>
   </table>

From 7ec42eafc18e8b6c0bb62cf2b36fb8411f656bd2 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sat, 2 Jul 2022 18:54:12 +1000
Subject: [PATCH 27/46] Custom field filtering

---
 traq-ui/ticket-listing/TicketFilters.vue    | 145 ++++++++++++--------
 traq-ui/ticket-listing/TicketListing.vue    |   2 +-
 vendor/traq/helpers/ticket_filter_query.php |  10 +-
 vendor/traq/models/custom_field.php         |   2 +-
 4 files changed, 96 insertions(+), 63 deletions(-)

diff --git a/traq-ui/ticket-listing/TicketFilters.vue b/traq-ui/ticket-listing/TicketFilters.vue
index 61f38c2f0..963943146 100644
--- a/traq-ui/ticket-listing/TicketFilters.vue
+++ b/traq-ui/ticket-listing/TicketFilters.vue
@@ -14,6 +14,8 @@ interface FilterOption {
 }
 
 export default {
+  props: ["customFields"],
+
   data() {
     return {
       isExpanded: true,
@@ -24,6 +26,58 @@ export default {
         statuses: [],
         priorities: [],
       },
+      availableFilters: [
+        {
+          field: "summary",
+          label: "Summary",
+          type: "contains",
+        },
+        {
+          field: "description",
+          label: "Description",
+          type: "contains",
+        },
+        {
+          field: "owner",
+          label: "Owner",
+          type: "isOr",
+        },
+        {
+          field: "assigned_to",
+          label: "Assigned to",
+          type: "isOr",
+        },
+        {
+          field: "component",
+          label: "Component",
+          type: "is",
+          dataSet: "components",
+        },
+        {
+          field: "milestone",
+          label: "Milestone",
+          type: "is",
+          dataSet: "milestones",
+        },
+        {
+          field: "version",
+          label: "Version",
+          type: "is",
+          dataSet: "milestones",
+        },
+        {
+          field: "status",
+          label: "Status",
+          type: "is",
+          dataSet: "statuses",
+        },
+        {
+          field: "priority",
+          label: "Priorities",
+          type: "is",
+          dataSet: "priorities",
+        },
+      ],
     }
   },
 
@@ -84,60 +138,33 @@ export default {
     })
   },
 
+  watch: {
+    customFields(): void {
+      this.customFields.map((field) => {
+        const key = field.slug.replaceAll("-", "_")
+
+        if (Array.isArray(field.values)) {
+          this.filterData[key] = field.values.map((value) => ({ label: value, value }))
+        }
+
+        // Multi-select or contains will do just fine
+        const fieldType: "is" | "contains" = field.type === "select" ? "is" : "contains"
+
+        const filter: FilterOption = {
+          label: field.name,
+          field: field.slug,
+          type: fieldType,
+          dataSet: fieldType === "is" ? key : undefined,
+        }
+
+        this.availableFilters.push(filter)
+      })
+    },
+  },
+
   computed: {
     filterOptions(): FilterOption[] {
-      const options: FilterOption[] = [
-        {
-          field: "summary",
-          label: "Summary",
-          type: "contains",
-        },
-        {
-          field: "description",
-          label: "Description",
-          type: "contains",
-        },
-        {
-          field: "owner",
-          label: "Owner",
-          type: "isOr",
-        },
-        {
-          field: "assigned_to",
-          label: "Assigned to",
-          type: "isOr",
-        },
-        {
-          field: "component",
-          label: "Component",
-          type: "is",
-          dataSet: "components",
-        },
-        {
-          field: "milestone",
-          label: "Milestone",
-          type: "is",
-          dataSet: "milestones",
-        },
-        {
-          field: "version",
-          label: "Version",
-          type: "is",
-          dataSet: "milestones",
-        },
-        {
-          field: "status",
-          label: "Status",
-          type: "is",
-          dataSet: "statuses",
-        },
-        {
-          field: "priority",
-          label: "Priorities",
-          type: "is",
-          dataSet: "priorities",
-        },
-      ]
+      const options: FilterOption[] = this.availableFilters
 
       const filters = options.filter((filter: FilterOption) => {
         const added = this.filters.find((option: FilterOption) => option.field === filter.field)
@@ -153,17 +180,17 @@ export default {
   },
 
   methods: {
-    toggleExpand() {
+    toggleExpand(): void {
       this.isExpanded = !this.isExpanded
     },
-    applyFilters(filters = null) {
+    applyFilters(filters = null): void {
       if (Array.isArray(filters)) {
         this.filters = filters
       }
 
       this.$emit("applyFilters", this.filters)
     },
-    addFilter(event) {
+    addFilter(event): void {
       const field: string = event.target.value
       const filter: FilterOption = this.filterOptions.find((option: FilterOption) => option.field === field)
 
@@ -177,20 +204,20 @@ export default {
 
       event.target.value = ""
     },
-    addFilterValue(filter) {
+    addFilterValue(filter): void {
       filter.values.push("")
     },
-    setFilterValue(filter, index, event) {
+    setFilterValue(filter, index, event): void {
       filter.values[index] = event.target.value
     },
-    removeFilter(filter, valueIndex = null) {
+    removeFilter(filter, valueIndex = null): void {
       if (valueIndex === null || (valueIndex === 0 && filter.values.length === 1)) {
         this.filters = this.filters.filter((option: FilterOption) => option.field !== filter.field)
       } else {
         filter.values.splice(valueIndex, 1)
       }
     },
-    convertQueryString() {
+    convertQueryString(): void {
       const activeFilters = []
       const params = new URLSearchParams(window.location.search.substring(1))
 
diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
index d644ba0b0..b54bdaa32 100644
--- a/traq-ui/ticket-listing/TicketListing.vue
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -97,7 +97,7 @@ export default {
   <div class="content">
     <h2 id="page_title">Tickets</h2>
   </div>
-  <TicketFilters @apply-filters="applyFilters" />
+  <TicketFilters @apply-filters="applyFilters" :custom-fields="customFields" />
   <TicketColumns @apply-columns="updateColumns" :custom-fields="customFields" />
   <table id="tickets" class="ticket-listing list">
     <thead>
diff --git a/vendor/traq/helpers/ticket_filter_query.php b/vendor/traq/helpers/ticket_filter_query.php
index b7f11d3f1..8053c683d 100644
--- a/vendor/traq/helpers/ticket_filter_query.php
+++ b/vendor/traq/helpers/ticket_filter_query.php
@@ -202,8 +202,12 @@ private function add($field, $condition, $values)
 
             // Sort values low to high
             asort($values);
+            $values = array_map(
+                fn($val) => '"'.$val.'"',
+                $values
+            );
 
-            if (count($values) == 1 && !empty($values[0])) {
+            if (count($values) >= 1 && !empty($values[0])) {
                 $this->custom_field_sql[] = "
                     `fields`.`custom_field_id` = {$custom_field->id}
                     AND `fields`.`value` IN ('" . implode("','", $values) . "')
@@ -233,7 +237,9 @@ public function sql()
         $sql = array();
 
         if (count($this->custom_field_sql)) {
-            $sql[] = "JOIN `" . Database::connection()->prefix . "custom_field_values` AS `fields` ON (" . implode(' AND ', $this->custom_field_sql) . ")";
+            foreach ($this->custom_field_sql as $index => $customFieldSql) {
+                $sql[] = "JOIN `" . Database::connection()->prefix . "custom_field_values` AS `fields${index}` ON (" . str_replace('`fields`', "`fields${index}`", $customFieldSql) . ")";
+            }
         }
 
         $sql[] = " WHERE `project_id` = {$this->project->id}";
diff --git a/vendor/traq/models/custom_field.php b/vendor/traq/models/custom_field.php
index 0e120fc8d..119555b3e 100644
--- a/vendor/traq/models/custom_field.php
+++ b/vendor/traq/models/custom_field.php
@@ -397,7 +397,7 @@ public function __toArray($fields = null)
             'max_length' => (int) $this->max_length,
             'multiple' => (bool) $this->multiple,
             'regex' => $this->regex,
-            'values' => $this->values,
+            'values' => $this->type === 'select' ? explode("\n", $this->values) : $this->values,
             'default_value' => $this->default_value,
             'ticket_type_ids' => $ticketTypeIds,
         ];

From c5a22885f88f6dc5bb12420a9b3387cd41bed98a Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sat, 2 Jul 2022 19:29:15 +1000
Subject: [PATCH 28/46] Update custom field type options

---
 traq-ui/ticket-listing/TicketColumns.vue    | 1 +
 traq-ui/ticket-listing/TicketFilters.vue    | 6 ++++--
 traq-ui/ticket-listing/TicketListing.vue    | 4 ++++
 vendor/traq/helpers/ticket_filter_query.php | 4 +++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/traq-ui/ticket-listing/TicketColumns.vue b/traq-ui/ticket-listing/TicketColumns.vue
index d60ed410f..ba923109a 100644
--- a/traq-ui/ticket-listing/TicketColumns.vue
+++ b/traq-ui/ticket-listing/TicketColumns.vue
@@ -77,6 +77,7 @@ export default {
 
   watch: {
     customFields() {
+      // Map custom fields to available columns.
       this.customFields.map((field) => {
         this.columns.push({
           name: field.name,
diff --git a/traq-ui/ticket-listing/TicketFilters.vue b/traq-ui/ticket-listing/TicketFilters.vue
index 963943146..1e5b27b65 100644
--- a/traq-ui/ticket-listing/TicketFilters.vue
+++ b/traq-ui/ticket-listing/TicketFilters.vue
@@ -140,15 +140,17 @@ export default {
 
   watch: {
     customFields(): void {
+      // Map custom fields to available filters.
       this.customFields.map((field) => {
         const key = field.slug.replaceAll("-", "_")
 
+        // If the values are an array, create a data set.
         if (Array.isArray(field.values)) {
           this.filterData[key] = field.values.map((value) => ({ label: value, value }))
         }
 
-        // Multi-select or contains will do just fine
-        const fieldType: "is" | "contains" = field.type === "select" ? "is" : "contains"
+        // is/isOr will do just fine
+        const fieldType: "is" | "isOr" = field.type === "select" ? "is" : "isOr"
 
         const filter: FilterOption = {
           label: field.name,
diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
index b54bdaa32..abc2a7849 100644
--- a/traq-ui/ticket-listing/TicketListing.vue
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -7,6 +7,7 @@ import TicketColumns from "./TicketColumns.vue"
 
 export default {
   components: { TicketFilters, TicketColumns },
+
   data() {
     return {
       tickets: [],
@@ -33,10 +34,12 @@ export default {
     getTicketUrl(): string {
       let ticketsUrl = window.traq.base + window.traq.project_slug + "/tickets.json"
 
+      // Add sorting options to URL
       if (this.sort_by) {
         ticketsUrl = `${ticketsUrl}?order_by=${this.sort_by}.${this.sort_order}`
       }
 
+      // Add filters to URL
       if (this.filters.length) {
         const filterBits = this.filters.map((filter) => {
           return `${filter.field}=` + (filter.condition ? "" : "!") + filter.values.join(",")
@@ -47,6 +50,7 @@ export default {
 
       return ticketsUrl
     },
+    // Icons
     faChevronUp() {
       return faChevronUp
     },
diff --git a/vendor/traq/helpers/ticket_filter_query.php b/vendor/traq/helpers/ticket_filter_query.php
index 8053c683d..0932a9b38 100644
--- a/vendor/traq/helpers/ticket_filter_query.php
+++ b/vendor/traq/helpers/ticket_filter_query.php
@@ -60,6 +60,8 @@ public function process($field, $values)
             $values = explode(',', $values);
         }
 
+        $values = array_map(fn($val) => addslashes($val), $values);
+
         $condition = '';
         if (substr($values[0], 0, 1) == '!') {
             $condition = 'NOT';
@@ -210,7 +212,7 @@ private function add($field, $condition, $values)
             if (count($values) >= 1 && !empty($values[0])) {
                 $this->custom_field_sql[] = "
                     `fields`.`custom_field_id` = {$custom_field->id}
-                    AND `fields`.`value` IN ('" . implode("','", $values) . "')
+                    AND `fields`.`value` ${condition} IN ('" . implode("','", $values) . "')
                     AND `fields`.`ticket_id` = `" . Database::connection()->prefix . "tickets`.`id`
                 ";
             }

From 6508bd39c03e83a4a55b06c1a2e3d3164851e29f Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sat, 2 Jul 2022 22:09:50 +1000
Subject: [PATCH 29/46] Promises everywhere

---
 .vscode/settings.json                    |   3 +-
 traq-ui/ticket-listing/TicketColumns.vue |  20 ++--
 traq-ui/ticket-listing/TicketFilters.vue | 129 ++++++++++++-----------
 traq-ui/ticket-listing/TicketListing.vue |   6 +-
 4 files changed, 86 insertions(+), 72 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index d523d01e4..c3bbe1ee2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,6 +3,7 @@
   "editor.formatOnSave": true,
   "cSpell.ignoreWords": [
     "TRAQ",
-    "axios"
+    "axios",
+    "roadmap"
   ]
 }
\ No newline at end of file
diff --git a/traq-ui/ticket-listing/TicketColumns.vue b/traq-ui/ticket-listing/TicketColumns.vue
index ba923109a..a4b9dd405 100644
--- a/traq-ui/ticket-listing/TicketColumns.vue
+++ b/traq-ui/ticket-listing/TicketColumns.vue
@@ -72,19 +72,13 @@ export default {
   },
 
   mounted() {
+    this.buildCustomFields()
     this.$emit("apply-columns", this.active)
   },
 
   watch: {
     customFields() {
-      // Map custom fields to available columns.
-      this.customFields.map((field) => {
-        this.columns.push({
-          name: field.name,
-          field: field.slug,
-          custom: true,
-        })
-      })
+      this.buildCustomFields()
     },
   },
 
@@ -101,6 +95,16 @@ export default {
 
       this.$emit("apply-columns", this.active)
     },
+    buildCustomFields(): void {
+      // Map custom fields to available columns.
+      this.customFields.map((field) => {
+        this.columns.push({
+          name: field.name,
+          field: field.slug,
+          custom: true,
+        })
+      })
+    },
   },
 }
 </script>
diff --git a/traq-ui/ticket-listing/TicketFilters.vue b/traq-ui/ticket-listing/TicketFilters.vue
index 1e5b27b65..457b784d3 100644
--- a/traq-ui/ticket-listing/TicketFilters.vue
+++ b/traq-ui/ticket-listing/TicketFilters.vue
@@ -87,80 +87,56 @@ export default {
     const statusesUrl = window.traq.base + "api/statuses"
     const prioritiesUrl = window.traq.base + "api/priorities"
 
-    axios.get(roadmapUrl).then((resp) => {
-      this.filterData.milestones =
-        resp.data.map((data) => ({
-          label: data.name,
-          value: data.slug,
-        })) ?? []
-    })
-
-    axios.get(statusesUrl).then((resp) => {
-      const open =
-        resp.data
-          .filter((status) => status.status === 1)
-          .map((data) => ({
+    Promise.all([axios.get(roadmapUrl), axios.get(statusesUrl), axios.get(prioritiesUrl), axios.get(componentsUrl)]).then(
+      ([roadmap, statuses, priorities, components]) => {
+        this.filterData.milestones =
+          roadmap.data.map((data) => ({
+            label: data.name,
+            value: data.slug,
+          })) ?? []
+
+        const open =
+          statuses.data
+            .filter((status) => status.status === 1)
+            .map((data) => ({
+              label: data.name,
+              value: data.name,
+            })) ?? []
+
+        const closed =
+          statuses.data
+            .filter((status) => status.status === 0)
+            .map((data) => ({
+              label: data.name,
+              value: data.name,
+            })) ?? []
+
+        this.filterData.statuses = {
+          Open: open,
+          Closed: closed,
+        }
+
+        this.filterData.priorities =
+          priorities.data.map((data) => ({
             label: data.name,
             value: data.name,
           })) ?? []
 
-      const closed =
-        resp.data
-          .filter((status) => status.status === 0)
-          .map((data) => ({
+        this.filterData.components =
+          components.data.map((data) => ({
             label: data.name,
             value: data.name,
           })) ?? []
 
-      this.filterData.statuses = {
-        Open: open,
-        Closed: closed,
+        // Convert query string after we get statuses, as we convert 'allOpen' and 'allClosed'
+        this.buildCustomFields().then(() => this.convertQueryString())
       }
-
-      // Convert query string after we get statuses, as we convert 'allOpen' and 'allClosed'
-      this.convertQueryString()
-    })
-
-    axios.get(prioritiesUrl).then((resp) => {
-      this.filterData.priorities =
-        resp.data.map((data) => ({
-          label: data.name,
-          value: data.name,
-        })) ?? []
-    })
-
-    axios.get(componentsUrl).then((resp) => {
-      this.filterData.components =
-        resp.data.map((data) => ({
-          label: data.name,
-          value: data.name,
-        })) ?? []
-    })
+    )
   },
 
   watch: {
     customFields(): void {
-      // Map custom fields to available filters.
-      this.customFields.map((field) => {
-        const key = field.slug.replaceAll("-", "_")
-
-        // If the values are an array, create a data set.
-        if (Array.isArray(field.values)) {
-          this.filterData[key] = field.values.map((value) => ({ label: value, value }))
-        }
-
-        // is/isOr will do just fine
-        const fieldType: "is" | "isOr" = field.type === "select" ? "is" : "isOr"
-
-        const filter: FilterOption = {
-          label: field.name,
-          field: field.slug,
-          type: fieldType,
-          dataSet: fieldType === "is" ? key : undefined,
-        }
-
-        this.availableFilters.push(filter)
-      })
+      this.buildCustomFields()
     },
   },
 
@@ -219,6 +195,37 @@ export default {
         filter.values.splice(valueIndex, 1)
       }
     },
+    buildCustomFields(): Promise<boolean> {
+      return new Promise((resolve, reject) => {
+        try {
+          // Map custom fields to available filters.
+          this.customFields.map((field) => {
+            const key = field.slug.replaceAll("-", "_")
+
+            // If the values are an array, create a data set.
+            if (Array.isArray(field.values)) {
+              this.filterData[key] = field.values.map((value) => ({ label: value, value }))
+            }
+
+            // is/isOr will do just fine
+            const fieldType: "is" | "isOr" = field.type === "select" ? "is" : "isOr"
+
+            const filter: FilterOption = {
+              label: field.name,
+              field: field.slug,
+              type: fieldType,
+              dataSet: fieldType === "is" ? key : undefined,
+            }
+
+            this.availableFilters.push(filter)
+          })
+
+          resolve(true)
+        } catch (error) {
+          reject(false)
+        }
+      })
+    },
     convertQueryString(): void {
       const activeFilters = []
       const params = new URLSearchParams(window.location.search.substring(1))
diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
index abc2a7849..758206597 100644
--- a/traq-ui/ticket-listing/TicketListing.vue
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -10,6 +10,7 @@ export default {
 
   data() {
     return {
+      isLoading: true,
       tickets: [],
       page: 1,
       total_pages: 1,
@@ -27,6 +28,7 @@ export default {
     const customFieldsUrl = `${window.traq.base}api/${window.traq.project_slug}/custom-fields`
     axios.get(customFieldsUrl).then((resp) => {
       this.customFields = resp.data
+      this.isLoading = false
     })
   },
 
@@ -101,8 +103,8 @@ export default {
   <div class="content">
     <h2 id="page_title">Tickets</h2>
   </div>
-  <TicketFilters @apply-filters="applyFilters" :custom-fields="customFields" />
-  <TicketColumns @apply-columns="updateColumns" :custom-fields="customFields" />
+  <TicketFilters @apply-filters="applyFilters" :custom-fields="customFields" v-if="!isLoading" />
+  <TicketColumns @apply-columns="updateColumns" :custom-fields="customFields" v-if="!isLoading" />
   <table id="tickets" class="ticket-listing list">
     <thead>
       <tr>

From 77d031064f614ec2ed2b67e02d460d29c8afc13d Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sat, 2 Jul 2022 22:13:01 +1000
Subject: [PATCH 30/46] Update filter name width

---
 traq-ui/ticket-listing/TicketFilters.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/traq-ui/ticket-listing/TicketFilters.vue b/traq-ui/ticket-listing/TicketFilters.vue
index 457b784d3..f0ff38437 100644
--- a/traq-ui/ticket-listing/TicketFilters.vue
+++ b/traq-ui/ticket-listing/TicketFilters.vue
@@ -388,7 +388,7 @@ export default {
   & .label {
     text-align: right;
     font-weight: bold;
-    @apply w-28;
+    @apply w-32;
     @apply mr-3;
     @apply pt-2;
   }

From 34c35ba32bb7b3d58a5166bac5e270229045665f Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sat, 2 Jul 2022 22:49:33 +1000
Subject: [PATCH 31/46] Implement auth info endpoint

---
 vendor/traq/config/routes.php                 |  2 +
 vendor/traq/controllers/api.php               | 26 ++++++++++++
 vendor/traq/models/user.php                   | 42 ++++++++++++-------
 vendor/traq/views/default/layouts/_head.phtml |  2 +-
 4 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/vendor/traq/config/routes.php b/vendor/traq/config/routes.php
index a1a86d543..9e5b3eba6 100644
--- a/vendor/traq/config/routes.php
+++ b/vendor/traq/config/routes.php
@@ -33,6 +33,8 @@
 Router::add('/users/validate/(.*)', 'traq::controllers::Users.validate/$1');
 
 // API
+Router::add('/api/auth', 'traq::controllers::API.auth');
+Router::add('/api/auth/'.PROJECT_SLUG, 'traq::controllers::API.auth');
 Router::add('/api/statuses', 'traq::controllers::API.statuses');
 Router::add('/api/priorities', 'traq::controllers::API.priorities');
 Router::add('/api/'.PROJECT_SLUG.'/components', 'traq::controllers::API.components');
diff --git a/vendor/traq/controllers/api.php b/vendor/traq/controllers/api.php
index e82e3ba71..6a98ce129 100644
--- a/vendor/traq/controllers/api.php
+++ b/vendor/traq/controllers/api.php
@@ -27,6 +27,7 @@
 use avalon\core\Load;
 use traq\models\Status;
 use traq\models\Priority;
+use traq\models\Permission;
 
 /**
  * API controller.
@@ -84,4 +85,29 @@ public function action_customFields()
     {
         Body::append(to_json($this->project->custom_fields->exec()->fetch_all()));
     }
+
+    public function action_auth()
+    {
+        $data = $this->user->__toArray([
+            'id',
+            'username',
+            'name',
+            'group_id',
+            'locale',
+        ]);
+
+        $data['id'] = (int) $data['id'];
+        $data['group_id'] = (int) $data['group_id'];
+
+        $data['permissions'] = [];
+        if ($this->project) {
+            foreach ($this->user->getPermissions($this->project->id) as $permission) {
+                if ((bool) $permission->value) {
+                    $data['permissions'][$permission->action] = (bool) $permission->value;
+                }
+            }
+        }
+
+        Body::append(to_json($data));
+    }
 }
diff --git a/vendor/traq/models/user.php b/vendor/traq/models/user.php
index 497bca84c..6f69fdcbb 100644
--- a/vendor/traq/models/user.php
+++ b/vendor/traq/models/user.php
@@ -145,28 +145,42 @@ public function permission($project_id, $action)
             return true;
         }
 
-        // Check if the projects permissions has been fetched
+        $perms = $this->getPermissions($project_id, $action);
+
+        if (!isset($perms[$action])) {
+            return false;
+        }
+
+        return $perms[$action]->value;
+    }
+
+    /**
+     * Get the users permissions
+     * 
+     * @param int $projectId
+     * 
+     * @return array
+     */
+    public function getPermissions(int $projectId): array
+    {
+         // Check if the projects permissions has been fetched
         // if not, fetch them.
-        if (!isset($this->permissions['project'][$project_id])) {
-            $this->permissions['project'][$project_id] = Permission::get_permissions($project_id, $this->_data['group_id']);
+        if (!isset($this->permissions['project'][$projectId])) {
+            $this->permissions['project'][$projectId] = Permission::get_permissions($projectId, $this->_data['group_id']);
         }
 
         // Check if the user has a role for the project and
         // fetch the permissions if not already done so...
-        $role_id = $this->get_project_role($project_id);
-        if ($role_id and !isset($this->permissions['role'][$project_id])) {
-            $this->permissions['role'][$project_id] = Permission::get_permissions($project_id, $role_id, 'role');
-        } elseif (!isset($this->permissions['role'][$project_id])) {
-            $this->permissions['role'][$project_id] = array();
+        $roleId = $this->get_project_role($projectId);
+        if ($roleId and !isset($this->permissions['role'][$projectId])) {
+            $this->permissions['role'][$projectId] = Permission::get_permissions($projectId, $roleId, 'role');
+        } elseif (!isset($this->permissions['role'][$projectId])) {
+            $this->permissions['role'][$projectId] = array();
         }
 
-        $perms = array_merge($this->permissions['project'][$project_id], $this->permissions['role'][$project_id]);
-
-        if (!isset($perms[$action])) {
-            return false;
-        }
+        $perms = array_merge($this->permissions['project'][$projectId], $this->permissions['role'][$projectId]);
 
-        return $perms[$action]->value;
+        return $perms;
     }
 
     /**
diff --git a/vendor/traq/views/default/layouts/_head.phtml b/vendor/traq/views/default/layouts/_head.phtml
index 5bf33b872..f2dc4dab8 100644
--- a/vendor/traq/views/default/layouts/_head.phtml
+++ b/vendor/traq/views/default/layouts/_head.phtml
@@ -18,7 +18,7 @@
 		<script src="<?=Request::base('_js')?>" type="text/javascript"></script>
 		<?=ui_package('main')?>
 
-		<?php if ($project): ?>
+		<?php if (isset($project)): ?>
 			<script>
 				window.traq.project_slug = <?php echo json_encode($project->slug); ?>
 			</script>

From 149d06469991528cd9d0bd341b8c0a515f61f0c3 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sat, 2 Jul 2022 23:07:34 +1000
Subject: [PATCH 32/46] Strip comments from install.sql before executing

---
 install/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/index.php b/install/index.php
index 88db09c56..b6b0c7815 100644
--- a/install/index.php
+++ b/install/index.php
@@ -142,6 +142,7 @@
         // Fetch the install SQL.
         $install_sql = file_get_contents('./install.sql');
         $install_sql = str_replace('traq_', $_SESSION['db']['prefix'], $install_sql);
+        $install_sql = preg_replace('/^(#.*)$/m', '', $install_sql);
         $queries = explode(';', $install_sql);
 
         // Run the install queries.

From 6774b931fc2c44c4e7f0cf40e89e14df7a16fc34 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sat, 2 Jul 2022 23:36:43 +1000
Subject: [PATCH 33/46] Begin Mass Actions component

---
 traq-ui/ticket-listing/MassActions.vue   | 13 +++++++++
 traq-ui/ticket-listing/TicketListing.vue | 34 ++++++++++++++++++++----
 2 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 traq-ui/ticket-listing/MassActions.vue

diff --git a/traq-ui/ticket-listing/MassActions.vue b/traq-ui/ticket-listing/MassActions.vue
new file mode 100644
index 000000000..ac97acdbc
--- /dev/null
+++ b/traq-ui/ticket-listing/MassActions.vue
@@ -0,0 +1,13 @@
+<script lang="ts">
+export default {
+  props: ["ticketIds"],
+}
+</script>
+
+<template>
+  <div v-if="ticketIds.length">
+    <h2>Mass Actions</h2>
+  </div>
+</template>
+
+<style lang="postcss"></style>
diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
index 758206597..d3ce39e59 100644
--- a/traq-ui/ticket-listing/TicketListing.vue
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -4,13 +4,15 @@ import axios from "axios"
 import { DateTime } from "luxon"
 import TicketFilters from "./TicketFilters.vue"
 import TicketColumns from "./TicketColumns.vue"
+import MassActions from "./MassActions.vue"
 
 export default {
-  components: { TicketFilters, TicketColumns },
+  components: { TicketFilters, TicketColumns, MassActions },
 
   data() {
     return {
       isLoading: true,
+      user: null,
       tickets: [],
       page: 1,
       total_pages: 1,
@@ -19,15 +21,19 @@ export default {
       filters: [],
       columns: ["ticket_id", "summary", "status", "type", "owner", "component", "milestone"],
       customFields: [],
+      checkedTickets: [],
     }
   },
 
   mounted() {
+    const customFieldsUrl = `${window.traq.base}api/${window.traq.project_slug}/custom-fields`
+    const authUrl = `${window.traq.base}api/auth/${window.traq.project_slug}`
+
     this.getTickets()
 
-    const customFieldsUrl = `${window.traq.base}api/${window.traq.project_slug}/custom-fields`
-    axios.get(customFieldsUrl).then((resp) => {
-      this.customFields = resp.data
+    Promise.all([axios.get(customFieldsUrl), axios.get(authUrl)]).then(([customFields, auth]) => {
+      this.customFields = customFields.data
+      this.user = auth.data
       this.isLoading = false
     })
   },
@@ -95,6 +101,16 @@ export default {
       // Update page URL to the same URL to fetch tickets without the .json extension.
       history.pushState({}, null, this.getTicketUrl.replace(".json", ""))
     },
+    userCan(action): boolean {
+      return this.user?.permissions[action] ?? false
+    },
+    toggleTicket(ticketId): void {
+      if (this.checkedTickets.includes(ticketId)) {
+        this.checkedTickets = this.checkedTickets.filter((checkedId) => checkedId !== ticketId)
+      } else {
+        this.checkedTickets.push(ticketId)
+      }
+    },
   },
 }
 </script>
@@ -108,6 +124,9 @@ export default {
   <table id="tickets" class="ticket-listing list">
     <thead>
       <tr>
+        <th v-if="userCan('perform_mass_actions')">
+          <input type="checkbox" />
+        </th>
         <th v-if="columns.includes('ticket_id')">
           <a href="#" @click="sortTickets('ticket_id')">ID</a>
           <template v-if="sort_by === 'ticket_id'">
@@ -210,7 +229,10 @@ export default {
         </template>
       </tr>
       <tr v-for="ticket in tickets" :key="ticket.id" :class="'priority-' + ticket.priority.id">
-        <td v-if="columns.includes('ticket_id')">{{ ticket.id }}</td>
+        <td v-if="userCan('perform_mass_actions')">
+          <input type="checkbox" @click="toggleTicket(ticket.ticket_id)" :checked="checkedTickets.includes(ticket.ticket_id)" />
+        </td>
+        <td v-if="columns.includes('ticket_id')">{{ ticket.ticket_id }}</td>
         <td v-if="columns.includes('summary')">
           <a :href="ticketUrl(ticket.id)">
             {{ ticket.summary }}
@@ -238,6 +260,8 @@ export default {
       </tr>
     </thead>
   </table>
+
+  <MassActions :ticket-ids="checkedTickets" />
 </template>
 
 <style scoped lang="postcss">

From b3cf2df9f4714a88bf6cf04d527bf7a29ccae3c8 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sat, 2 Jul 2022 23:37:22 +1000
Subject: [PATCH 34/46] Fix primary button colours

---
 traq-ui/css/buttons.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/traq-ui/css/buttons.css b/traq-ui/css/buttons.css
index 840767b53..00765ffce 100644
--- a/traq-ui/css/buttons.css
+++ b/traq-ui/css/buttons.css
@@ -58,7 +58,7 @@ input[type="reset"] {
     @apply text-white;
     @apply bg-brand-500 hover:bg-brand-600 active:bg-brand-700;
     @apply border-brand-500 hover:border-brand-600 active:border-brand-700;
-    @apply ring-brand-200;
+    @apply ring-brand-100;
 
     &:disabled {
       &,

From b1f2b88d2b3330585b7b0644bab6083455c045ff Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sun, 3 Jul 2022 19:36:25 +1000
Subject: [PATCH 35/46] Implement auth/user store

---
 traq-ui/stores/auth.ts                   | 40 +++++++++++++++++++
 traq-ui/ticket-listing/TicketListing.vue | 21 ++++++----
 traq-ui/ticket-listing/ticket-listing.ts |  8 +++-
 vendor/traq/config/routes.php            |  1 +
 vendor/traq/controllers/api.php          | 50 ++++++++++++++++--------
 5 files changed, 95 insertions(+), 25 deletions(-)
 create mode 100644 traq-ui/stores/auth.ts

diff --git a/traq-ui/stores/auth.ts b/traq-ui/stores/auth.ts
new file mode 100644
index 000000000..cf636b535
--- /dev/null
+++ b/traq-ui/stores/auth.ts
@@ -0,0 +1,40 @@
+import { defineStore } from "pinia"
+
+export interface User {
+  id: number
+  username: string
+  name: string
+  groupId: number
+  isAdmin: boolean
+  permissions: { [key: string]: boolean }
+}
+
+interface AuthStore {
+  user: User
+}
+
+export const useAuthStore = defineStore("auth", {
+  state: (): AuthStore => ({
+    user: null,
+  }),
+  getters: {
+    name(state) {
+      return state.user?.name
+    },
+  },
+  actions: {
+    setAuth(user: User): void {
+      this.user = user
+    },
+    can(action: string): boolean {
+      if (this.user?.isAdmin) {
+        return true
+      }
+
+      return this.user?.permissions ? this.user?.permissions[action] : false
+    },
+    canOneOf(permissions: string[]): boolean {
+      return permissions.map((p) => this.can(p)).includes(true)
+    },
+  },
+})
diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
index d3ce39e59..23c48a57b 100644
--- a/traq-ui/ticket-listing/TicketListing.vue
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -5,14 +5,22 @@ import { DateTime } from "luxon"
 import TicketFilters from "./TicketFilters.vue"
 import TicketColumns from "./TicketColumns.vue"
 import MassActions from "./MassActions.vue"
+import { useAuthStore } from "../stores/auth"
 
 export default {
   components: { TicketFilters, TicketColumns, MassActions },
 
+  setup() {
+    const auth = useAuthStore()
+
+    return {
+      auth,
+    }
+  },
+
   data() {
     return {
       isLoading: true,
-      user: null,
       tickets: [],
       page: 1,
       total_pages: 1,
@@ -33,7 +41,7 @@ export default {
 
     Promise.all([axios.get(customFieldsUrl), axios.get(authUrl)]).then(([customFields, auth]) => {
       this.customFields = customFields.data
-      this.user = auth.data
+      this.auth.setAuth(auth.data)
       this.isLoading = false
     })
   },
@@ -101,9 +109,6 @@ export default {
       // Update page URL to the same URL to fetch tickets without the .json extension.
       history.pushState({}, null, this.getTicketUrl.replace(".json", ""))
     },
-    userCan(action): boolean {
-      return this.user?.permissions[action] ?? false
-    },
     toggleTicket(ticketId): void {
       if (this.checkedTickets.includes(ticketId)) {
         this.checkedTickets = this.checkedTickets.filter((checkedId) => checkedId !== ticketId)
@@ -124,7 +129,7 @@ export default {
   <table id="tickets" class="ticket-listing list">
     <thead>
       <tr>
-        <th v-if="userCan('perform_mass_actions')">
+        <th v-if="auth.can('perform_mass_actions')">
           <input type="checkbox" />
         </th>
         <th v-if="columns.includes('ticket_id')">
@@ -229,7 +234,7 @@ export default {
         </template>
       </tr>
       <tr v-for="ticket in tickets" :key="ticket.id" :class="'priority-' + ticket.priority.id">
-        <td v-if="userCan('perform_mass_actions')">
+        <td v-if="auth.can('perform_mass_actions')">
           <input type="checkbox" @click="toggleTicket(ticket.ticket_id)" :checked="checkedTickets.includes(ticket.ticket_id)" />
         </td>
         <td v-if="columns.includes('ticket_id')">{{ ticket.ticket_id }}</td>
@@ -261,7 +266,7 @@ export default {
     </thead>
   </table>
 
-  <MassActions :ticket-ids="checkedTickets" />
+  <MassActions :ticket-ids="checkedTickets" v-if="auth.can('perform_mass_actions')" />
 </template>
 
 <style scoped lang="postcss">
diff --git a/traq-ui/ticket-listing/ticket-listing.ts b/traq-ui/ticket-listing/ticket-listing.ts
index 851f25c45..0dff62f57 100644
--- a/traq-ui/ticket-listing/ticket-listing.ts
+++ b/traq-ui/ticket-listing/ticket-listing.ts
@@ -1,7 +1,13 @@
 import { createApp } from "vue"
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"
+import { createPinia } from "pinia"
 
 import TicketListing from "./TicketListing.vue"
 
-const app = createApp(TicketListing).component("fa-icon", FontAwesomeIcon)
+const pinia = createPinia()
+const app = createApp(TicketListing)
+
+app.component("fa-icon", FontAwesomeIcon)
+app.use(pinia)
+
 app.mount("#ticket-listing")
diff --git a/vendor/traq/config/routes.php b/vendor/traq/config/routes.php
index 9e5b3eba6..40f26b112 100644
--- a/vendor/traq/config/routes.php
+++ b/vendor/traq/config/routes.php
@@ -35,6 +35,7 @@
 // API
 Router::add('/api/auth', 'traq::controllers::API.auth');
 Router::add('/api/auth/'.PROJECT_SLUG, 'traq::controllers::API.auth');
+Router::add('/api/types', 'traq::controllers::API.types');
 Router::add('/api/statuses', 'traq::controllers::API.statuses');
 Router::add('/api/priorities', 'traq::controllers::API.priorities');
 Router::add('/api/'.PROJECT_SLUG.'/components', 'traq::controllers::API.components');
diff --git a/vendor/traq/controllers/api.php b/vendor/traq/controllers/api.php
index 6a98ce129..c4526c698 100644
--- a/vendor/traq/controllers/api.php
+++ b/vendor/traq/controllers/api.php
@@ -25,6 +25,7 @@
 use avalon\output\Body;
 
 use avalon\core\Load;
+use traq\models\Type;
 use traq\models\Status;
 use traq\models\Priority;
 use traq\models\Permission;
@@ -50,6 +51,16 @@ public function __construct()
         header('Content-Type: application/json; charset=UTF-8');
     }
 
+    /**
+     * Ticket types.
+     *
+     * @return string
+     */
+    public function action_types()
+    {
+        Body::append(to_json(Type::fetch_all()));
+    }
+
     /**
      * Ticket statuses.
      *
@@ -86,24 +97,31 @@ public function action_customFields()
         Body::append(to_json($this->project->custom_fields->exec()->fetch_all()));
     }
 
+    /**
+     * Current authenticated user.
+     */
     public function action_auth()
     {
-        $data = $this->user->__toArray([
-            'id',
-            'username',
-            'name',
-            'group_id',
-            'locale',
-        ]);
-
-        $data['id'] = (int) $data['id'];
-        $data['group_id'] = (int) $data['group_id'];
-
-        $data['permissions'] = [];
-        if ($this->project) {
-            foreach ($this->user->getPermissions($this->project->id) as $permission) {
-                if ((bool) $permission->value) {
-                    $data['permissions'][$permission->action] = (bool) $permission->value;
+        $data = false;
+
+        if ($this->user) {
+            $data = $this->user->__toArray([
+                'id',
+                'username',
+                'name',
+                'group_id',
+                'locale',
+            ]);
+
+            $data['id'] = (int) $data['id'];
+            $data['group_id'] = (int) $data['group_id'];
+
+            $data['permissions'] = [];
+            if ($this->project) {
+                foreach ($this->user->getPermissions($this->project->id) as $permission) {
+                    if ((bool) $permission->value) {
+                        $data['permissions'][$permission->action] = (bool) $permission->value;
+                    }
                 }
             }
         }

From f057e2770795fcfe247297a26dcf34e60ba7db95 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sun, 3 Jul 2022 19:36:45 +1000
Subject: [PATCH 36/46] Mass Actions fields

---
 traq-ui/ticket-listing/MassActions.vue | 220 ++++++++++++++++++++++++-
 1 file changed, 217 insertions(+), 3 deletions(-)

diff --git a/traq-ui/ticket-listing/MassActions.vue b/traq-ui/ticket-listing/MassActions.vue
index ac97acdbc..b47be4ddb 100644
--- a/traq-ui/ticket-listing/MassActions.vue
+++ b/traq-ui/ticket-listing/MassActions.vue
@@ -1,13 +1,227 @@
 <script lang="ts">
+import axios from "axios"
+import { useAuthStore } from "../stores/auth"
+
 export default {
   props: ["ticketIds"],
+
+  setup() {
+    const auth = useAuthStore()
+
+    return {
+      auth,
+    }
+  },
+
+  data() {
+    return {
+      types: [],
+      milestones: [],
+      components: [],
+      priorities: [],
+      assignees: [],
+      statuses: [],
+    }
+  },
+
+  mounted() {
+    const roadmapUrl = window.traq.base + window.traq.project_slug + "/roadmap.json"
+    const componentsUrl = window.traq.base + "api/" + window.traq.project_slug + "/components"
+    const statusesUrl = window.traq.base + "api/statuses"
+    const prioritiesUrl = window.traq.base + "api/priorities"
+    const typesUrl = window.traq.base + "api/types"
+
+    Promise.all([axios.get(roadmapUrl), axios.get(statusesUrl), axios.get(prioritiesUrl), axios.get(componentsUrl), axios.get(typesUrl)]).then(
+      ([roadmap, statuses, priorities, components, ticketTypes]) => {
+        this.milestones =
+          roadmap.data.map((data) => ({
+            label: data.name,
+            value: data.slug,
+          })) ?? []
+
+        const open =
+          statuses.data
+            .filter((status) => status.status === 1)
+            .map((data) => ({
+              label: data.name,
+              value: data.id,
+            })) ?? []
+
+        const closed =
+          statuses.data
+            .filter((status) => status.status === 0)
+            .map((data) => ({
+              label: data.name,
+              value: data.id,
+            })) ?? []
+
+        this.statuses = {
+          Open: open,
+          Closed: closed,
+        }
+
+        this.priorities =
+          priorities.data.map((data) => ({
+            label: data.name,
+            value: data.id,
+          })) ?? []
+
+        this.components =
+          components.data.map((data) => ({
+            label: data.name,
+            value: data.id,
+          })) ?? []
+
+        this.types =
+          ticketTypes.data.map((data) => ({
+            label: data.name,
+            value: data.id,
+          })) ?? []
+      }
+    )
+  },
+
+  computed: {
+    canMassActions(): boolean {
+      return this.auth.canOneOf([
+        "ticket_properties_change_status",
+        "ticket_properties_change_type",
+        "ticket_properties_change_priority",
+        "ticket_properties_change_milestone",
+        "ticket_properties_change_assigned_to",
+      ])
+    },
+  },
 }
 </script>
 
 <template>
-  <div v-if="ticketIds.length">
-    <h2>Mass Actions</h2>
+  <div class="mass-actions-container" v-if="canMassActions">
+    <h2>
+      Mass Actions <small>({{ ticketIds.length }} tickets)</small>
+    </h2>
+
+    <div class="mass-actions-panel">
+      <div class="mass-actions-fields">
+        <div class="mass-actions-field" v-if="auth.can('ticket_properties_change_status')">
+          <label for="">Status</label>
+          <select name="status">
+            <option value="-1">No change</option>
+            <optgroup v-for="statusGroup in Object.keys(statuses)" :key="statusGroup" :label="statusGroup">
+              <option v-for="status in statuses[statusGroup]" :value="status.id" :key="status.id">
+                {{ status.label }}
+              </option>
+            </optgroup>
+          </select>
+        </div>
+
+        <div class="mass-actions-field" v-if="auth.can('ticket_properties_change_type')">
+          <label for="">Type</label>
+          <select name="type">
+            <option value="-1">No change</option>
+            <option v-for="ticketType in types" :value="ticketType.id" :key="ticketType.id">
+              {{ ticketType.label }}
+            </option>
+          </select>
+        </div>
+
+        <div class="mass-actions-field" v-if="auth.can('ticket_properties_change_priority')">
+          <label for="">Priority</label>
+          <select name="priority">
+            <option value="-1">No change</option>
+            <option v-for="priority in priorities" :value="priority.id" :key="priority.id">
+              {{ priority.label }}
+            </option>
+          </select>
+        </div>
+
+        <div class="mass-actions-field" v-if="auth.can('ticket_properties_change_milestone')">
+          <label for="">Milestone</label>
+          <select name="milestone">
+            <option value="-1">No change</option>
+            <option v-for="milestone in milestones" :value="milestone.id" :key="milestone.id">
+              {{ milestone.label }}
+            </option>
+          </select>
+        </div>
+
+        <div class="mass-actions-field" v-if="auth.can('ticket_properties_change_assigned_to')">
+          <label for="">Assignee</label>
+          <select name="assigned_to">
+            <option value="-1">No change</option>
+            <option value="0">None</option>
+            <option v-for="assignee in assignees" :value="ticketType.id" :key="assignee.id">
+              {{ assignee.label }}
+            </option>
+          </select>
+        </div>
+      </div>
+      <div class="mass-actions-footer">
+        <button class="btn-primary">Update</button>
+      </div>
+    </div>
   </div>
 </template>
 
-<style lang="postcss"></style>
+<style scoped lang="postcss">
+@import "../css/forms.css";
+
+.mass-actions-container {
+  @apply my-5;
+
+  & > h2 {
+    @apply text-lg;
+
+    & > small {
+      @apply text-sm;
+    }
+  }
+
+  & .mass-actions-panel {
+    @apply rounded;
+    @apply bg-gray-50;
+
+    & .mass-actions-fields {
+      display: flex;
+      flex-wrap: wrap;
+      flex-direction: row;
+
+      @apply p-4;
+      @apply bg-gray-100;
+      @apply rounded;
+    }
+
+    & .mass-actions-field {
+      --mass-action-field-width: 305px;
+
+      display: flex;
+      align-items: center;
+      min-width: var(--mass-action-field-width);
+      max-width: var(--mass-action-field-width);
+
+      & > label {
+        min-width: 60px;
+        text-align: right;
+        min-width: calc(var(--mass-action-field-width) / 3);
+        max-width: calc(var(--mass-action-field-width) / 3);
+        box-sizing: border-box;
+
+        @apply pr-2;
+      }
+
+      & > select {
+        min-width: calc(var(--mass-action-field-width) / 1.5);
+        max-width: calc(var(--mass-action-field-width) / 1.5);
+      }
+    }
+
+    & .mass-actions-footer {
+      @apply p-2;
+      @apply rounded-b;
+
+      display: flex;
+      justify-content: center;
+    }
+  }
+}
+</style>

From aa78f492f2109c113d5e6dca49be904ea5b2ddc8 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sun, 3 Jul 2022 19:55:03 +1000
Subject: [PATCH 37/46] Add Type filter

---
 traq-ui/ticket-listing/TicketFilters.vue | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/traq-ui/ticket-listing/TicketFilters.vue b/traq-ui/ticket-listing/TicketFilters.vue
index f0ff38437..cc77cdd2d 100644
--- a/traq-ui/ticket-listing/TicketFilters.vue
+++ b/traq-ui/ticket-listing/TicketFilters.vue
@@ -25,6 +25,7 @@ export default {
         components: [],
         statuses: [],
         priorities: [],
+        types: [],
       },
       availableFilters: [
         {
@@ -37,6 +38,12 @@ export default {
           label: "Description",
           type: "contains",
         },
+        {
+          field: "type",
+          label: "Type",
+          type: "is",
+          dataSet: "types",
+        },
         {
           field: "owner",
           label: "Owner",
@@ -82,13 +89,14 @@ export default {
   },
 
   mounted() {
-    const roadmapUrl = window.traq.base + window.traq.project_slug + "/roadmap.json"
+    const roadmapUrl = window.traq.base + window.traq.project_slug + "/roadmap/all.json"
     const componentsUrl = window.traq.base + "api/" + window.traq.project_slug + "/components"
     const statusesUrl = window.traq.base + "api/statuses"
     const prioritiesUrl = window.traq.base + "api/priorities"
+    const typesUrl = window.traq.base + "api/types"
 
-    Promise.all([axios.get(roadmapUrl), axios.get(statusesUrl), axios.get(prioritiesUrl), axios.get(componentsUrl)]).then(
-      ([roadmap, statuses, priorities, components]) => {
+    Promise.all([axios.get(roadmapUrl), axios.get(statusesUrl), axios.get(prioritiesUrl), axios.get(componentsUrl), axios.get(typesUrl)]).then(
+      ([roadmap, statuses, priorities, components, ticketTypes]) => {
         this.filterData.milestones =
           roadmap.data.map((data) => ({
             label: data.name,
@@ -128,6 +136,12 @@ export default {
             value: data.name,
           })) ?? []
 
+        this.filterData.types =
+          ticketTypes.data.map((data) => ({
+            label: data.name,
+            value: data.name,
+          })) ?? []
+
         // Convert query string after we get statuses, as we convert 'allOpen' and 'allClosed'
         this.buildCustomFields().then(() => this.convertQueryString())
       }

From c6dc17e449fb2e370e4b51e0cd2b5d27034d916e Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sun, 3 Jul 2022 23:29:17 +1000
Subject: [PATCH 38/46] Update Avalon

---
 vendor/avalon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/avalon b/vendor/avalon
index 5b53b2498..85e862a1d 160000
--- a/vendor/avalon
+++ b/vendor/avalon
@@ -1 +1 @@
-Subproject commit 5b53b249886531801197b7e915deaa5fef420f17
+Subproject commit 85e862a1de45cfc90f71ada3c982160b22d4d9a8

From 024f6be7264505bf84203cb0c1eebcf49d6ae92e Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sun, 3 Jul 2022 23:30:09 +1000
Subject: [PATCH 39/46] Add project members endpoint

---
 traq-ui/ticket-listing/MassActions.vue   | 119 +++++++++++++----------
 traq-ui/ticket-listing/TicketFilters.vue |  99 +++++++++++--------
 2 files changed, 124 insertions(+), 94 deletions(-)

diff --git a/traq-ui/ticket-listing/MassActions.vue b/traq-ui/ticket-listing/MassActions.vue
index b47be4ddb..dfa9f2f17 100644
--- a/traq-ui/ticket-listing/MassActions.vue
+++ b/traq-ui/ticket-listing/MassActions.vue
@@ -21,64 +21,81 @@ export default {
       priorities: [],
       assignees: [],
       statuses: [],
+      status: -1,
+      type: -1,
+      priority: -1,
+      milestone: -1,
+      assignee: -1,
     }
   },
 
   mounted() {
     const roadmapUrl = window.traq.base + window.traq.project_slug + "/roadmap.json"
     const componentsUrl = window.traq.base + "api/" + window.traq.project_slug + "/components"
+    const membersUrl = window.traq.base + "api/" + window.traq.project_slug + "/members"
     const statusesUrl = window.traq.base + "api/statuses"
     const prioritiesUrl = window.traq.base + "api/priorities"
     const typesUrl = window.traq.base + "api/types"
 
-    Promise.all([axios.get(roadmapUrl), axios.get(statusesUrl), axios.get(prioritiesUrl), axios.get(componentsUrl), axios.get(typesUrl)]).then(
-      ([roadmap, statuses, priorities, components, ticketTypes]) => {
-        this.milestones =
-          roadmap.data.map((data) => ({
-            label: data.name,
-            value: data.slug,
-          })) ?? []
-
-        const open =
-          statuses.data
-            .filter((status) => status.status === 1)
-            .map((data) => ({
-              label: data.name,
-              value: data.id,
-            })) ?? []
-
-        const closed =
-          statuses.data
-            .filter((status) => status.status === 0)
-            .map((data) => ({
-              label: data.name,
-              value: data.id,
-            })) ?? []
-
-        this.statuses = {
-          Open: open,
-          Closed: closed,
-        }
-
-        this.priorities =
-          priorities.data.map((data) => ({
+    Promise.all([
+      axios.get(roadmapUrl),
+      axios.get(statusesUrl),
+      axios.get(prioritiesUrl),
+      axios.get(componentsUrl),
+      axios.get(typesUrl),
+      axios.get(membersUrl),
+    ]).then(([roadmap, statuses, priorities, components, ticketTypes, members]) => {
+      this.milestones =
+        roadmap.data.map((data) => ({
+          label: data.name,
+          value: data.id,
+        })) ?? []
+
+      const open =
+        statuses.data
+          .filter((status) => status.status === 1)
+          .map((data) => ({
             label: data.name,
             value: data.id,
           })) ?? []
 
-        this.components =
-          components.data.map((data) => ({
+      const closed =
+        statuses.data
+          .filter((status) => status.status === 0)
+          .map((data) => ({
             label: data.name,
             value: data.id,
           })) ?? []
 
-        this.types =
-          ticketTypes.data.map((data) => ({
-            label: data.name,
-            value: data.id,
-          })) ?? []
+      this.statuses = {
+        Open: open,
+        Closed: closed,
       }
-    )
+
+      this.priorities =
+        priorities.data.map((data) => ({
+          label: data.name,
+          value: data.id,
+        })) ?? []
+
+      this.components =
+        components.data.map((data) => ({
+          label: data.name,
+          value: data.id,
+        })) ?? []
+
+      this.types =
+        ticketTypes.data.map((data) => ({
+          label: data.name,
+          value: data.id,
+        })) ?? []
+
+      this.assignees =
+        members.data.map((data) => ({
+          label: data.name,
+          value: data.id,
+        })) ?? []
+    })
   },
 
   computed: {
@@ -96,7 +113,7 @@ export default {
 </script>
 
 <template>
-  <div class="mass-actions-container" v-if="canMassActions">
+  <div class="mass-actions-container" v-if="canMassActions && ticketIds.length">
     <h2>
       Mass Actions <small>({{ ticketIds.length }} tickets)</small>
     </h2>
@@ -105,10 +122,10 @@ export default {
       <div class="mass-actions-fields">
         <div class="mass-actions-field" v-if="auth.can('ticket_properties_change_status')">
           <label for="">Status</label>
-          <select name="status">
+          <select name="status" v-model="status">
             <option value="-1">No change</option>
             <optgroup v-for="statusGroup in Object.keys(statuses)" :key="statusGroup" :label="statusGroup">
-              <option v-for="status in statuses[statusGroup]" :value="status.id" :key="status.id">
+              <option v-for="status in statuses[statusGroup]" :value="status.value" :key="status.value">
                 {{ status.label }}
               </option>
             </optgroup>
@@ -117,9 +134,9 @@ export default {
 
         <div class="mass-actions-field" v-if="auth.can('ticket_properties_change_type')">
           <label for="">Type</label>
-          <select name="type">
+          <select name="type" v-model="type">
             <option value="-1">No change</option>
-            <option v-for="ticketType in types" :value="ticketType.id" :key="ticketType.id">
+            <option v-for="ticketType in types" :value="ticketType.value" :key="ticketType.value">
               {{ ticketType.label }}
             </option>
           </select>
@@ -127,9 +144,9 @@ export default {
 
         <div class="mass-actions-field" v-if="auth.can('ticket_properties_change_priority')">
           <label for="">Priority</label>
-          <select name="priority">
+          <select name="priority" v-model="priority">
             <option value="-1">No change</option>
-            <option v-for="priority in priorities" :value="priority.id" :key="priority.id">
+            <option v-for="priority in priorities" :value="priority.value" :key="priority.value">
               {{ priority.label }}
             </option>
           </select>
@@ -137,9 +154,9 @@ export default {
 
         <div class="mass-actions-field" v-if="auth.can('ticket_properties_change_milestone')">
           <label for="">Milestone</label>
-          <select name="milestone">
+          <select name="milestone" v-model="milestone">
             <option value="-1">No change</option>
-            <option v-for="milestone in milestones" :value="milestone.id" :key="milestone.id">
+            <option v-for="milestone in milestones" :value="milestone.value" :key="milestone.value">
               {{ milestone.label }}
             </option>
           </select>
@@ -147,10 +164,10 @@ export default {
 
         <div class="mass-actions-field" v-if="auth.can('ticket_properties_change_assigned_to')">
           <label for="">Assignee</label>
-          <select name="assigned_to">
+          <select name="assigned_to" v-model="assignee">
             <option value="-1">No change</option>
             <option value="0">None</option>
-            <option v-for="assignee in assignees" :value="ticketType.id" :key="assignee.id">
+            <option v-for="assignee in assignees" :value="assignee.value" :key="assignee.value">
               {{ assignee.label }}
             </option>
           </select>
@@ -167,7 +184,7 @@ export default {
 @import "../css/forms.css";
 
 .mass-actions-container {
-  @apply my-5;
+  @apply mt-5;
 
   & > h2 {
     @apply text-lg;
diff --git a/traq-ui/ticket-listing/TicketFilters.vue b/traq-ui/ticket-listing/TicketFilters.vue
index cc77cdd2d..eac2b1c98 100644
--- a/traq-ui/ticket-listing/TicketFilters.vue
+++ b/traq-ui/ticket-listing/TicketFilters.vue
@@ -52,7 +52,8 @@ export default {
         {
           field: "assigned_to",
           label: "Assigned to",
-          type: "isOr",
+          type: "is",
+          dataSet: "assignees",
         },
         {
           field: "component",
@@ -91,61 +92,73 @@ export default {
   mounted() {
     const roadmapUrl = window.traq.base + window.traq.project_slug + "/roadmap/all.json"
     const componentsUrl = window.traq.base + "api/" + window.traq.project_slug + "/components"
+    const membersUrl = window.traq.base + "api/" + window.traq.project_slug + "/members"
     const statusesUrl = window.traq.base + "api/statuses"
     const prioritiesUrl = window.traq.base + "api/priorities"
     const typesUrl = window.traq.base + "api/types"
 
-    Promise.all([axios.get(roadmapUrl), axios.get(statusesUrl), axios.get(prioritiesUrl), axios.get(componentsUrl), axios.get(typesUrl)]).then(
-      ([roadmap, statuses, priorities, components, ticketTypes]) => {
-        this.filterData.milestones =
-          roadmap.data.map((data) => ({
-            label: data.name,
-            value: data.slug,
-          })) ?? []
-
-        const open =
-          statuses.data
-            .filter((status) => status.status === 1)
-            .map((data) => ({
-              label: data.name,
-              value: data.name,
-            })) ?? []
-
-        const closed =
-          statuses.data
-            .filter((status) => status.status === 0)
-            .map((data) => ({
-              label: data.name,
-              value: data.name,
-            })) ?? []
-
-        this.filterData.statuses = {
-          Open: open,
-          Closed: closed,
-        }
-
-        this.filterData.priorities =
-          priorities.data.map((data) => ({
-            label: data.name,
-            value: data.name,
-          })) ?? []
-
-        this.filterData.components =
-          components.data.map((data) => ({
+    Promise.all([
+      axios.get(roadmapUrl),
+      axios.get(statusesUrl),
+      axios.get(prioritiesUrl),
+      axios.get(componentsUrl),
+      axios.get(typesUrl),
+      axios.get(membersUrl),
+    ]).then(([roadmap, statuses, priorities, components, ticketTypes, members]) => {
+      this.filterData.milestones =
+        roadmap.data.map((data) => ({
+          label: data.name,
+          value: data.slug,
+        })) ?? []
+
+      const open =
+        statuses.data
+          .filter((status) => status.status === 1)
+          .map((data) => ({
             label: data.name,
             value: data.name,
           })) ?? []
 
-        this.filterData.types =
-          ticketTypes.data.map((data) => ({
+      const closed =
+        statuses.data
+          .filter((status) => status.status === 0)
+          .map((data) => ({
             label: data.name,
             value: data.name,
           })) ?? []
 
-        // Convert query string after we get statuses, as we convert 'allOpen' and 'allClosed'
-        this.buildCustomFields().then(() => this.convertQueryString())
+      this.filterData.statuses = {
+        Open: open,
+        Closed: closed,
       }
-    )
+
+      this.filterData.priorities =
+        priorities.data.map((data) => ({
+          label: data.name,
+          value: data.name,
+        })) ?? []
+
+      this.filterData.components =
+        components.data.map((data) => ({
+          label: data.name,
+          value: data.name,
+        })) ?? []
+
+      this.filterData.types =
+        ticketTypes.data.map((data) => ({
+          label: data.name,
+          value: data.name,
+        })) ?? []
+
+      this.filterData.assignees =
+        members.data.map((data) => ({
+          label: data.name,
+          value: data.username,
+        })) ?? []
+
+      // Convert query string after we get statuses, as we convert 'allOpen' and 'allClosed'
+      this.buildCustomFields().then(() => this.convertQueryString())
+    })
   },
 
   watch: {

From ca9a4463c62cb1699df407196505c74ef1230b7b Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sun, 3 Jul 2022 23:30:22 +1000
Subject: [PATCH 40/46] Update styling along with custom checkbox

---
 traq-ui/css/content.css                  |  1 +
 traq-ui/css/forms.css                    | 17 +++++++++++++++++
 traq-ui/ticket-listing/TicketListing.vue |  2 ++
 3 files changed, 20 insertions(+)

diff --git a/traq-ui/css/content.css b/traq-ui/css/content.css
index 1c66fd05f..943e1f061 100644
--- a/traq-ui/css/content.css
+++ b/traq-ui/css/content.css
@@ -13,6 +13,7 @@ body {
   @apply bg-white;
   @apply text-black;
   @apply shadow-sm;
+  @apply pb-2;
 }
 
 .content {
diff --git a/traq-ui/css/forms.css b/traq-ui/css/forms.css
index c8d1db1f7..8c6827b7e 100644
--- a/traq-ui/css/forms.css
+++ b/traq-ui/css/forms.css
@@ -28,3 +28,20 @@ select:not([multiple]) {
   background-size: 10px;
   background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.1.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M224 416c-8.188 0-16.38-3.125-22.62-9.375l-192-192c-12.5-12.5-12.5-32.75 0-45.25s32.75-12.5 45.25 0L224 338.8l169.4-169.4c12.5-12.5 32.75-12.5 45.25 0s12.5 32.75 0 45.25l-192 192C240.4 412.9 232.2 416 224 416z"/></svg>');
 }
+
+input[type="checkbox"] {
+  appearance: none;
+  background-repeat: no-repeat;
+  background-position: center 3px;
+  background-size: 10px;
+
+  @apply p-2;
+  @apply bg-gray-50 active:bg-gray-200;
+  @apply border border-solid border-gray-400 focus:border-brand-600 rounded;
+  @apply ring-0 focus:ring-4 focus:ring-brand-100;
+  @apply transition-all;
+
+  &:checked {
+    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.1.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M438.6 105.4C451.1 117.9 451.1 138.1 438.6 150.6L182.6 406.6C170.1 419.1 149.9 419.1 137.4 406.6L9.372 278.6C-3.124 266.1-3.124 245.9 9.372 233.4C21.87 220.9 42.13 220.9 54.63 233.4L159.1 338.7L393.4 105.4C405.9 92.88 426.1 92.88 438.6 105.4H438.6z"/></svg>');
+  }
+}
diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
index 23c48a57b..2c92730c3 100644
--- a/traq-ui/ticket-listing/TicketListing.vue
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -270,6 +270,8 @@ export default {
 </template>
 
 <style scoped lang="postcss">
+@import "../css/forms.css";
+
 table.ticket-listing {
   & th {
     & > svg {

From 9b0fdb53108925953f67a8398187d5bf346ea22f Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Sun, 3 Jul 2022 23:30:44 +1000
Subject: [PATCH 41/46] Implement backend project members endpoint

---
 vendor/traq/config/routes.php   |  1 +
 vendor/traq/controllers/api.php | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/vendor/traq/config/routes.php b/vendor/traq/config/routes.php
index 40f26b112..ad88eb94a 100644
--- a/vendor/traq/config/routes.php
+++ b/vendor/traq/config/routes.php
@@ -40,6 +40,7 @@
 Router::add('/api/priorities', 'traq::controllers::API.priorities');
 Router::add('/api/'.PROJECT_SLUG.'/components', 'traq::controllers::API.components');
 Router::add('/api/'.PROJECT_SLUG.'/custom-fields', 'traq::controllers::API.customFields');
+Router::add('/api/'.PROJECT_SLUG.'/members', 'traq::controllers::API.projectMembers');
 
 // Misc
 Router::add('/_js(?:.js)?', 'traq::controllers::Misc.javascript');
diff --git a/vendor/traq/controllers/api.php b/vendor/traq/controllers/api.php
index c4526c698..598771f2c 100644
--- a/vendor/traq/controllers/api.php
+++ b/vendor/traq/controllers/api.php
@@ -97,6 +97,26 @@ public function action_customFields()
         Body::append(to_json($this->project->custom_fields->exec()->fetch_all()));
     }
 
+    /**
+     * Project members.
+     */
+    public function action_projectMembers()
+    {
+        $members = array_map(
+            function ($userRole) {
+                return [
+                    'id' => $userRole->user->id,
+                    'username' => $userRole->user->username,
+                    'name' => $userRole->user->name,
+                    'role' => $userRole->role->name,
+                ];
+            },
+            $this->project->user_roles->exec()->fetch_all()
+        );
+
+        Body::append(to_json($members));
+    }
+
     /**
      * Current authenticated user.
      */

From 92cc280eb58a48a934dfe01c415597c3c32caa31 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Mon, 4 Jul 2022 00:05:21 +1000
Subject: [PATCH 42/46] Cleanup styling

---
 traq-ui/css/buttons.css                  | 8 ++++----
 traq-ui/css/forms.css                    | 4 ++--
 traq-ui/ticket-listing/TicketListing.vue | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/traq-ui/css/buttons.css b/traq-ui/css/buttons.css
index 00765ffce..eb7947a39 100644
--- a/traq-ui/css/buttons.css
+++ b/traq-ui/css/buttons.css
@@ -39,7 +39,7 @@ input[type="reset"] {
   @apply border border-solid rounded;
   @apply bg-gray-200 hover:bg-gray-300 active:bg-gray-400;
   @apply border-gray-200 hover:border-gray-300 active:border-gray-400;
-  @apply ring-0 focus:ring-4 ring-gray-400;
+  @apply focus:ring-4 ring-gray-400/30;
   @apply transition-all;
   @apply cursor-pointer;
   @apply appearance-none;
@@ -58,7 +58,7 @@ input[type="reset"] {
     @apply text-white;
     @apply bg-brand-500 hover:bg-brand-600 active:bg-brand-700;
     @apply border-brand-500 hover:border-brand-600 active:border-brand-700;
-    @apply ring-brand-100;
+    @apply ring-brand-500/30;
 
     &:disabled {
       &,
@@ -73,7 +73,7 @@ input[type="reset"] {
     @apply text-white;
     @apply bg-emerald-500 hover:bg-emerald-600 active:bg-emerald-700;
     @apply border-emerald-500 hover:border-emerald-600 active:border-emerald-700;
-    @apply ring-emerald-200;
+    @apply ring-emerald-500/30;
 
     &:disabled {
       &,
@@ -88,7 +88,7 @@ input[type="reset"] {
     @apply text-white;
     @apply bg-red-500 hover:bg-red-600 active:bg-red-700;
     @apply border-red-500 hover:border-red-600 active:border-red-700;
-    @apply ring-red-200;
+    @apply ring-red-500/30;
 
     &:disabled {
       &,
diff --git a/traq-ui/css/forms.css b/traq-ui/css/forms.css
index 8c6827b7e..b7cb787f7 100644
--- a/traq-ui/css/forms.css
+++ b/traq-ui/css/forms.css
@@ -2,7 +2,7 @@ select,
 input[type="text"],
 input[type="password"] {
   @apply border border-gray-400 focus:border-brand-600 rounded;
-  @apply focus:ring-4 focus:ring-brand-100;
+  @apply focus:ring-4 focus:ring-brand-500/30;
   @apply text-sm text-gray-800;
   @apply py-2 px-3;
   @apply transition-all;
@@ -38,7 +38,7 @@ input[type="checkbox"] {
   @apply p-2;
   @apply bg-gray-50 active:bg-gray-200;
   @apply border border-solid border-gray-400 focus:border-brand-600 rounded;
-  @apply ring-0 focus:ring-4 focus:ring-brand-100;
+  @apply focus:ring-4 focus:ring-brand-500/30;
   @apply transition-all;
 
   &:checked {
diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
index 2c92730c3..294aed8d6 100644
--- a/traq-ui/ticket-listing/TicketListing.vue
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -126,7 +126,7 @@ export default {
   </div>
   <TicketFilters @apply-filters="applyFilters" :custom-fields="customFields" v-if="!isLoading" />
   <TicketColumns @apply-columns="updateColumns" :custom-fields="customFields" v-if="!isLoading" />
-  <table id="tickets" class="ticket-listing list">
+  <table class="ticket-listing">
     <thead>
       <tr>
         <th v-if="auth.can('perform_mass_actions')">

From d3d14a64b6fb6ba6fc900ba53b17403a9f9cd3e2 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Mon, 4 Jul 2022 23:06:08 +1000
Subject: [PATCH 43/46] Implement mass action updating

---
 traq-ui/css/forms.css                      |  4 +--
 traq-ui/ticket-listing/MassActions.vue     | 41 +++++++++++++++++++++-
 traq-ui/ticket-listing/TicketListing.vue   | 32 +++++++++++++++--
 vendor/traq/config/routes.php              |  2 +-
 vendor/traq/controllers/app_controller.php | 17 +++++++++
 vendor/traq/controllers/tickets.php        | 37 ++++++++++++-------
 6 files changed, 114 insertions(+), 19 deletions(-)

diff --git a/traq-ui/css/forms.css b/traq-ui/css/forms.css
index b7cb787f7..0ad98375e 100644
--- a/traq-ui/css/forms.css
+++ b/traq-ui/css/forms.css
@@ -2,7 +2,7 @@ select,
 input[type="text"],
 input[type="password"] {
   @apply border border-gray-400 focus:border-brand-600 rounded;
-  @apply focus:ring-4 focus:ring-brand-500/30;
+  @apply focus:ring-4 focus:ring-brand-500/20;
   @apply text-sm text-gray-800;
   @apply py-2 px-3;
   @apply transition-all;
@@ -38,7 +38,7 @@ input[type="checkbox"] {
   @apply p-2;
   @apply bg-gray-50 active:bg-gray-200;
   @apply border border-solid border-gray-400 focus:border-brand-600 rounded;
-  @apply focus:ring-4 focus:ring-brand-500/30;
+  @apply focus:ring-4 focus:ring-brand-500/20;
   @apply transition-all;
 
   &:checked {
diff --git a/traq-ui/ticket-listing/MassActions.vue b/traq-ui/ticket-listing/MassActions.vue
index dfa9f2f17..909b2b46c 100644
--- a/traq-ui/ticket-listing/MassActions.vue
+++ b/traq-ui/ticket-listing/MassActions.vue
@@ -25,6 +25,7 @@ export default {
       type: -1,
       priority: -1,
       milestone: -1,
+      component: -1,
       assignee: -1,
     }
   },
@@ -109,6 +110,34 @@ export default {
       ])
     },
   },
+
+  methods: {
+    updateTickets(): void {
+      const massActionsUrl = `${window.traq.base}${window.traq.project_slug}/tickets/mass-actions.json`
+
+      const formData = new FormData()
+      this.ticketIds.map((ticketId) => {
+        formData.append("tickets[]", ticketId)
+      })
+      formData.append("status", this.status)
+      formData.append("type", this.type)
+      formData.append("priority", this.priority)
+      formData.append("milestone", this.milestone)
+      formData.append("component", this.component)
+      formData.append("assigned_to", this.assignee)
+
+      axios
+        .post(massActionsUrl, formData, {
+          headers: {
+            "Content-Type": "multipart/form-data",
+          },
+        })
+        .then((resp) => {
+          console.log(resp.data)
+          this.$emit("on-update", resp.data)
+        })
+    },
+  },
 }
 </script>
 
@@ -162,6 +191,16 @@ export default {
           </select>
         </div>
 
+        <div class="mass-actions-field" v-if="auth.can('ticket_properties_change_component')">
+          <label for="">Component</label>
+          <select name="component" v-model="component">
+            <option value="-1">No change</option>
+            <option v-for="component in components" :value="component.value" :key="component.value">
+              {{ component.label }}
+            </option>
+          </select>
+        </div>
+
         <div class="mass-actions-field" v-if="auth.can('ticket_properties_change_assigned_to')">
           <label for="">Assignee</label>
           <select name="assigned_to" v-model="assignee">
@@ -174,7 +213,7 @@ export default {
         </div>
       </div>
       <div class="mass-actions-footer">
-        <button class="btn-primary">Update</button>
+        <button class="btn-primary" :onClick="updateTickets">Update</button>
       </div>
     </div>
   </div>
diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
index 294aed8d6..8fcdf086a 100644
--- a/traq-ui/ticket-listing/TicketListing.vue
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -116,6 +116,26 @@ export default {
         this.checkedTickets.push(ticketId)
       }
     },
+    massActionsTogglePage(event): void {
+      const ticketIds: number[] = this.tickets.map((ticket) => ticket.ticket_id)
+
+      if (event.target.checked) {
+        // If checked, add (missing) ticket ids to checked list
+        const missingIds = ticketIds.filter((ticketId) => !this.checkedTickets.includes(ticketId))
+        this.checkedTickets = [...this.checkedTickets, ...missingIds]
+      } else {
+        // If unchecked, remove ticket ids
+        this.checkedTickets = this.checkedTickets.filter((ticketId) => !ticketIds.includes(ticketId))
+      }
+    },
+    massActionsUpdated(): void {
+      this.getTickets()
+      this.checkedTickets = []
+    },
+    changePage(page: number): void {
+      this.page = page
+      this.$refs["massActionsAllToggler"].checked = false
+    },
   },
 }
 </script>
@@ -130,7 +150,7 @@ export default {
     <thead>
       <tr>
         <th v-if="auth.can('perform_mass_actions')">
-          <input type="checkbox" />
+          <input type="checkbox" name="mass_actions_current_page" @click="massActionsTogglePage" ref="massActionsAllToggler" />
         </th>
         <th v-if="columns.includes('ticket_id')">
           <a href="#" @click="sortTickets('ticket_id')">ID</a>
@@ -235,7 +255,13 @@ export default {
       </tr>
       <tr v-for="ticket in tickets" :key="ticket.id" :class="'priority-' + ticket.priority.id">
         <td v-if="auth.can('perform_mass_actions')">
-          <input type="checkbox" @click="toggleTicket(ticket.ticket_id)" :checked="checkedTickets.includes(ticket.ticket_id)" />
+          <input
+            type="checkbox"
+            name="mass_actions[]"
+            :value="ticket.ticket_id"
+            :checked="checkedTickets.includes(ticket.ticket_id)"
+            @click="toggleTicket(ticket.ticket_id)"
+          />
         </td>
         <td v-if="columns.includes('ticket_id')">{{ ticket.ticket_id }}</td>
         <td v-if="columns.includes('summary')">
@@ -266,7 +292,7 @@ export default {
     </thead>
   </table>
 
-  <MassActions :ticket-ids="checkedTickets" v-if="auth.can('perform_mass_actions')" />
+  <MassActions :ticket-ids="checkedTickets" v-if="auth.can('perform_mass_actions')" @on-update="massActionsUpdated" />
 </template>
 
 <style scoped lang="postcss">
diff --git a/vendor/traq/config/routes.php b/vendor/traq/config/routes.php
index ad88eb94a..9c7bc5b67 100644
--- a/vendor/traq/config/routes.php
+++ b/vendor/traq/config/routes.php
@@ -73,7 +73,7 @@
 Router::add('/' . PROJECT_SLUG . '/tickets/(?P<ticket_id>[0-9]+)/history/([0-9]+)/delete', 'traq::controllers::TicketHistory.delete/$3');
 Router::add('/' . PROJECT_SLUG . '/tickets/(?P<ticket_id>[0-9]+)/tasks/manage', 'traq::controllers::TicketTasks.manage/$2');
 Router::add('/' . PROJECT_SLUG . '/tickets/(?P<ticket_id>[0-9]+)/tasks/([0-9]+)', 'traq::controllers::TicketTasks.toggle/$2,$3');
-Router::add('/' . PROJECT_SLUG . '/tickets/mass_actions', 'traq::controllers::Tickets.mass_actions');
+Router::add('/' . PROJECT_SLUG . '/tickets/mass-actions', 'traq::controllers::Tickets.mass_actions');
 Router::add('/' . PROJECT_SLUG . '/tickets/update_filters', 'traq::controllers::Tickets.update_filters');
 Router::add('/' . PROJECT_SLUG . '/tickets', 'traq::controllers::Tickets.index');
 
diff --git a/vendor/traq/controllers/app_controller.php b/vendor/traq/controllers/app_controller.php
index 141231ead..97984b05d 100644
--- a/vendor/traq/controllers/app_controller.php
+++ b/vendor/traq/controllers/app_controller.php
@@ -28,6 +28,7 @@
 use avalon\Database;
 use avalon\http\Request;
 use avalon\http\Router;
+use avalon\output\Body;
 use avalon\output\View;
 
 use traq\models\User;
@@ -226,6 +227,22 @@ protected function bad_api_request($message)
         View::set(compact('message'));
     }
 
+    /**
+     * API Response.
+     * 
+     * @param array $data
+     */
+    protected function apiResponse(array $data)
+    {
+        Router::$extension = 'json';
+
+        $this->render['layout'] = false;
+        $this->render['view'] = false;
+
+        header('Content-Type: application/json; charset=UTF-8');
+        Body::append(to_json($data));
+    }
+
     public function __shutdown()
     {
         // Plain layout for JSON and API requests
diff --git a/vendor/traq/controllers/tickets.php b/vendor/traq/controllers/tickets.php
index 192178ef4..deff33e57 100644
--- a/vendor/traq/controllers/tickets.php
+++ b/vendor/traq/controllers/tickets.php
@@ -732,7 +732,9 @@ public function action_mass_actions()
         }
 
         // Decode tickets array
-        $tickets = json_decode(Request::post('tickets'), true);
+        $tickets = is_array(Request::post('tickets'))
+            ? Request::post('tickets')
+            : $json_decode(Request::post('tickets'), true);
 
         // Make sure there are some tickets
         if (!is_array($tickets) and !count($tickets)) {
@@ -742,54 +744,61 @@ public function action_mass_actions()
         // Loop over tickets and process actions
         foreach ($tickets as $ticket_id) {
             $ticket = Ticket::select('*')->where('project_id', $this->project->id)->where('ticket_id', $ticket_id)->exec()->fetch();
-
-            $data = array();
+            $data = [];
 
             // Type
             if ($this->user->permission($this->project->id, 'ticket_properties_change_type')
-            and Request::post('type', -1) != -1) {
+                && Request::post('type', -1) != -1
+            ) {
                 $data['type_id'] = Request::post('type');
             }
 
             // Milestone
             if ($this->user->permission($this->project->id, 'ticket_properties_change_milestone')
-            and Request::post('milestone', -1) != -1) {
+                && Request::post('milestone', -1) != -1
+            ) {
                 $data['milestone_id'] = Request::post('milestone');
             }
 
             // Version
             if ($this->user->permission($this->project->id, 'ticket_properties_change_version')
-            and Request::post('version', -1) != -1) {
+                && Request::post('version', -1) != -1
+            ) {
                 $data['version_id'] = Request::post('version');
             }
 
             // Component
             if ($this->user->permission($this->project->id, 'ticket_properties_change_component')
-            and Request::post('component', -1) != -1) {
+                && Request::post('component', -1) != -1
+            ) {
                 $data['component_id'] = Request::post('component');
             }
 
             // Severity
             if ($this->user->permission($this->project->id, 'ticket_properties_change_severity')
-            and Request::post('severity', -1) != -1) {
+                && Request::post('severity', -1) != -1
+            ) {
                 $data['severity_id'] = Request::post('severity');
             }
 
             // Priority
             if ($this->user->permission($this->project->id, 'ticket_properties_change_priority')
-            and Request::post('priority', -1) != -1) {
+                && Request::post('priority', -1) != -1
+            ) {
                 $data['priority_id'] = Request::post('priority');
             }
 
             // Status
             if ($this->user->permission($this->project->id, 'ticket_properties_change_status')
-            and Request::post('status', -1) != -1) {
+                && Request::post('status', -1) != -1
+            ) {
                 $data['status_id'] = Request::post('status');
             }
 
             // Assigned to
             if ($this->user->permission($this->project->id, 'ticket_properties_change_assigned_to')
-            and Request::post('assigned_to', -1) != -1) {
+                && Request::post('assigned_to', -1) != -1
+            ) {
                 $data['assigned_to_id'] = Request::post('assigned_to');
             }
 
@@ -802,7 +811,11 @@ public function action_mass_actions()
         // Clear selected tickets
         setcookie('selected_tickets', '', time(), '/');
 
-        Request::redirectTo($this->project->href('tickets'));
+        if (Router::$extension === '.json') {
+            $this->apiResponse(['success' => true]);
+        } else {
+            Request::redirectTo($this->project->href('tickets'));
+        }
     }
 
     /**

From 13e68b351cef245be28bf880ae3baa6988d200b7 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Mon, 4 Jul 2022 23:06:23 +1000
Subject: [PATCH 44/46] Add EasyMDE to handle mass actions comment

---
 package.json                           |  1 +
 traq-ui/components/EasyMDE.vue         | 47 +++++++++++++++++++++
 traq-ui/css/main.css                   |  2 +
 traq-ui/ticket-listing/MassActions.vue | 26 ++++--------
 yarn.lock                              | 57 ++++++++++++++++++++++++++
 5 files changed, 116 insertions(+), 17 deletions(-)
 create mode 100644 traq-ui/components/EasyMDE.vue

diff --git a/package.json b/package.json
index 3215ba016..8346c5c7c 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "@fortawesome/free-solid-svg-icons": "^6.1.1",
     "@fortawesome/vue-fontawesome": "^3.0.1",
     "axios": "^0.27.2",
+    "easymde": "^2.16.1",
     "luxon": "^2.4.0",
     "pinia": "^2.0.14",
     "vue": "^3.2.37"
diff --git a/traq-ui/components/EasyMDE.vue b/traq-ui/components/EasyMDE.vue
new file mode 100644
index 000000000..7622c3ec0
--- /dev/null
+++ b/traq-ui/components/EasyMDE.vue
@@ -0,0 +1,47 @@
+<script lang="ts">
+import EasyMDE from "easymde"
+
+export default {
+  props: {
+    modelValue: String,
+    minHeight: String,
+  },
+
+  emits: ["update:modelValue"],
+
+  mounted() {
+    this.easyMDE = new EasyMDE({
+      element: this.$refs["textarea"],
+      status: false,
+      uploadImage: false,
+      minHeight: this.minHeight ?? "500px",
+    })
+
+    this.easyMDE.codemirror.on("change", (instance, changeObj) => {
+      if (changeObj.origin === "setValue") {
+        return
+      }
+
+      this.$emit("update:modelValue", this.easyMDE.value())
+    })
+
+    this.easyMDE.codemirror.on("blue", () => this.$emit("update:modelValue", this.easyMDE.value()))
+  },
+
+  beforeUnmount() {
+    if (!this.easyMDE) {
+      return
+    }
+
+    const isFullScreen = this.easyMDE.codemirror.getOption("fullScreen")
+
+    if (isFullScreen) {
+      this.easyMDE.toggleFullScreen()
+    }
+  },
+}
+</script>
+
+<template>
+  <textarea :name="name" ref="textarea"></textarea>
+</template>
diff --git a/traq-ui/css/main.css b/traq-ui/css/main.css
index b5c61c956..e9d4bf014 100644
--- a/traq-ui/css/main.css
+++ b/traq-ui/css/main.css
@@ -1,3 +1,5 @@
+@import "easymde/dist/easymde.min.css";
+
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
diff --git a/traq-ui/ticket-listing/MassActions.vue b/traq-ui/ticket-listing/MassActions.vue
index 909b2b46c..44d8a8e31 100644
--- a/traq-ui/ticket-listing/MassActions.vue
+++ b/traq-ui/ticket-listing/MassActions.vue
@@ -1,18 +1,17 @@
 <script lang="ts">
 import axios from "axios"
 import { useAuthStore } from "../stores/auth"
+import EasyMDE from "../components/easymde.vue"
 
 export default {
+  components: { EasyMDE },
   props: ["ticketIds"],
-
   setup() {
     const auth = useAuthStore()
-
     return {
       auth,
     }
   },
-
   data() {
     return {
       types: [],
@@ -21,6 +20,7 @@ export default {
       priorities: [],
       assignees: [],
       statuses: [],
+      comment: "",
       status: -1,
       type: -1,
       priority: -1,
@@ -29,7 +29,6 @@ export default {
       assignee: -1,
     }
   },
-
   mounted() {
     const roadmapUrl = window.traq.base + window.traq.project_slug + "/roadmap.json"
     const componentsUrl = window.traq.base + "api/" + window.traq.project_slug + "/components"
@@ -37,7 +36,6 @@ export default {
     const statusesUrl = window.traq.base + "api/statuses"
     const prioritiesUrl = window.traq.base + "api/priorities"
     const typesUrl = window.traq.base + "api/types"
-
     Promise.all([
       axios.get(roadmapUrl),
       axios.get(statusesUrl),
@@ -51,7 +49,6 @@ export default {
           label: data.name,
           value: data.id,
         })) ?? []
-
       const open =
         statuses.data
           .filter((status) => status.status === 1)
@@ -59,7 +56,6 @@ export default {
             label: data.name,
             value: data.id,
           })) ?? []
-
       const closed =
         statuses.data
           .filter((status) => status.status === 0)
@@ -67,30 +63,25 @@ export default {
             label: data.name,
             value: data.id,
           })) ?? []
-
       this.statuses = {
         Open: open,
         Closed: closed,
       }
-
       this.priorities =
         priorities.data.map((data) => ({
           label: data.name,
           value: data.id,
         })) ?? []
-
       this.components =
         components.data.map((data) => ({
           label: data.name,
           value: data.id,
         })) ?? []
-
       this.types =
         ticketTypes.data.map((data) => ({
           label: data.name,
           value: data.id,
         })) ?? []
-
       this.assignees =
         members.data.map((data) => ({
           label: data.name,
@@ -98,7 +89,6 @@ export default {
         })) ?? []
     })
   },
-
   computed: {
     canMassActions(): boolean {
       return this.auth.canOneOf([
@@ -106,26 +96,26 @@ export default {
         "ticket_properties_change_type",
         "ticket_properties_change_priority",
         "ticket_properties_change_milestone",
+        "ticket_properties_change_component",
         "ticket_properties_change_assigned_to",
       ])
     },
   },
-
   methods: {
     updateTickets(): void {
       const massActionsUrl = `${window.traq.base}${window.traq.project_slug}/tickets/mass-actions.json`
-
+      // this.comment = this.easyMDE.value()
       const formData = new FormData()
       this.ticketIds.map((ticketId) => {
         formData.append("tickets[]", ticketId)
       })
+      formData.append("comment", this.comment)
       formData.append("status", this.status)
       formData.append("type", this.type)
       formData.append("priority", this.priority)
       formData.append("milestone", this.milestone)
       formData.append("component", this.component)
       formData.append("assigned_to", this.assignee)
-
       axios
         .post(massActionsUrl, formData, {
           headers: {
@@ -133,7 +123,6 @@ export default {
           },
         })
         .then((resp) => {
-          console.log(resp.data)
           this.$emit("on-update", resp.data)
         })
     },
@@ -148,6 +137,9 @@ export default {
     </h2>
 
     <div class="mass-actions-panel">
+      <div class="mass-actions-comment">
+        <EasyMDE v-model="comment" min-height="100px" />
+      </div>
       <div class="mass-actions-fields">
         <div class="mass-actions-field" v-if="auth.can('ticket_properties_change_status')">
           <label for="">Status</label>
diff --git a/yarn.lock b/yarn.lock
index e3d45ae11..b111dbb80 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -115,6 +115,18 @@
   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.1.tgz#e2c6e73e0bdeb2521d00756d099218e9f5d90a04"
   integrity sha512-/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ==
 
+"@types/codemirror@^5.60.4":
+  version "5.60.5"
+  resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.5.tgz#5b989a3b4bbe657458cf372c92b6bfda6061a2b7"
+  integrity sha512-TiECZmm8St5YxjFUp64LK0c8WU5bxMDt9YaAek1UqUb9swrSCoJhh92fWu1p3mTEqlHjhB5sY7OFBhWroJXZVg==
+  dependencies:
+    "@types/tern" "*"
+
+"@types/estree@*":
+  version "0.0.52"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.52.tgz#7f1f57ad5b741f3d5b210d3b1f145640d89bf8fe"
+  integrity sha512-BZWrtCU0bMVAIliIV+HJO1f1PR41M7NKjfxrFJwwhKI1KwhwOxYw1SXg9ao+CIMt774nFuGiG6eU+udtbEI9oQ==
+
 "@types/jsdom@^16.2.14":
   version "16.2.14"
   resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-16.2.14.tgz#26fe9da6a8870715b154bb84cd3b2e53433d8720"
@@ -129,6 +141,11 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
 
+"@types/marked@^4.0.1":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.3.tgz#2098f4a77adaba9ce881c9e0b6baf29116e5acc4"
+  integrity sha512-HnMWQkLJEf/PnxZIfbm0yGJRRZYYMhb++O9M36UCTA9z53uPvVoSlAwJr3XOpDEryb7Hwl1qAx/MV6YIW1RXxg==
+
 "@types/node@*":
   version "18.0.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a"
@@ -144,6 +161,13 @@
   resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.3.tgz#705bb349e789efa06f43f128cef51240753424cb"
   integrity sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==
 
+"@types/tern@*":
+  version "0.23.4"
+  resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz#03926eb13dbeaf3ae0d390caf706b2643a0127fb"
+  integrity sha512-JAUw1iXGO1qaWwEOzxTKJZ/5JxVeON9kvGZ/osgZaJImBnyjyn0cjovPsf6FNLmyGY8Vw9DoXZCMlfMkMwHRWg==
+  dependencies:
+    "@types/estree" "*"
+
 "@types/tough-cookie@*":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
@@ -639,6 +663,18 @@ check-error@^1.0.2:
   optionalDependencies:
     fsevents "~2.3.2"
 
+codemirror-spell-checker@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e"
+  integrity sha512-2Tl6n0v+GJRsC9K3MLCdLaMOmvWL0uukajNJseorZJsslaxZyZMgENocPU8R0DyoTAiKsyqiemSOZo7kjGV0LQ==
+  dependencies:
+    typo-js "*"
+
+codemirror@^5.63.1:
+  version "5.65.6"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.6.tgz#fc313797331cbeb3bcab0652d1ec9d0f40c23ab5"
+  integrity sha512-zNihMSMoDxK9Gqv9oEyDT8oM51rcRrQ+IEo2zyS48gJByBq5Fj8XuNEguMra+MuIOuh6lkpnLUJeL70DoTt6yw==
+
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -813,6 +849,17 @@ domexception@^4.0.0:
   dependencies:
     webidl-conversions "^7.0.0"
 
+easymde@^2.16.1:
+  version "2.16.1"
+  resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.16.1.tgz#f4c2380312615cb33826f1a1fecfaa4022ff551a"
+  integrity sha512-FihYgjRsKfhGNk89SHSqxKLC4aJ1kfybPWW6iAmtb5GnXu+tnFPSzSaGBmk1RRlCuhFSjhF0SnIMGVPjEzkr6g==
+  dependencies:
+    "@types/codemirror" "^5.60.4"
+    "@types/marked" "^4.0.1"
+    codemirror "^5.63.1"
+    codemirror-spell-checker "1.1.2"
+    marked "^4.0.10"
+
 electron-to-chromium@^1.4.172:
   version "1.4.173"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.173.tgz#48f128dda49cd7f6317e65ac0085bd3a6b9b6e3b"
@@ -1729,6 +1776,11 @@ magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.8"
 
+marked@^4.0.10:
+  version "4.0.17"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.17.tgz#1186193d85bb7882159cdcfc57d1dfccaffb3fe9"
+  integrity sha512-Wfk0ATOK5iPxM4ptrORkFemqroz0ZDxp5MWfYA7H/F+wO17NRWV5Ypxi6p3g2Xmw2bKeiYOl6oVnLHKxBA0VhA==
+
 memorystream@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
@@ -2463,6 +2515,11 @@ typescript@~4.7.4:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
   integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
 
+typo-js@*:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.1.tgz#334a0d8c3f6c56f2f1e15fdf6c31677793cbbe9b"
+  integrity sha512-bTGLjbD3WqZDR3CgEFkyi9Q/SS2oM29ipXrWfDb4M74ea69QwKAECVceYpaBu0GfdnASMg9Qfl67ttB23nePHg==
+
 unbox-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"

From 0703c5291f3a6367b062757292d764b63512fb95 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Mon, 4 Jul 2022 23:13:07 +1000
Subject: [PATCH 45/46] Cleanup

---
 traq-ui/ticket-listing/MassActions.vue   | 20 +++++++++++++++++++-
 traq-ui/ticket-listing/TicketListing.vue |  1 +
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/traq-ui/ticket-listing/MassActions.vue b/traq-ui/ticket-listing/MassActions.vue
index 44d8a8e31..e4e1a1631 100644
--- a/traq-ui/ticket-listing/MassActions.vue
+++ b/traq-ui/ticket-listing/MassActions.vue
@@ -5,13 +5,16 @@ import EasyMDE from "../components/easymde.vue"
 
 export default {
   components: { EasyMDE },
+
   props: ["ticketIds"],
+
   setup() {
     const auth = useAuthStore()
     return {
       auth,
     }
   },
+
   data() {
     return {
       types: [],
@@ -29,6 +32,7 @@ export default {
       assignee: -1,
     }
   },
+
   mounted() {
     const roadmapUrl = window.traq.base + window.traq.project_slug + "/roadmap.json"
     const componentsUrl = window.traq.base + "api/" + window.traq.project_slug + "/components"
@@ -36,6 +40,8 @@ export default {
     const statusesUrl = window.traq.base + "api/statuses"
     const prioritiesUrl = window.traq.base + "api/priorities"
     const typesUrl = window.traq.base + "api/types"
+
+    // Fetch required data
     Promise.all([
       axios.get(roadmapUrl),
       axios.get(statusesUrl),
@@ -49,6 +55,7 @@ export default {
           label: data.name,
           value: data.id,
         })) ?? []
+
       const open =
         statuses.data
           .filter((status) => status.status === 1)
@@ -56,6 +63,7 @@ export default {
             label: data.name,
             value: data.id,
           })) ?? []
+
       const closed =
         statuses.data
           .filter((status) => status.status === 0)
@@ -63,25 +71,30 @@ export default {
             label: data.name,
             value: data.id,
           })) ?? []
+
       this.statuses = {
         Open: open,
         Closed: closed,
       }
+
       this.priorities =
         priorities.data.map((data) => ({
           label: data.name,
           value: data.id,
         })) ?? []
+
       this.components =
         components.data.map((data) => ({
           label: data.name,
           value: data.id,
         })) ?? []
+
       this.types =
         ticketTypes.data.map((data) => ({
           label: data.name,
           value: data.id,
         })) ?? []
+
       this.assignees =
         members.data.map((data) => ({
           label: data.name,
@@ -89,6 +102,7 @@ export default {
         })) ?? []
     })
   },
+
   computed: {
     canMassActions(): boolean {
       return this.auth.canOneOf([
@@ -101,10 +115,12 @@ export default {
       ])
     },
   },
+
   methods: {
     updateTickets(): void {
       const massActionsUrl = `${window.traq.base}${window.traq.project_slug}/tickets/mass-actions.json`
-      // this.comment = this.easyMDE.value()
+
+      // Build form data
       const formData = new FormData()
       this.ticketIds.map((ticketId) => {
         formData.append("tickets[]", ticketId)
@@ -116,6 +132,8 @@ export default {
       formData.append("milestone", this.milestone)
       formData.append("component", this.component)
       formData.append("assigned_to", this.assignee)
+
+      // Update tickets and emit event on completion
       axios
         .post(massActionsUrl, formData, {
           headers: {
diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
index 8fcdf086a..b44abd048 100644
--- a/traq-ui/ticket-listing/TicketListing.vue
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -74,6 +74,7 @@ export default {
       return faChevronDown
     },
   },
+
   methods: {
     getTickets(): void {
       axios.get(this.getTicketUrl).then((resp) => {

From cb8664b6c549b53d6b32a5f50830ecee00f190f8 Mon Sep 17 00:00:00 2001
From: Jack Polgar <hello@jp.id.au>
Date: Mon, 4 Jul 2022 23:56:23 +1000
Subject: [PATCH 46/46] Implement pagination

---
 traq-ui/components/PaginationLinks.vue        | 101 +++++++++++++++
 traq-ui/ticket-listing/TicketListing.vue      | 118 ++++++++++--------
 .../traq/views/default/tickets/index.json.php |   6 +-
 3 files changed, 167 insertions(+), 58 deletions(-)
 create mode 100644 traq-ui/components/PaginationLinks.vue

diff --git a/traq-ui/components/PaginationLinks.vue b/traq-ui/components/PaginationLinks.vue
new file mode 100644
index 000000000..5e057fef7
--- /dev/null
+++ b/traq-ui/components/PaginationLinks.vue
@@ -0,0 +1,101 @@
+<script lang="ts">
+import { faChevronLeft, faChevronRight } from "@fortawesome/free-solid-svg-icons"
+
+export default {
+  props: {
+    currentPage: Number,
+    totalPages: Number,
+  },
+
+  setup() {
+    return {
+      backIcon: faChevronLeft,
+      nextIcon: faChevronRight,
+    }
+  },
+
+  methods: {
+    navigate(page) {
+      this.currentPage
+      this.$emit("navigate", page)
+    },
+  },
+}
+</script>
+
+<template>
+  <div class="pagination">
+    <div class="previous" v-if="currentPage === 1 || totalPages === 0">
+      <fa-icon :icon="backIcon" />
+      <span>Previous</span>
+    </div>
+    <a :href="nextUrl" class="previous" v-if="currentPage > 1" @click="navigate(currentPage - 1)">
+      <fa-icon :icon="backIcon" />
+      <span>Previous</span>
+    </a>
+
+    <div class="pages">{{ totalPages > 0 ? currentPage : 0 }} of {{ totalPages }}</div>
+
+    <div class="next" v-if="currentPage === totalPages || totalPages === 0">
+      <span>Next</span>
+      <fa-icon :icon="nextIcon" />
+    </div>
+    <a :href="nextUrl" class="next" v-if="currentPage < totalPages" @click="navigate(currentPage + 1)">
+      <span>Next</span>
+      <fa-icon :icon="nextIcon" />
+    </a>
+  </div>
+</template>
+
+<style scoped lang="postcss">
+.pagination {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  @apply my-2;
+}
+
+.previous,
+.next {
+  display: flex;
+  align-items: center;
+  line-height: 1.25;
+
+  @apply bg-gray-100 border-gray-100;
+  @apply text-sm;
+  @apply py-2 px-3;
+  @apply border border-solid rounded;
+  @apply transition-all;
+}
+
+.previous {
+  & > span {
+    @apply ml-1;
+  }
+}
+
+.next {
+  & > span {
+    @apply mr-1;
+  }
+}
+
+div.previous,
+div.next {
+  cursor: not-allowed;
+
+  @apply text-gray-500;
+}
+
+a.previous,
+a.next {
+  cursor: pointer;
+  text-decoration: none;
+
+  @apply text-gray-900;
+  @apply bg-gray-200 hover:bg-gray-300 active:bg-gray-400;
+  @apply border-gray-200 hover:border-gray-300 active:border-gray-400;
+  @apply focus:ring-4 ring-gray-400/30;
+}
+</style>
diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
index b44abd048..ac4c398d4 100644
--- a/traq-ui/ticket-listing/TicketListing.vue
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -6,9 +6,10 @@ import TicketFilters from "./TicketFilters.vue"
 import TicketColumns from "./TicketColumns.vue"
 import MassActions from "./MassActions.vue"
 import { useAuthStore } from "../stores/auth"
+import PaginationLinks from "../components/PaginationLinks.vue"
 
 export default {
-  components: { TicketFilters, TicketColumns, MassActions },
+  components: { TicketFilters, TicketColumns, MassActions, PaginationLinks },
 
   setup() {
     const auth = useAuthStore()
@@ -22,10 +23,10 @@ export default {
     return {
       isLoading: true,
       tickets: [],
-      page: 1,
-      total_pages: 1,
-      sort_by: null,
-      sort_order: "desc",
+      currentPage: 1,
+      totalPages: 1,
+      sortBy: null,
+      sortOrder: "desc",
       filters: [],
       columns: ["ticket_id", "summary", "status", "type", "owner", "component", "milestone"],
       customFields: [],
@@ -51,8 +52,8 @@ export default {
       let ticketsUrl = window.traq.base + window.traq.project_slug + "/tickets.json"
 
       // Add sorting options to URL
-      if (this.sort_by) {
-        ticketsUrl = `${ticketsUrl}?order_by=${this.sort_by}.${this.sort_order}`
+      if (this.sortBy) {
+        ticketsUrl = `${ticketsUrl}?order_by=${this.sortBy}.${this.sortOrder}`
       }
 
       // Add filters to URL
@@ -61,7 +62,11 @@ export default {
           return `${filter.field}=` + (filter.condition ? "" : "!") + filter.values.join(",")
         })
 
-        ticketsUrl = ticketsUrl + (this.sort_by ? "&" : "?") + filterBits.join("&")
+        ticketsUrl = ticketsUrl + (this.sortBy ? "&" : "?") + filterBits.join("&")
+      }
+
+      if (this.currentPage > 1) {
+        ticketsUrl = ticketsUrl + (ticketsUrl.includes("?") ? "&" : "?") + `page=${this.currentPage}`
       }
 
       return ticketsUrl
@@ -79,13 +84,13 @@ export default {
     getTickets(): void {
       axios.get(this.getTicketUrl).then((resp) => {
         this.tickets = resp.data.tickets
-        this.page = resp.data.page
-        this.total_pages = resp.data.total_pages
+        this.currentPage = resp.data.page
+        this.totalPages = resp.data.total_pages
       })
     },
     sortTickets(column): void {
-      this.sort_order = column !== this.sort_by || this.sort_order === "desc" ? "asc" : "desc"
-      this.sort_by = column
+      this.sortOrder = column !== this.sortBy || this.sortOrder === "desc" ? "asc" : "desc"
+      this.sortBy = column
       this.getTickets()
       this.updateUrl()
     },
@@ -134,8 +139,10 @@ export default {
       this.checkedTickets = []
     },
     changePage(page: number): void {
-      this.page = page
+      this.currentPage = page
       this.$refs["massActionsAllToggler"].checked = false
+      this.getTickets()
+      this.updateUrl()
     },
   },
 }
@@ -155,101 +162,101 @@ export default {
         </th>
         <th v-if="columns.includes('ticket_id')">
           <a href="#" @click="sortTickets('ticket_id')">ID</a>
-          <template v-if="sort_by === 'ticket_id'">
-            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
-            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          <template v-if="sortBy === 'ticket_id'">
+            <fa-icon :icon="faChevronUp" v-if="sortOrder === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sortOrder === 'desc'" />
           </template>
         </th>
         <th v-if="columns.includes('summary')">
           <a href="#" @click="sortTickets('summary')">Summary</a>
-          <template v-if="sort_by === 'summary'">
-            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
-            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          <template v-if="sortBy === 'summary'">
+            <fa-icon :icon="faChevronUp" v-if="sortOrder === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sortOrder === 'desc'" />
           </template>
         </th>
         <th v-if="columns.includes('status')">
           <a href="#" @click="sortTickets('status')">Status</a>
-          <template v-if="sort_by === 'status'">
-            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
-            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          <template v-if="sortBy === 'status'">
+            <fa-icon :icon="faChevronUp" v-if="sortOrder === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sortOrder === 'desc'" />
           </template>
         </th>
         <th v-if="columns.includes('owner')">
           <a href="#" @click="sortTickets('user')">Owner</a>
-          <template v-if="sort_by === 'user'">
-            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
-            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          <template v-if="sortBy === 'user'">
+            <fa-icon :icon="faChevronUp" v-if="sortOrder === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sortOrder === 'desc'" />
           </template>
         </th>
         <th v-if="columns.includes('type')">
           <a href="#" @click="sortTickets('type')">Type</a>
-          <template v-if="sort_by === 'type'">
-            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
-            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          <template v-if="sortBy === 'type'">
+            <fa-icon :icon="faChevronUp" v-if="sortOrder === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sortOrder === 'desc'" />
           </template>
         </th>
         <th v-if="columns.includes('component')">
           <a href="#" @click="sortTickets('component')">Component</a>
-          <template v-if="sort_by === 'component'">
-            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
-            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          <template v-if="sortBy === 'component'">
+            <fa-icon :icon="faChevronUp" v-if="sortOrder === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sortOrder === 'desc'" />
           </template>
         </th>
         <th v-if="columns.includes('milestone')">
           <a href="#" @click="sortTickets('milestone')">Milestone</a>
-          <template v-if="sort_by === 'milestone'">
-            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
-            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          <template v-if="sortBy === 'milestone'">
+            <fa-icon :icon="faChevronUp" v-if="sortOrder === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sortOrder === 'desc'" />
           </template>
         </th>
         <th v-if="columns.includes('assigned_to')">
           <a href="#" @click="sortTickets('assigned_to')">Assignee</a>
-          <template v-if="sort_by === 'assigned_to'">
-            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
-            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          <template v-if="sortBy === 'assigned_to'">
+            <fa-icon :icon="faChevronUp" v-if="sortOrder === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sortOrder === 'desc'" />
           </template>
         </th>
         <th v-if="columns.includes('priority')">
           <a href="#" @click="sortTickets('priority')">Priority</a>
-          <template v-if="sort_by === 'priority'">
-            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
-            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          <template v-if="sortBy === 'priority'">
+            <fa-icon :icon="faChevronUp" v-if="sortOrder === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sortOrder === 'desc'" />
           </template>
         </th>
         <th v-if="columns.includes('severity')">
           <a href="#" @click="sortTickets('severity')">Severity</a>
-          <template v-if="sort_by === 'severity'">
-            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
-            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          <template v-if="sortBy === 'severity'">
+            <fa-icon :icon="faChevronUp" v-if="sortOrder === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sortOrder === 'desc'" />
           </template>
         </th>
         <th v-if="columns.includes('created_at')">
           <a href="#" @click="sortTickets('created_at')">Reported</a>
-          <template v-if="sort_by === 'created_at'">
-            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
-            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          <template v-if="sortBy === 'created_at'">
+            <fa-icon :icon="faChevronUp" v-if="sortOrder === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sortOrder === 'desc'" />
           </template>
         </th>
         <th v-if="columns.includes('updated_at')">
           <a href="#" @click="sortTickets('updated_at')">Updated</a>
-          <template v-if="sort_by === 'updated_at'">
-            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
-            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          <template v-if="sortBy === 'updated_at'">
+            <fa-icon :icon="faChevronUp" v-if="sortOrder === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sortOrder === 'desc'" />
           </template>
         </th>
         <th v-if="columns.includes('votes')">
           <a href="#" @click="sortTickets('votes')">Votes</a>
-          <template v-if="sort_by === 'votes'">
-            <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
-            <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+          <template v-if="sortBy === 'votes'">
+            <fa-icon :icon="faChevronUp" v-if="sortOrder === 'asc'" />
+            <fa-icon :icon="faChevronDown" v-if="sortOrder === 'desc'" />
           </template>
         </th>
         <template v-for="field in customFields" :key="field.slug">
           <th v-if="columns.includes(field.slug)">
             <a href="#" @click="sortTickets(field.slug)">{{ field.name }}</a>
-            <template v-if="sort_by === field.slug">
-              <fa-icon :icon="faChevronUp" v-if="sort_order === 'asc'" />
-              <fa-icon :icon="faChevronDown" v-if="sort_order === 'desc'" />
+            <template v-if="sortBy === field.slug">
+              <fa-icon :icon="faChevronUp" v-if="sortOrder === 'asc'" />
+              <fa-icon :icon="faChevronDown" v-if="sortOrder === 'desc'" />
             </template>
           </th>
         </template>
@@ -292,6 +299,7 @@ export default {
       </tr>
     </thead>
   </table>
+  <PaginationLinks :current-page="currentPage" :total-pages="totalPages" @navigate="changePage" />
 
   <MassActions :ticket-ids="checkedTickets" v-if="auth.can('perform_mass_actions')" @on-update="massActionsUpdated" />
 </template>
diff --git a/vendor/traq/views/default/tickets/index.json.php b/vendor/traq/views/default/tickets/index.json.php
index 3750f1972..ef411b35e 100644
--- a/vendor/traq/views/default/tickets/index.json.php
+++ b/vendor/traq/views/default/tickets/index.json.php
@@ -1,5 +1,5 @@
 <?php echo to_json([
-  'page' => $pagination->page,
-  'total_pages' => $pagination->total_pages,
+  'page' => (int) ($pagination->total_pages > 0 ? $pagination->page : 1),
+  'total_pages' => (int) $pagination->total_pages,
   'tickets' => $tickets,
-]); ?>
\ No newline at end of file
+]);
\ No newline at end of file