Commit Graph

Select branches

Hide Pull Requests

PSSC-Values

asset_fixes

assets

assets-testing

assets_audit

assets_cabletypes

assets_embed

assets_legacy

assets_misc

assets_reversion

auth_fixes

bs4

bugfix-datetime-field-testing

checkin

combine-prs-branch

combine-prs-branch1

data-ingest

dependabot/npm_and_yarn/eazy-logger-4.1.0

dependabot/npm_and_yarn/multi-c22e25d29b

dependabot/pip/zipp-3.19.1

dependabot/uv/urllib3-2.6.3

django2

django5

embed_improvements

estates-compliance

feature/builds

feature/discourse-auth

feature/discourse-auth-app

feature/ember

feature/invoice-query

feature/invoiceHistory

feature/subhire

forms

heroku-upgrade

hotfix-disable-password-reset

hotfix/formatting

hotfix/ical

hotfix/su-branding

imgbot

master

misc

open

optimisation

python_deps_2020

requires-io-master

revert-594-jb3/features/power-test-export

risk-assessment

search

subgrid

subhire

telegram

training_legacy

travis-fix

update-stack

web-calendar

#167

#177

#191

#194

#200

#201

#207

#208

#211

#214

#217

#220

#229

#234

#246

#248

#250

#252

#253

#253

#254

#258

#258

#260

#263

#265

#268

#268

#269

#270

#271

#272

#272

#273

#275

#277

#280

#283

#285

#288

#288

#289

#290

#292

#293

#294

#295

#296

#297

#298

#299

#300

#301

#302

#303

#304

#306

#306

#307

#308

#310

#311

#312

#313

#314

#315

#317

#318

#318

#324

#325

#328

#329

#331

#332

#333

#334

#335

#336

#337

#338

#339

#340

#341

#359

#361

#363

#371

#373

#378

#382

#383

#387

#389

#390

#393

#395

#396

#397

#399

#400

#401

#402

#403

#404

#406

#407

#408

#409

#411

#412

#416

#417

#418

#420

#425

#427

#428

#429

#430

#432

#433

#434

#435

#436

#441

#442

#448

#449

#450

#458

#459

#460

#461

#462

#463

#464

#466

#467

#468

#471

#484

#485

#489

#491

#492

#493

#494

#495

#496

#503

#504

#505

#506

#507

#508

#509

#510

#511

#512

#514

#515

#516

#517

#518

#519

#520

#521

#522

#523

#526

#527

#529

#530

#531

#532

#536

#541

#542

#544

#545

#550

#551

#553

#554

#556

#557

#558

#559

#561

#563

#564

#565

#566

#567

#569

#570

#571

#572

#574

#575

#576

#577

#578

#579

#580

#581

#583

#584

#585

#586

#588

#589

#589

#590

#591

#594

#595

#596

#598

#599

#600

#601

#602

#604

#606

#607

#610

#611

#613

#614

#616

#617

#618

#619

#620

#621

#624

#625

#625

#626

#627

#628

#628

#629

#630

#633

#633

Mono Color

