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/follow-redirects-1.16.0

dependabot/npm_and_yarn/immutable-3.8.3

dependabot/npm_and_yarn/lodash-4.18.1

dependabot/npm_and_yarn/multi-57404e07ab

dependabot/npm_and_yarn/picomatch-2.3.2

dependabot/npm_and_yarn/svgo-2.8.2

dependabot/npm_and_yarn/yaml-1.10.3

dependabot/pip/zipp-3.19.1

dependabot/uv/requests-2.33.0

dependabot/uv/sqlparse-0.5.4

dependabot/uv/tornado-6.5.5

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

#626

#627

#628

#628

#629

#630

#633

#633

#634

#635

#635

#636

#636

#637

#637

#638

#638

#639

#639

#641

#641

#642

#642

#643

#643

#644

#644

#645

#646

#646

#647

#647

#648

#648

Mono Color

• 767b5512e3 Fail, missed a change, actually closes #185 now David Taylor 2016-04-07 00:53:57 +01:00
• f1bd1ca674 Make 'created' noun class-specific. Closes #185 David Taylor 2016-04-07 00:52:33 +01:00
• b47cfed5a9 Fixed versioning UI for revisions containing multiple event versions, hopefully David Taylor 2016-04-07 00:19:18 +01:00
• 71b69aa0f6 Merge pull request #220 from nottinghamtec/merge-interface davidtaylorhq 2016-04-06 22:08:32 +01:00
• df61225b73 Optimise imports Tom Price 2016-04-06 21:57:25 +01:00
• 823db68a6a PEP8 format files Tom Price 2016-04-06 21:53:38 +01:00
• ebe08c3bf1 Update tests to check items that aren't selected aren't affected. Tom Price 2016-04-06 21:52:25 +01:00
• 44ccead0a4 Added merge tests David Taylor 2016-04-05 15:32:13 +01:00
• 99dfdcd253 Make confirmation more useful David Taylor 2016-04-05 12:53:04 +01:00
• 03ca65602f Allow sorting by number of events David Taylor 2016-04-05 12:08:19 +01:00
• ca6cddb392 Add comments display to versioning history (because why not). David Taylor 2016-04-05 11:50:34 +01:00
• 33ce4b622d Fixed bug with versioning interface when related objects are deleted David Taylor 2016-04-05 04:18:53 +01:00
• 46434977fb Created merge admin action for Person, Venue and Organisation models. Added template. David Taylor 2016-04-05 04:18:19 +01:00
• 8cfda69717 Set wercker up to use postgres for tests again. Tom Price 2016-03-31 16:03:07 +01:00
• 463c4d147c Update settings for django10 support Tom Price 2016-03-31 15:14:54 +01:00
• 6da688cc9e Migrate VAT rate to use a single date field rather than datetime. Tom Price 2016-03-31 13:15:53 +01:00
• c1d164bd73 Remove the db.sqlite3 file Tom Price 2016-03-31 13:12:35 +01:00
• d43e4b2465 Update settings and urls to fix new deprecations Tom Price 2016-03-31 12:33:46 +01:00
• 98ee9bb0db Fix imports in tests Tom Price 2016-03-31 12:13:11 +01:00
• cd2aed00d7 Update login URL in settings so redirects work correctly. Tom Price 2016-03-31 12:09:04 +01:00
• 0ee37b1cd3 Fix issues with python2 imports Tom Price 2016-03-31 12:07:07 +01:00
• 486c66b198 Update requirements.txt before starting to test for issues Tom Price 2016-03-31 11:59:21 +01:00
• f13303490a Merge pull request #211 from nottinghamtec/wercker davidtaylorhq 2016-03-24 12:34:00 +00:00
• 84b0a57e14 Fixed line breaks for new items. Closes #212 David Taylor 2016-03-24 12:22:37 +00:00
• 2ee7c064af Add a dirty work around for wercker not quite working correctly. Tom Price 2016-03-18 16:48:43 +00:00
• b2b8546e3c Add test for events_in_bounds Tom Price 2016-03-18 16:41:13 +00:00
• 2945a607bf Add more tests for models.Event properties Tom Price 2016-03-18 16:27:20 +00:00
• 4370cf60d1 And yet some more waits Tom Price 2016-03-17 18:44:03 +00:00
• e7496a9d82 Add some more waits for animations in failing test Tom Price 2016-03-17 18:37:15 +00:00
• 77f7a25fa8 Try maximising firefox so it is large enough to pass the test Tom Price 2016-03-17 18:06:37 +00:00
• 10c5ea3e7c Add a wait for the animation to complete during event creation. Tom Price 2016-03-17 17:47:02 +00:00
• cd82712742 Merge pull request #207 from nottinghamtec/fixed_jquery Tom Price 2016-03-17 17:34:58 +00:00
• 3067dcdda5 Update wercker in README.md Tom Price 2016-03-17 17:31:14 +00:00
• 94679d6783 Update seleium version for Wercker Tom Price 2016-03-17 17:23:21 +00:00
• 54dc29b4b2 Switch to jquery CDN who provide a sha256 hash to validate against. Tom Price 2016-03-17 17:18:42 +00:00
• e699826ce9 Merge branch 'master' into fixed_jquery Tom Price 2016-03-17 17:10:35 +00:00
• 33fa19c15e Merge branch 'version_history_diff', second time lucky David Taylor 2016-03-16 15:21:53 +00:00
• d6e9b030fd Merge branch 'master' into version_history_diff David Taylor 2016-03-16 15:21:13 +00:00
• f0a3c968a7 Added unicode support David Taylor 2016-03-16 15:15:12 +00:00
• d8760a00ba Revert "Merge branch 'version_history_diff'" David Taylor 2016-03-16 14:54:09 +00:00
• 8ee43ef3ab Merge branch 'version_history_diff' David Taylor 2016-03-16 14:37:09 +00:00
• 1b6ce32deb Merge branch 'master' into version_history_diff David Taylor 2016-03-16 14:36:24 +00:00
• 9964d33cc0 Update wercker in README.md Tom Price 2016-03-16 14:32:38 +00:00
• 1e81b718f6 Merge branch 'deleting_duplicates' David Taylor 2016-03-16 13:09:02 +00:00
• 551737b882 Merge branch 'master' into deleting_duplicates David Taylor 2016-03-16 13:05:54 +00:00
• 77dd36d4b4 Merge branch 'web_calendar' David Taylor 2016-03-16 12:55:26 +00:00
• 9bace9a6da Merge branch 'master' into web_calendar David Taylor 2016-03-16 12:52:57 +00:00
• c6b45da72c Made tests more reliable - wait for success page to load before checking item exists in database David Taylor 2016-03-16 12:49:42 +00:00
• 0721d61bef Merge branch 'master' into web_calendar David Taylor 2016-03-16 12:30:22 +00:00
• 56bc084e60 Made interface more compact David Taylor 2016-03-16 12:28:37 +00:00
• 481f56a4bd Added highlighting styles David Taylor 2016-03-16 12:17:26 +00:00
• 11e9931438 Fixed compass config David Taylor 2016-03-16 12:16:57 +00:00
• ea840eb43c Added diff-match-patch to requirements David Taylor 2016-03-16 12:08:41 +00:00
• 2ed0a4bcf9 Updated changes view to use diff where appropriate. David Taylor 2016-03-16 10:08:26 +00:00
• 5d48d75f34 Make protocol-agnostic Harry Bridge 2016-03-12 18:17:03 +00:00
• 92beb8bf79 Fixed jquery version Harry Bridge 2016-03-12 18:12:39 +00:00
• ed552b402a Based on event with no MIC - closes #163 David Taylor 2016-03-10 11:56:09 +00:00
• 8279bec4bf Removed warning message at top - closes #203 David Taylor 2016-03-10 11:46:28 +00:00
• 67b2bc6d54 Applied migration to development database David Taylor 2016-02-29 20:44:09 +00:00
• e3adfecd17 Added database migration David Taylor 2016-02-29 20:43:11 +00:00
• 1681ab8fee Allowed linking to specific views/dates on the calendar - closes #153 David Taylor 2016-02-29 20:35:53 +00:00
• a77bc65d7b Changed delete condition to SET_NULL - closes #199 David Taylor 2016-02-29 20:12:41 +00:00
• 73517ed443 Revision history link on non-rigs - closes #186 David Taylor 2016-02-29 19:55:04 +00:00
• f59e11ecc4 Updated VAT Registration Number - Closes #197 David Taylor 2016-02-29 19:37:59 +00:00
• 19f619b2d4 Merge pull request #194 from nottinghamtec/login-autofocus Tom Price 2016-02-12 16:46:10 +00:00
• e0d03c2cc3 Made username field autofocus (using HTML5 Attribute). Fixes #193 David Taylor 2016-02-12 16:27:11 +00:00
• 69f7152dd6 Merge pull request #191 from samozzy/patch-1 Tom Price 2016-02-01 17:11:20 +00:00
• 581f28757a Update konami.js samozzy 2016-02-01 17:10:06 +00:00
• 660a54d955 Merge pull request #177 from nottinghamtec/login Tom Price 2016-01-20 13:45:26 +00:00
• c0c2314fbe Start building a page to select items based on category. training_legacy Tom Price 2016-01-05 20:03:16 +00:00
• d62fcc8483 Add training database index Tom Price 2016-01-05 00:17:33 +00:00
• b838d25cc2 Refactor training status table down to the simplest elements so they can be included as needed. Tom Price 2016-01-05 00:07:22 +00:00
• ee4bd832fa Merge branch 'login' into training Tom Price 2016-01-04 23:58:01 +00:00
• 29126a558b Make the captcha Foxtrot Oscar from the functional tests Tom Price 2016-01-04 23:38:17 +00:00
• 0a30a99e1f Absolish the captcha from the login page. Tom Price 2016-01-04 23:37:11 +00:00
• 8c231b931d Deleted left over incorrect .idea/ files. Tom Price 2015-12-23 01:07:16 +00:00
• c5970d2542 A first view that shows a user their current training status. Tom Price 2015-12-23 01:06:18 +00:00
• 1922992633 Merge branch 'master' into training Tom Price 2015-12-22 23:08:02 +00:00
• b7018d5c44 Refactor NoneType test to make use of the __str__ method thus including that method in the test as well. Tom Price 2015-12-22 23:07:15 +00:00
• 48969ed95c Fix NoneType exception by only adding initials if they are set. Tom Price 2015-12-22 23:03:30 +00:00
• b933a5322f Add test to reproduce NoneType exception from #171 Tom Price 2015-12-22 23:01:30 +00:00
• 2743112f1b Reformat file to correct standard Tom Price 2015-12-22 22:59:12 +00:00
• ec4e033745 Merge branch 'master' into training Tom Price 2015-11-10 12:18:53 +00:00
• aa76c6c775 Add missing raven js file. Tom Price 2015-11-10 11:58:07 +00:00
• 96ea649304 Remove auto calculation of git version as this doesn't work on heroku. Tom Price 2015-11-10 11:11:12 +00:00
• b322335c09 Add missing deps Tom Price 2015-11-10 11:08:39 +00:00
• 2e1ab96186 Add Sentry logging Tom Price 2015-11-10 10:50:24 +00:00
• 887e932c64 Merge branch 'redacting' Tom Price 2015-11-10 10:32:05 +00:00
• 9d39e2cdf2 Change sensitive variables to be fetched from the environment Tom Price 2015-11-05 13:40:31 +00:00
• 643f5691a1 db.sqlite redacted and history rewritten. Tom Price 2015-10-28 20:57:29 +00:00
• 9379050e15 Add basic detail view for training record. Tom Price 2015-10-28 17:41:02 +00:00
• 4689775a5f Several changes to models Tom Price 2015-10-22 13:49:22 +01:00
• 32aabe14c7 Add training models to admin interface Tom Price 2015-10-22 13:39:19 +01:00
• 697a5977c8 Add the unique together constraint to TrainingRecord model and actually commit the migration this time. Tom Price 2015-10-22 00:19:05 +01:00
• 80ba59c3ba Fix models and create migration Tom Price 2015-10-21 17:51:59 +01:00
• c60e3fb9fe Add training app to installed apps Tom Price 2015-10-21 17:03:46 +01:00
• 9beb7c1612 Update to allow pycharm to access the local postgres db Tom Price 2015-10-21 17:00:03 +01:00
• 227b63e689 Add a sensible data structure. Tom Price 2015-10-21 16:59:17 +01:00
• fa231887d2 Add local postgres database for training to settings Tom Price 2015-10-21 16:08:17 +01:00
• 37e5549736 Convert the export scripts from generic SQL to usable postgres including relationships Tom Price 2015-10-21 15:57:47 +01:00