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

• f616857131 Merge pull request #328 from nottinghamtec/django2 David Taylor 2018-04-02 21:36:10 +01:00
• 60fb90a50c Merge pull request #333 from nottinghamtec/hotfix/fix-jonos-commit David Taylor 2018-03-26 19:46:06 +01:00
• 66f024e961 Remove un-necessary use of reversion David Taylor 2018-03-26 19:41:13 +01:00
• 06daacf611 Automatically set event to booked when the client authorises it (#332) Johnathan Graydon 2018-03-26 14:51:42 +01:00
• c74bc945b6 Not error if no person Will close #330 Johnathan Graydon 2018-03-26 14:00:08 +01:00
• 3c605d2976 Fix pep8 Johnathan Graydon 2018-03-25 15:18:06 +01:00
• 9720066fd7 Remove checked in by on event duplication Will close #327 Johnathan Graydon 2018-03-25 15:03:37 +01:00
• b157e3b187 Add 127.0.0.1 to Allowed_Hosts for debug Johnathan Graydon 2018-03-25 14:58:14 +01:00
• 19030fdf2f Use django-widget-tweaks from GitHub until latest version is on PyPI django2 David Taylor 2018-03-25 00:48:17 +00:00
• 42450b5a22 User.is_authenticated is no longer callable David Taylor 2018-03-25 00:28:37 +00:00
• ce11df9bbc Rename MIDDLEWARE_CLASSES to MIDDLEWARE David Taylor 2018-03-25 00:21:30 +00:00
• 82e664c5e0 SessionAuthenticationMiddleware is no longer required (as of Django 1.10) David Taylor 2018-03-25 00:21:15 +00:00
• 8098b33698 Migrate profile to have longer last_name field (Django 2.0 updated AbstractUser model) David Taylor 2018-03-25 00:20:51 +00:00
• 9c2603557c Merge pull request #324 from nottinghamtec/hotfix/auth-request David Taylor 2018-03-25 00:01:05 +00:00
• f4209f21dc Remove include( from admin.site.urls David Taylor 2018-02-06 00:00:18 +00:00
• 1e3c021a76 Add on_delete=models.CASCADE to old migrations David Taylor 2018-02-05 23:49:13 +00:00
• d8f9256252 Add on_delete=models.CASCADE to OneToOneFields David Taylor 2018-02-05 23:38:26 +00:00
• 014bab6c1f Add on_delete=models.CASCADE to all foreign keys. This replicates the previous default behaviour David Taylor 2018-02-05 23:36:10 +00:00
• 8872084cab Import URL functions from django.urls David Taylor 2017-12-02 23:30:24 +00:00
• 76ceb15000 Bump versions David Taylor 2018-03-24 23:58:07 +00:00
• 7dff951f28 Fix null person on authorisation request Will close #319 Johnathan Graydon 2018-03-12 17:16:50 +00:00
• 05feb7df1c Merge pull request #325 from nottinghamtec/travis-fix David Taylor 2018-03-24 23:52:43 +00:00
• ad3b38d222 Use new RECAPTCHA testing keys travis-fix David Taylor 2018-03-24 23:45:43 +00:00
• a26e65073c Add no sandbox flag David Taylor 2018-03-24 22:19:10 +00:00
• 7f3d628d01 Bump selenium David Taylor 2018-03-12 18:06:49 +00:00
• abdf785723 Bump chrome and chromedriver David Taylor 2018-03-12 18:06:13 +00:00
• 0e8a23733f Working CRUD views Harry Bridge 2018-03-06 14:02:24 +00:00
• 9fb74ecc9e Updated models and added post-save hook Harry Bridge 2018-03-06 14:01:22 +00:00
• e2a37beb83 Added sample data commands Harry Bridge 2018-03-06 14:00:11 +00:00
• 680570696c User creation management commands Harry Bridge 2018-02-28 16:10:18 +00:00
• 37d5ecf89a Initial Models Harry Bridge 2018-02-28 16:10:02 +00:00
• 6072072b61 Initial commit Harry Bridge 2018-02-28 16:09:34 +00:00
• 85edba03a2 Merge pull request #315 from nottinghamtec/requires-io-master David Taylor 2017-11-29 15:03:28 +00:00
• d61b21df0a Merge branch 'master' into requires-io-master David Taylor 2017-11-29 14:56:00 +00:00
• 7e68dfb851 Fix hover text on invoice page Johnathan Graydon 2017-11-29 14:35:23 +00:00
• 69cbac31e7 [requires.io] dependency update requires.io 2017-11-27 09:21:59 +00:00
• ce4e0f5630 [requires.io] dependency update requires.io 2017-11-24 19:19:49 +00:00
• c99c5d573f [requires.io] dependency update requires.io 2017-11-24 02:55:03 +00:00
• 221ef739b9 [requires.io] dependency update requires.io 2017-11-17 02:49:10 +00:00
• aa98039c35 [requires.io] dependency update requires.io 2017-11-15 18:16:25 +00:00
• 7ef923b89f [requires.io] dependency update requires.io 2017-11-13 19:53:55 +00:00
• 9ac86a6ad0 [requires.io] dependency update requires.io 2017-11-08 13:25:37 +00:00
• c0c143a166 [requires.io] dependency update requires.io 2017-11-08 13:09:23 +00:00
• 0abfa2fd0c [requires.io] dependency update requires.io 2017-11-07 09:19:06 +00:00
• 3333b29f24 [requires.io] dependency update requires.io 2017-11-05 19:41:14 +00:00
• 880509d611 [requires.io] dependency update requires.io 2017-11-04 08:27:51 +00:00
• 387f5b0d8e [requires.io] dependency update requires.io 2017-11-03 01:15:17 +00:00
• 27b12d6bf4 [requires.io] dependency update requires.io 2017-11-02 02:27:15 +00:00
• c511f2f528 [requires.io] dependency update requires.io 2017-10-30 14:24:44 +00:00
• a61165f301 [requires.io] dependency update requires.io 2017-10-29 19:18:00 +00:00
• 98245939fe [requires.io] dependency update requires.io 2017-10-24 21:49:12 +01:00
• b203832f79 [requires.io] dependency update requires.io 2017-10-13 18:30:28 +01:00
• c6846b85c7 [requires.io] dependency update requires.io 2017-10-05 19:35:42 +01:00
• 0c15718d31 [requires.io] dependency update requires.io 2017-10-04 16:39:53 +01:00
• 0f1db22452 [requires.io] dependency update requires.io 2017-10-02 16:39:04 +01:00
• e3970929e4 [requires.io] dependency update requires.io 2017-09-27 08:30:01 +01:00
• a64bf8e16f [requires.io] dependency update requires.io 2017-09-25 23:43:31 +01:00
• cf8edc8a1c Merge pull request #314 from nottinghamtec/hotfix/ical David Taylor 2017-09-25 23:16:54 +01:00
• ca9e309b1b Fix datetime/date check, and add https to calendar URLs hotfix/ical David Taylor 2017-09-25 23:11:00 +01:00
• 0ccb669019 Add failing test for ICAL end time issue David Taylor 2017-09-25 22:58:36 +01:00
• 92acd17e64 Merge pull request #312 from nottinghamtec/js-dependencies David Taylor 2017-09-22 21:45:33 +01:00
• ff83bcc14a Merge branch 'master' into js-dependencies David Taylor 2017-09-22 21:36:05 +01:00
• f17e0e199c Update bootstrap-select CSS David Taylor 2017-09-22 21:30:55 +01:00
• 7b3b05677c Merge pull request #313 from nottinghamtec/requires-io-master David Taylor 2017-09-22 17:46:06 +01:00
• 403549f449 [requires.io] dependency update requires.io 2017-09-22 17:41:17 +01:00
• aee4ccb5a2 Update JS dependencies David Taylor 2017-09-22 16:33:04 +01:00
• f8c2551eeb Merge pull request #311 from nottinghamtec/pep8 David Taylor 2017-09-22 15:57:12 +01:00
• 1bab3464b7 Merge branch 'master' into pep8 David Taylor 2017-09-22 15:10:40 +01:00
• 2b863b91b3 [requires.io] dependency update on master branch (#308) David Taylor 2017-09-22 15:04:39 +01:00
• 5c4181a5cc Add PEP8 linting to Travis David Taylor 2017-09-22 14:57:32 +01:00
• f9389e3996 PEP8 all the things David Taylor 2017-09-22 14:57:14 +01:00
• 131ff3e612 Fix chromedriver issues, and run headless on travis (#310) David Taylor 2017-09-22 14:24:20 +01:00
• 7dd7378e6c Merge pull request #307 from nottinghamtec/hotfix/migrations David Taylor 2017-09-05 00:05:53 +01:00
• 4d0da2fdc1 Add missing migration David Taylor 2017-09-04 23:59:53 +01:00
• ddbc0699ee Add manage.py checks to travis build David Taylor 2017-09-04 23:59:11 +01:00
• 5f14001d01 Merge pull request #296 from nottinghamtec/python-3 David Taylor 2017-09-04 23:42:26 +01:00
• 91f1e6d290 Change heroku runtime to 3.x David Taylor 2017-06-21 12:11:24 +01:00
• 00d46274f1 Update travis python version David Taylor 2017-06-21 12:07:58 +01:00
• 0aec836b1a Fix iCal tests David Taylor 2017-06-21 12:04:30 +01:00
• ee930aa86a Replace assertItemsEqual with assertCountEqual in model tests. David Taylor 2017-06-21 11:46:58 +01:00
• a88f4d0cb2 Fix paperwork printing David Taylor 2017-06-21 11:44:36 +01:00
• 50c997b568 Fixed profile picture encoding David Taylor 2017-06-21 11:28:07 +01:00
• 3035320e82 Run through 2-to-3 converter. This is not in a working state David Taylor 2017-06-21 11:27:53 +01:00
• 98182143ec [requires.io] dependency update on master branch (#304) David Taylor 2017-08-18 08:33:56 +01:00
• bffbaeb4c6 [requires.io] dependency update (#303) David Taylor 2017-08-04 19:53:29 +01:00
• 8f1c640bea [requires.io] dependency update on master branch (#301) David Taylor 2017-08-01 13:52:09 +01:00
• 827a2cdd25 [requires.io] dependency update on master branch (#300) David Taylor 2017-07-18 15:32:36 +01:00
• 3202981fbe [requires.io] dependency update (#299) David Taylor 2017-07-10 20:01:06 +01:00
• f0edd5020e [requires.io] dependency update on master branch (#297) David Taylor 2017-07-10 19:01:11 +01:00
• cf1c7ae725 Merge pull request #298 from nottinghamtec/telegram-build-notification David Taylor 2017-07-02 18:24:39 +01:00
• 1ac637bfd7 Add telegram travis notification David Taylor 2017-07-02 18:15:54 +01:00
• 37933650d3 Merge pull request #295 from nottinghamtec/reversion-upgrade David Taylor 2017-07-02 18:14:51 +01:00
• 1266dd419c Use KVM based travis David Taylor 2017-07-02 18:09:29 +01:00
• 74747e8700 Explicitly specify python runtime. Tom Price 2017-07-02 17:05:33 +01:00
• 34ffd62436 Add many tests for the versioning backend and interfaces David Taylor 2017-06-21 03:12:26 +01:00
• 22c520e841 Refactored versioning.py (and associated templates) to improve readability and testability. David Taylor 2017-06-21 00:50:09 +01:00
• 3fa9191150 Update requirements.txt David Taylor 2017-06-19 23:59:19 +01:00
• ae4f05a661 Update versioning.py to work with latest django-reversion David Taylor 2017-06-19 23:53:00 +01:00
• c178a293a1 Fix model registration and RevisionMixin lookups. Also much more efficient and DRY now David Taylor 2017-06-19 23:25:58 +01:00
• aebaa16311 Use EventAuthorisation post_save signal for EventAuthorisation email instead of the (now removed) reversion hook David Taylor 2017-06-19 23:03:13 +01:00