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

• dc425122e6 Fix typo Tom Price 2015-04-24 17:06:22 +01:00
• 7013811145 Readd settings line Tom Price 2015-04-24 16:59:50 +01:00
• dbf89ad7f9 Readd settings line Tom Price 2015-04-24 16:59:50 +01:00
• 824a5d2f07 Fixed UI issues by making tables responsive David Taylor 2015-04-24 16:59:28 +01:00
• 8d92a5490f Fixed UI issues by making tables responsive David Taylor 2015-04-24 16:59:28 +01:00
• 2d0f8eeaa3 Setup ready for Heroku Tom Price 2015-04-24 16:44:26 +01:00
• 6954501496 Setup ready for Heroku Tom Price 2015-04-24 16:44:26 +01:00
• 53ad4f264e Add Heroku requirements Tom Price 2015-04-24 16:27:09 +01:00
• 024c6c253b Add Heroku requirements Tom Price 2015-04-24 16:27:09 +01:00
• 06515366df Merged in purchase-order (pull request #23) Tom Price 2015-04-24 15:13:15 +01:00
• 0ffb79c7e8 Merged in purchase-order (pull request #23) Tom Price 2015-04-24 15:13:15 +01:00
• b5fd509e61 Relocate new select scripts to in theory always load before ready() fires #83 Tom Price 2015-04-24 15:09:15 +01:00
• d239a55fb6 Relocate new select scripts to in theory always load before ready() fires #83 Tom Price 2015-04-24 15:09:15 +01:00
• 19ecc8e0c4 Merged in ical-interface (pull request #24) Tom Price 2015-04-24 15:02:50 +01:00
• 56d20ead75 Merged in ical-interface (pull request #24) Tom Price 2015-04-24 15:02:50 +01:00
• ffb04f137f Fixed typo David Taylor 2015-04-24 14:24:48 +01:00
• 4f615d7158 Fixed typo David Taylor 2015-04-24 14:24:48 +01:00
• 143f4ea454 Fixed midnight issues in ical, web calendar & event_table David Taylor 2015-04-24 14:22:08 +01:00
• e48619c15a Fixed midnight issues in ical, web calendar & event_table David Taylor 2015-04-24 14:22:08 +01:00
• b0d20081fa Removed last trace of timezone David Taylor 2015-04-24 13:55:32 +01:00
• c3cc546d60 Removed last trace of timezone David Taylor 2015-04-24 13:55:32 +01:00
• 3b4547383d Changed to PO in detail view David Taylor 2015-04-24 01:24:03 +01:00
• 39eea79ee5 Changed to PO in detail view David Taylor 2015-04-24 01:24:03 +01:00
• d2cc9b8460 Changed to 'PO' and corrected capitalisation in 'Collected by' David Taylor 2015-04-24 01:22:46 +01:00
• 937f7e2f1c Changed to 'PO' and corrected capitalisation in 'Collected by' David Taylor 2015-04-24 01:22:46 +01:00
• c242cec49f Merge commit 'fb5173432e13d62f8fadabd58f6b969d9216049e' into purchase-order David Taylor 2015-04-24 01:21:24 +01:00
• 75bbe58a37 Merge commit '289556771efd2d74f51afa16ce504ab00a9ee40c' into purchase-order David Taylor 2015-04-24 01:21:24 +01:00
• fb5173432e Merged in paginiation-ui (pull request #20) Tom Price 2015-04-24 00:47:58 +01:00
• c9063d6327 Merged in paginiation-ui (pull request #20) Tom Price 2015-04-24 00:47:58 +01:00
• 3c1bbc6c5d Merged in invoice-ui (pull request #21) Tom Price 2015-04-24 00:47:26 +01:00
• 3f2c06bf25 Merged in invoice-ui (pull request #21) Tom Price 2015-04-24 00:47:26 +01:00
• e3279b2adc Merged in ical-interface (pull request #19) Tom Price 2015-04-24 00:46:54 +01:00
• 16fc9841bf Merged in ical-interface (pull request #19) Tom Price 2015-04-24 00:46:54 +01:00
• 7b9f7d311d Merged in js-datepicker (pull request #22) Tom Price 2015-04-24 00:42:36 +01:00
• 3efed59522 Merged in js-datepicker (pull request #22) Tom Price 2015-04-24 00:42:36 +01:00
• da97f7eadc Merged in autocomplete-ui (pull request #17) Tom Price 2015-04-24 00:30:30 +01:00
• 0cae8029d6 Merged in autocomplete-ui (pull request #17) Tom Price 2015-04-24 00:30:30 +01:00
• 0e7232a16c Corrected comment David Taylor 2015-04-24 00:10:14 +01:00
• 011cadf9d0 Corrected comment David Taylor 2015-04-24 00:10:14 +01:00
• 4560be158a Added PO field to event form David Taylor 2015-04-23 23:58:54 +01:00
• 2b79b17fbf Added PO field to event form David Taylor 2015-04-23 23:58:54 +01:00
• c15aba0288 Improved backend & logging associated items David Taylor 2015-04-23 02:29:47 +01:00
• 75f4427020 Improved backend & logging associated items David Taylor 2015-04-23 02:29:47 +01:00
• 6408416c7c Working revision view David Taylor 2015-04-23 00:57:58 +01:00
• 450559fb10 Working revision view David Taylor 2015-04-23 00:57:58 +01:00
• 7978de5a99 Merge branch 'master' into revision-view David Taylor 2015-04-22 21:08:15 +01:00
• c77d7d30b3 Merge branch 'master' into revision-view David Taylor 2015-04-22 21:08:15 +01:00
• d8b88cc792 Merge branch 'master' into autocomplete-ui David Taylor 2015-04-22 18:38:07 +01:00
• c87944d79a Merge branch 'master' into autocomplete-ui David Taylor 2015-04-22 18:38:07 +01:00
• 0a8759240a Fixed by not loading transition.js (conflicts with JQuery UI). We can make do without an animated date picker David Taylor 2015-04-22 18:29:01 +01:00
• c7766abc79 Fixed by not loading transition.js (conflicts with JQuery UI). We can make do without an animated date picker David Taylor 2015-04-22 18:29:01 +01:00
• 9494f00dd0 Working date picker fallback. This breaks item modals because... no idea David Taylor 2015-04-22 18:14:21 +01:00
• a4829e8890 Working date picker fallback. This breaks item modals because... no idea David Taylor 2015-04-22 18:14:21 +01:00
• 307618df31 Requested additions to invoice_detail David Taylor 2015-04-22 17:18:13 +01:00
• 093b216518 Requested additions to invoice_detail David Taylor 2015-04-22 17:18:13 +01:00
• da37904000 Fixed display in firefox David Taylor 2015-04-22 17:01:10 +01:00
• 559634e452 Fixed display in firefox David Taylor 2015-04-22 17:01:10 +01:00
• 3397bb772d Don't serve cancelled rigs David Taylor 2015-04-22 16:11:11 +01:00
• 9b53d7ee69 Don't serve cancelled rigs David Taylor 2015-04-22 16:11:11 +01:00
• a464c210dd Better help info David Taylor 2015-04-22 15:57:00 +01:00
• 01b684d08a Better help info David Taylor 2015-04-22 15:57:00 +01:00
• 88c67054b6 Back to 12 month query David Taylor 2015-04-22 15:31:50 +01:00
• c060ceff05 Back to 12 month query David Taylor 2015-04-22 15:31:50 +01:00
• 53c804cfc6 Apparently google doesn't work without www. David Taylor 2015-04-22 15:29:17 +01:00
• c0970fa6f5 Apparently google doesn't work without www. David Taylor 2015-04-22 15:29:17 +01:00
• 70d887f91b Added more help David Taylor 2015-04-22 14:54:42 +01:00
• f712e8f375 Added more help David Taylor 2015-04-22 14:54:42 +01:00
• 551e1117eb Added google calendar instructions David Taylor 2015-04-22 14:41:06 +01:00
• b5d8984c5b Added google calendar instructions David Taylor 2015-04-22 14:41:06 +01:00
• 2a67e9d8b2 Stripped out all timezone references. Also reduced query to past 3 months David Taylor 2015-04-22 14:35:05 +01:00
• b4806b943e Stripped out all timezone references. Also reduced query to past 3 months David Taylor 2015-04-22 14:35:05 +01:00
• d3180c2998 Merged in button-ui (pull request #18) Tom Price 2015-04-22 14:16:48 +01:00
• de2bed2d46 Merged in button-ui (pull request #18) Tom Price 2015-04-22 14:16:48 +01:00
• 45317efc3a Added button labels David Taylor 2015-04-22 14:01:24 +01:00
• efc1eb2f61 Added button labels David Taylor 2015-04-22 14:01:24 +01:00
• 178cae409f Fixed GIT merge issues #76 David Taylor 2015-04-22 13:40:20 +01:00
• 17cf6745e0 Fixed GIT merge issues #76 David Taylor 2015-04-22 13:40:20 +01:00
• 66236df979 Made a nice new UI for autocompleting David Taylor 2015-04-22 13:27:56 +01:00
• 279824139a Made a nice new UI for autocompleting David Taylor 2015-04-22 13:27:56 +01:00
• cef10456eb README.md edited online with Bitbucket Tom Price 2015-04-21 23:32:33 +00:00
• b958c4e00c README.md edited online with Bitbucket Tom Price 2015-04-21 23:32:33 +00:00
• 2ec73825c2 initial attempt David Taylor 2015-04-21 23:55:55 +01:00
• b7d99774b1 initial attempt David Taylor 2015-04-21 23:55:55 +01:00
• 0618684de8 Merged in indent-item (pull request #12) Tom Price 2015-04-21 22:41:29 +01:00
• 04368f1b63 Merged in indent-item (pull request #12) Tom Price 2015-04-21 22:41:29 +01:00
• 4d1d649bbc Merged in paperwork (pull request #16) Tom Price 2015-04-21 22:20:41 +01:00
• f32c0683b2 Merged in paperwork (pull request #16) Tom Price 2015-04-21 22:20:41 +01:00
• c0c076e74c Merged in invoice-rig-link (pull request #10) Tom Price 2015-04-21 21:26:18 +01:00
• b0a6cc2e96 Merged in invoice-rig-link (pull request #10) Tom Price 2015-04-21 21:26:18 +01:00
• fd29ceaecb Merged in ics-interface (pull request #6) Tom Price 2015-04-21 21:26:01 +01:00
• d380ca1049 Merged in ics-interface (pull request #6) Tom Price 2015-04-21 21:26:01 +01:00
• 3b1137c2d6 Merge conflict from master Tom Price 2015-04-21 19:57:45 +01:00
• 3aaba4633c Merge conflict from master Tom Price 2015-04-21 19:57:45 +01:00
• 954c5b9119 Rig links open in _blank David Taylor 2015-04-21 19:43:32 +01:00
• 7e285f6d80 Rig links open in _blank David Taylor 2015-04-21 19:43:32 +01:00
• 98f0005d67 Add checking URL is secure before using HTTPS for ical requests. In practice, this will always be yes. Tom Price 2015-04-21 19:31:33 +01:00
• b5d95bc67f Add checking URL is secure before using HTTPS for ical requests. In practice, this will always be yes. Tom Price 2015-04-21 19:31:33 +01:00
• c7b0ca4334 Change ical to use dynamically generated URL's instead of a static base URL. Tom Price 2015-04-21 19:25:46 +01:00
• 2cfeb49ea0 Change ical to use dynamically generated URL's instead of a static base URL. Tom Price 2015-04-21 19:25:46 +01:00
• 643e874c12 New paperwork design David Taylor 2015-04-21 19:24:49 +01:00