• 175807f664 Merge pull request #294 from nottinghamtec/hotfix/spelling David Taylor 2017-06-03 20:30:41 +01:00
• abb56af222 Fix spelling in rig authorisation Johnathan Graydon 2017-06-02 12:52:01 +01:00
• 48139b29cf Merge pull request #293 from nottinghamtec/feature/use_native_chrome David Taylor 2017-05-25 14:28:08 +01:00
• 7ec09fb774 Use chrome natively on Travis, hopefully faster David Taylor 2017-05-25 13:48:08 +01:00
• e37d1c663b Merge pull request #292 from nottinghamtec/hotfix/event_authorisation_activity_feed David Taylor 2017-05-25 13:32:32 +01:00
• bdd7f02fe2 Add EventAuthorisation to the activity feed David Taylor 2017-05-25 13:09:52 +01:00
• b4ea818992 Merge pull request #283 from nottinghamtec/feature/online-auth Tom Price 2017-05-24 17:03:21 +01:00
• 7cb9e97ecb Fix text on quote paperwork for external clients Tom Price 2017-05-24 16:27:31 +01:00
• 7fdafd854e Add payments to invoice PDF Tom Price 2017-05-23 19:18:19 +01:00
• d85ebb63a1 Minor PDF styling fixes Tom Price 2017-05-23 18:41:06 +01:00
• c6b7bbc219 Change to just using online auth for internal clients. Tom Price 2017-05-23 18:19:02 +01:00
• 4d316c7a4a Stop authorisation information being duplicated with an event David Taylor 2017-05-18 18:02:44 +01:00
• 75a3059c88 Add failing duplicate test David Taylor 2017-05-18 18:02:29 +01:00
• b6e4c0ed14 Merge branch 'master' into feature/online-auth David Taylor 2017-05-18 17:49:54 +01:00
• 0a45b047a2 Add warnings when editing an event that has already been sent to a client David Taylor 2017-05-18 17:34:49 +01:00
• 4e79f00551 Add pound signs to confirmation emails David Taylor 2017-05-18 17:22:59 +01:00
• b4ab29393e Allow confirmation emails to fail without blocking the interface David Taylor 2017-05-18 16:21:44 +01:00
• 703fb8561a Move font definition into div, doesn’t seem to be picked up in body David Taylor 2017-05-18 15:32:54 +01:00
• f3c020b613 Update email templates to avoid using bootstrap. Should improve speed, and also cross-email-client compatability David Taylor 2017-05-18 15:27:50 +01:00
• 4b87b0a196 Add some visual indicators that authorisations have been submitted. Tom Price 2017-05-17 18:59:06 +01:00
• 7cc715cedc Merge pull request #290 from nottinghamtec/hotfix/event-times-dissapearing David Taylor 2017-05-16 15:15:50 +01:00
• 4b032944ac Fix the time formatting David Taylor 2017-05-16 14:50:33 +01:00
• cb23fd183e Add failing test David Taylor 2017-05-16 14:50:18 +01:00
• fbc039c274 Fix tests so they can actually run locally (I failed) David Taylor 2017-05-16 13:58:05 +01:00
• b3156dbb0d Merge pull request #289 from nottinghamtec/feature/chrome-testing David Taylor 2017-05-15 21:56:09 +01:00
• fdce2fa53d Update selenium, use chrome for tests, and use sauce-labs for CI integration tests David Taylor 2017-05-15 21:41:33 +01:00
• 55d24e96cb Adds basic tests to check that versioning views load successfully David Taylor 2017-05-15 20:40:03 +01:00
• 36d258253f Fix issues caused by dependency upgrades David Taylor 2017-05-12 21:32:17 +01:00
• 865bb131a5 Add merge migration David Taylor 2017-05-12 21:02:48 +01:00
• eb1e8935f4 Fix reversion in signals.py David Taylor 2017-05-12 20:56:01 +01:00
• f8aaf9f36e Merge branch 'master' into feature/online-auth David Taylor 2017-05-12 20:53:00 +01:00
• 7a4f5ba8bf Merge pull request #217 from nottinghamtec/python-deps David Taylor 2017-05-12 16:54:55 +01:00
• 16a993123b Merge branch 'master' into python-deps David Taylor 2017-05-12 16:49:14 +01:00
• e547e3e858 Delete unused wercker config David Taylor 2017-05-10 23:54:23 +01:00
• ea26823fec Add dependency badge to README David Taylor 2017-05-10 23:45:54 +01:00
• 1f4e53ad27 Add dependency badge to README David Taylor 2017-05-10 23:40:48 +01:00
• 374c31e8b4 Fix date/time/datetime field types David Taylor 2017-05-10 23:03:35 +01:00
• 0d726b2b60 Fix paperwork printing David Taylor 2017-05-10 20:25:41 +01:00
• 38a8ac1eb4 Add failing tests for event paperwork printing David Taylor 2017-05-10 20:25:14 +01:00
• 872e5e72f3 Update the requirements.txt file, always a useful thing to do David Taylor 2017-05-10 20:11:12 +01:00
• d916c1ca19 Update all the things, and fix some upgrade issues David Taylor 2017-05-10 20:05:36 +01:00
• 9b1cc965c7 Update to Django 1.10 David Taylor 2017-05-10 18:41:17 +01:00
• 83028418fe Fix deprecation warnings for django 1.10 David Taylor 2017-05-10 18:30:17 +01:00
• 7f680dcffb Fix activity feed David Taylor 2017-05-10 18:06:17 +01:00
• e573088c5e Fix some issues caused by changes made over the last year David Taylor 2017-05-10 17:51:55 +01:00
• 7ac9eef7a2 Merge master into python-deps David Taylor 2017-05-10 17:27:52 +01:00
• 286e4314f5 Require users to have nottinghamtec.co.uk address before allowing them to send messages to clients David Taylor 2017-05-10 15:39:13 +01:00
• 6b05938953 Set authorisation button text to be more verbose Tom Price 2017-05-09 19:21:35 +01:00
• 602ba1d051 Fix order of importing bootstrap variables. Tom Price 2017-05-09 18:48:03 +01:00
• 1710c3f01f Send HTML confirmation emails. Tom Price 2017-05-09 18:43:27 +01:00
• f57ac3acb1 Add sending of html email for the request Tom Price 2017-05-09 18:34:47 +01:00
• 0f657662de Fix some async issues running tests. feature/builds Tom Price 2017-05-09 15:18:58 +01:00
• c16ba62e45 Fix issue with jQuery having changed the paths the use in later versions Tom Price 2017-05-09 14:20:11 +01:00
• cb2259ff1d Add missing run command. Tom Price 2017-05-09 14:11:41 +01:00
• f5b555ecdc Try again with node_js using pip --user Tom Price 2017-05-09 14:05:34 +01:00
• becc08c74f I HATE FIXING TRAVIS Tom Price 2017-05-09 13:56:59 +01:00
• cf8f6ce8be Add heroku node support and try and fix travis Tom Price 2017-05-09 13:54:41 +01:00
• cf62a8047d Add node, gulp and travis build steps Tom Price 2017-05-09 13:42:20 +01:00
• 8ef755ce05 Add bootstrap and jquery to gulp build Tom Price 2017-05-09 13:38:39 +01:00
• 41196b6447 Add basic gulp build system Tom Price 2017-05-09 13:18:17 +01:00
• a3cdef8570 Tidy up the querying and move into model feature/invoice-query Tom Price 2017-05-08 23:49:33 +01:00
• 331dab20f7 Add basic tracking of when an event authorisation request was sent. Tom Price 2017-04-19 18:14:36 +01:00
• d9076a4f5f Quantize event totals to prevent issues with mixed precision on client authorisation form. Tom Price 2017-04-19 15:27:12 +01:00
• 56d4e438b6 Fix test missing EventAuthorisation.sent_by Tom Price 2017-04-11 16:22:54 +01:00
• 430862b24d Add tracking of who sent the link Tom Price 2017-04-11 15:52:38 +01:00
• e12367bde7 Few tweaks to printed documents following a conversation with Marilyn from treasury Tom Price 2017-04-11 14:32:06 +01:00
• c0f4884242 Add missing PO field. Tom Price 2017-04-11 14:10:00 +01:00
• 36638e4df6 Add some more disclaimers explaining things better to internal clients. Tom Price 2017-04-11 14:02:58 +01:00
• a0440e1587 Add useful email addresses for reference. Tom Price 2017-04-11 13:48:51 +01:00
• 6e78f16c33 Add changes suggested by DT Tom Price 2017-04-11 11:45:08 +01:00
• 6b7889d80e Add copy of Discourse-Auth app, feature/discourse-auth-app David Taylor 2017-04-11 00:28:35 +01:00
• 82b6f1cbf8 Fix string formatting issue. Tom Price 2017-04-10 23:43:42 +01:00
• 5be3842aea Fix test client login because we are still using Django 1.8 Tom Price 2017-04-10 23:28:00 +01:00
• 067e03b757 Remove Event.purchase_order in favour of a simple EventAuthorisation object. Tom Price 2017-04-10 23:14:09 +01:00
• 391d9ef28f Update PDF templates and enable sending of PDF via email. Tom Price 2017-04-10 22:45:27 +01:00
• 5d17d642ec Update templates to include the new authorisation fields Tom Price 2017-04-10 21:43:18 +01:00
• 22119a3d08 Add test for sending authorisation email to client Tom Price 2017-04-10 20:50:28 +01:00
• 306c11bb2f Add tooltip JavaScript Tom Price 2017-04-10 20:47:19 +01:00
• 3fa9795cde Change mic name to use the full name rather than the display name on RIGS Tom Price 2017-04-10 20:40:51 +01:00
• 7fd0c50146 Add sending of emails to clients. Tom Price 2017-04-10 20:39:19 +01:00
• 97b11eabbd Add test for sending emails. Tom Price 2017-04-10 19:28:35 +01:00
• 3b2aa02ae5 Add success notification emails. Tom Price 2017-04-10 19:16:45 +01:00
• cf11e8235f Add ID tagging to auth form to autoscroll on error Tom Price 2017-04-10 18:15:47 +01:00
• 1670b190c2 Add tests for the client side authorisation Tom Price 2017-04-10 18:11:49 +01:00
• e65e97b1a3 Client facing authorisation procedures. Tom Price 2017-04-06 22:26:05 +01:00
• c2787d54b0 Add authorisation models. Tom Price 2017-03-29 20:35:25 +01:00
• 9b7c84cf08 Change invoice filename format Tom Price 2017-03-28 16:43:15 +01:00
• 3269e92ef2 Merge pull request #277 from nottinghamtec/davidtaylorhq-patch-1 hotfix/su-branding David Taylor 2017-03-10 15:29:29 +00:00
• 0ae7bcaf7c Explicitly define height in oembed JSON David Taylor 2017-03-10 15:26:00 +00:00
• 7ec1c726a6 Optimise down to just the one SQL query for waiting invoices. Tom Price 2017-03-01 02:42:39 +00:00
• 4773b43081 Refactor outstanding invoice query to use django annotations. Tom Price 2017-03-01 02:05:06 +00:00
• 9694d407ae Merge pull request #275 from nottinghamtec/hotfix/home-links Tom Price 2017-02-06 15:47:12 +00:00
• 82aa2785ea Make forum go to actual forum Sam Osborne 2017-02-06 15:35:29 +00:00
• 337dbd74fd Merge pull request #273 from nottinghamtec/hotfix/restore-pagination David Taylor 2016-11-04 13:36:21 +00:00
• caa55fe89a Restore pagination to invoice waiting (requested by Emma) David Taylor 2016-11-04 13:31:06 +00:00
• adc94820bb Added discourse profile pictures. Will fallback to gravatar if not linked to forum account feature/discourse-auth David Taylor 2016-11-03 01:55:27 +00:00
• f3947d89ca Commented registration test - since registration is now disabled David Taylor 2016-11-03 00:09:09 +00:00
• 0ad3aa7d3f Fixed penguins of death due to infinite loop of SSO login redirects David Taylor 2016-11-02 23:50:49 +00:00
• 01f754ad53 Removed unused views David Taylor 2016-11-02 21:27:04 +00:00
• 793f1d4e05 Made it work :) David Taylor 2016-11-02 21:01:40 +00:00