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

• c1b416251c Fixed merge issues David Taylor 2016-07-10 12:50:14 +01:00
• 03f7709769 Merge branch 'master' into search David Taylor 2016-07-10 12:34:37 +01:00
• 9178cf6062 Remove pagination from invoice waiting page David Taylor 2016-07-10 11:31:25 +01:00
• abbb20e49e More invoice UI improvements, makes colour coding of invoice vs events clearer David Taylor 2016-07-10 11:23:06 +01:00
• 01d2eae7bc More invoice UI improvements - makes colouring consistent - also closes #242 David Taylor 2016-07-10 11:14:24 +01:00
• 39d27d2730 Basic invoice UI improvements - closes #232 David Taylor 2016-07-10 10:49:23 +01:00
• 05b2de561e Added phone links - closes #247 David Taylor 2016-07-10 09:54:35 +01:00
• ee948381b1 Initial work on subhire section feature/subhire David Taylor 2016-06-16 16:22:24 +01:00
• 667b0c80ca Added tests for invoice deleting David Taylor 2016-06-16 01:44:59 +01:00
• 67624eea6f Allow deleting invoices, if there are no payments yet David Taylor 2016-06-15 23:18:46 +01:00
• e1578eb0d4 Fixed responsive table fail David Taylor 2016-06-15 13:00:14 +01:00
• a7247c273e Fixed #245 David Taylor 2016-06-14 19:50:35 +01:00
• f265da2f1d Fixed #241 and #244 David Taylor 2016-06-14 19:45:45 +01:00
• 1163b117e4 Fixed #240 David Taylor 2016-06-14 19:23:40 +01:00
• f92f418bc5 Fixed waiting invoice counter - closes #239 David Taylor 2016-06-06 23:06:30 +01:00
• 9108cb3c4e Fail! Hide non-rigs from waiting invoices David Taylor 2016-06-04 18:08:43 +01:00
• 08d17adc8a Merge branch 'develop' David Taylor 2016-06-04 17:55:23 +01:00
• 68b35c2d24 Removed print button conditions following discussion David Taylor 2016-05-29 23:47:56 +01:00
• 5cc69cbb41 Stopped things opening in a new window, because it's really annoying. If you want to do this, use the appropriate keyboard shortcut or mouse button David Taylor 2016-05-29 23:03:41 +01:00
• a48afb9157 Added internal/external indicators to invoice lists David Taylor 2016-05-29 22:56:58 +01:00
• 3ccbdff737 Added balance to invoice page - closes #235 David Taylor 2016-05-29 22:51:41 +01:00
• 0990f0bfbb Only display invoice print button for external clients David Taylor 2016-05-29 22:46:49 +01:00
• f43635ee89 Added more useful information to the invoice tables David Taylor 2016-05-29 22:42:17 +01:00
• 705f1bda2b Fix the query for the 'outstanding' invoices page. Previously this only displayed events with an end date set. David Taylor 2016-05-29 22:05:53 +01:00
• 0ff0d06eaf Fix counter on outstanding invoices page ('length' property doesn't work because of the custom SQL query) David Taylor 2016-05-29 22:04:48 +01:00
• a769486c9c Changed order of invoice menu items to make it more intuitive (now in order of workflow) David Taylor 2016-05-29 21:37:14 +01:00
• 83302c4439 Invoice UI improvements. Renamed pages, added description, and added total number of events David Taylor 2016-05-29 21:30:05 +01:00
• ba020b43f1 Merge branch 'master' into develop David Taylor 2016-05-29 20:28:52 +01:00
• eaf5c9687e Fixed typo, closes #174 David Taylor 2016-05-29 20:21:23 +01:00
• a725ef5caf Removed add to google calendar link, closes #237 David Taylor 2016-05-29 17:09:52 +01:00
• aa79f3628e Only redirect to HTTPS in production David Taylor 2016-05-28 15:27:38 +01:00
• 000351d884 Redirect all requests to https David Taylor 2016-05-28 15:20:15 +01:00
• db58c113aa Changed font to load over https - #236 David Taylor 2016-05-28 14:52:48 +01:00
• 7cb8503164 Merged feature/invoice-total into develop Tom Price 2016-05-24 18:44:27 +01:00
• cc2450ff87 Make total conditional if defined Tom Price 2016-05-24 17:50:48 +01:00
• 6b77393414 Fix for incorrect selection of active invoices. Make sure waiting shows total across all pages. Tom Price 2016-05-24 17:49:44 +01:00
• 7ccc8faf20 Add total for waiting events Tom Price 2016-05-24 17:32:58 +01:00
• 6030288956 Cheap and dirty active totals Tom Price 2016-05-24 17:17:52 +01:00
• e4a955f323 Reformat code to PEP8 Tom Price 2016-05-23 12:36:21 +01:00
• 44ce14f600 Enabled linking to specific views & dates within web calendar web-calendar David Taylor 2015-07-29 23:25:33 +01:00
• b963beeded Initial attempt at telegram notifications telegram David Taylor 2015-08-17 23:21:45 +01:00
• f8afd8c1da Tidy up event search logic and optimise Tom Price 2016-05-23 01:26:39 +01:00
• 60c7d1705f Added event search to homepage David Taylor 2015-08-15 19:13:49 +01:00
• 2528399bd9 Added search to invoice archive David Taylor 2015-08-03 00:29:19 +03:00
• 9db9902bb9 Added search to person, venue, organisation and event archive David Taylor 2015-08-02 23:54:29 +03:00
• 56e833aed0 Improvements to form printing forms David Taylor 2015-08-14 18:49:43 +03:00
• cf82ba9680 Used correct values in event_detail David Taylor 2015-08-14 17:41:16 +03:00
• 27eb7cb64b Versioning now uses object string representation rather than the ridiculous chain of if statements. Have improved __str methods accordingly David Taylor 2015-08-14 17:23:35 +03:00
• ece075e948 Made activity stream more useful for form changes David Taylor 2015-08-14 17:16:38 +03:00
• b3c6e4ce73 Added __str__ method & absolute url method to Forms class David Taylor 2015-08-14 16:37:11 +03:00
• de8a3088d2 Added forms to "Recent Changes"... That was way too easy, python is awesome David Taylor 2015-08-13 17:01:47 +03:00
• d611bf3905 Versioning UI now utilises decorators to register classes, in line with reversion, to allow expansion without adding dependencies David Taylor 2015-08-13 16:57:13 +03:00
• 0aa2c62af8 Added template tags functionality to schema/layout (to allow specifying default values based on event) David Taylor 2015-08-13 15:42:39 +03:00
• bdb7941579 Added buttons to detail & edit view David Taylor 2015-08-10 18:45:42 +03:00
• 45c020828f Set arrays to start empty in edit interface David Taylor 2015-08-10 18:05:09 +03:00
• 33958d0670 Added array empty condition to print David Taylor 2015-08-10 18:04:42 +03:00
• 48236680ca Tidied print templates David Taylor 2015-08-10 17:44:35 +03:00
• 8e600c8749 Added read-only view of form David Taylor 2015-08-10 17:43:18 +03:00
• 58e06c1b3e More tidying of code & templates David Taylor 2015-08-10 15:24:03 +03:00
• b3cf0b39ac Tidied code David Taylor 2015-08-10 15:10:40 +03:00
• a481b325a4 Added print button to form list David Taylor 2015-08-09 23:53:51 +03:00
• 5862646314 Added title to print David Taylor 2015-08-09 23:53:38 +03:00
• 09dc2a3eb4 Make validation error more verbose David Taylor 2015-08-09 23:40:44 +03:00
• c557d810ae Added jsonschema to requirements David Taylor 2015-08-09 23:39:19 +03:00
• ca8ba10efa Added printing David Taylor 2015-08-09 23:39:03 +03:00
• fe943e12c1 Checks schema & layout are valid Checks received data follows the schema David Taylor 2015-08-08 23:36:00 +03:00
• 212b055b59 Corrected default layout value David Taylor 2015-08-08 17:00:26 +03:00
• 4ee0dab5dc Added migration & sample form type/schema David Taylor 2015-08-08 16:58:52 +03:00
• 879060a171 Added link to event_detail page David Taylor 2015-08-08 16:53:55 +03:00
• 0e42999d3e Added list view & more stuff David Taylor 2015-08-08 16:52:15 +03:00
• 153dacbf22 Added update view & saving logic David Taylor 2015-08-07 20:42:50 +03:00
• 7a0746d1a4 Added view, doesn't yet submit David Taylor 2015-08-05 22:08:00 +03:00
• f99e16f562 Renamed app to avoid confusion with django forms David Taylor 2015-08-05 19:00:19 +03:00
• eb41636ffc Corrected model copying fail David Taylor 2015-08-05 17:39:45 +03:00
• e56cff17fa Added initial model tests David Taylor 2015-08-05 17:39:19 +03:00
• 56a2ea68fb Created forms app and added initial models David Taylor 2015-08-05 15:24:50 +03:00
• 8b2aaa0c0e Add some suggestions for asset category choices. assets_legacy Tom Price 2015-09-15 17:52:50 +01:00
• b1952b96f7 Change supplier and abstract model to match the design agreed in the office. Tom Price 2015-09-15 17:25:11 +01:00
• 5cdc75ce5c Very basic start to assets Tom Price 2015-08-04 19:58:39 +01:00
• e286d8bdee Merge pull request #229 from nottinghamtec/develop Tom Price 2016-05-23 00:38:31 +01:00
• 1faf8f95c8 Fixed colour coding on invoice waiting page David Taylor 2016-05-22 23:13:23 +01:00
• 2913b254b4 Fix an overflow issue with dropdown fields. Closes #204 Tom Price 2016-05-19 14:33:33 +01:00
• ef81536066 Add tooltips to rig type selectors. Closes #227 Tom Price 2016-05-19 14:21:21 +01:00
• 29aa13316d Fix for versioning when event has been deleted, closes #226 David Taylor 2016-04-27 20:49:42 +01:00
• 98f28aaafd Based on has name as well as MIC - Fix #224 David Taylor 2016-04-12 20:15:13 +01:00
• f8a2a7a959 Made items display in version history again David Taylor 2016-04-07 09:23:35 +01:00
• 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