PyRIGS

arona/PyRIGS

Fork 0

mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 21:42:14 +00:00

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

417fd81b9a Bug fix for incorrectly formatted dates issue #47 Tom Price 2015-03-31 16:40:15 +01:00
ec9b108742 Merged in Registration-Profile-Names (pull request #2) Tom Price 2015-03-31 10:55:20 +01:00
1a2883b931 Merged in Registration-Profile-Names (pull request #2) Tom Price 2015-03-31 10:55:20 +01:00
c3aa3763a7 Merged in unique-initials (pull request #3). Ignore me with model validation, not a thing due to superclass. Tom Price 2015-03-31 10:53:44 +01:00
c4911bed6d Merged in unique-initials (pull request #3). Ignore me with model validation, not a thing due to superclass. Tom Price 2015-03-31 10:53:44 +01:00
8340fd49d4 Fix for loosing data when there is a form validation error. Issue #42. Tom Price 2015-03-31 10:33:57 +01:00
93af55ccbb Fix for loosing data when there is a form validation error. Issue #42. Tom Price 2015-03-31 10:33:57 +01:00
99208f4022 Add conditionals to related models links. Bugfix for #41 Tom Price 2015-03-31 10:29:48 +01:00
6e5c6fbb31 Add conditionals to related models links. Bugfix for #41 Tom Price 2015-03-31 10:29:48 +01:00
6cdfb826f2 Fix unhelpful error message issue #42 Tom Price 2015-03-31 09:03:45 +01:00
05d487787d Fix unhelpful error message issue #42 Tom Price 2015-03-31 09:03:45 +01:00
1af996a4d8 Remove /static/ and add to ignore. Tom Price 2015-03-31 08:52:47 +01:00
b35f294652 Remove /static/ and add to ignore. Tom Price 2015-03-31 08:52:47 +01:00
e84ae39d7d Added favicon and smartphone icon meta tags to template David Taylor 2015-03-31 03:11:00 +01:00
d5bfc57735 Added favicon and smartphone icon meta tags to template David Taylor 2015-03-31 03:11:00 +01:00
a2be5d00b8 Add unique initial validation David Taylor 2015-03-31 02:05:50 +01:00
fa3796a323 Add unique initial validation David Taylor 2015-03-31 02:05:50 +01:00
98d0851f58 Added first & last name fields to registration form David Taylor 2015-03-31 01:41:03 +01:00
430b6cb82a Added first & last name fields to registration form David Taylor 2015-03-31 01:41:03 +01:00
9ac0326b4b Change ordering for events to start_date first. Tom Price 2015-03-30 19:59:24 +01:00
e212109a7a Change ordering for events to start_date first. Tom Price 2015-03-30 19:59:24 +01:00
da8fffcf10 Add non rig status changing #37 Tom Price 2015-03-30 19:49:58 +01:00
4b04716273 Add non rig status changing #37 Tom Price 2015-03-30 19:49:58 +01:00
d012b52bce Add Dry Hire label #38 Tom Price 2015-03-30 19:45:02 +01:00
eefc469946 Add Dry Hire label #38 Tom Price 2015-03-30 19:45:02 +01:00
089719fe05 Add status label and muting for cancelled events issue #36 Tom Price 2015-03-30 19:37:42 +01:00
1de29e2234 Add status label and muting for cancelled events issue #36 Tom Price 2015-03-30 19:37:42 +01:00
3f06e0b909 Change table classes to show non rigs issue #37 Tom Price 2015-03-30 19:15:41 +01:00
ac8bda85e2 Change table classes to show non rigs issue #37 Tom Price 2015-03-30 19:15:41 +01:00
9ebf3d4769 Bug fix for #35 tomtom5152 2015-03-29 22:54:29 +01:00
2a3588e148 Bug fix for #35 tomtom5152 2015-03-29 22:54:29 +01:00
881fdda2c7 Add many links to event detail. Potential fix for #34 tomtom5152 2015-03-29 21:42:40 +01:00
1b221e6933 Add many links to event detail. Potential fix for #34 tomtom5152 2015-03-29 21:42:40 +01:00
95111695b9 Add edit autocomplete buttons to edit rig page. tomtom5152 2015-03-29 14:20:09 +01:00
7a4c70ab99 Add edit autocomplete buttons to edit rig page. tomtom5152 2015-03-29 14:20:09 +01:00
c954aa2497 Add edit urls to API results. tomtom5152 2015-03-29 13:40:52 +01:00
6c1ba912b8 Add edit urls to API results. tomtom5152 2015-03-29 13:40:52 +01:00
0a0d66297e Remove threading due to issues with postgres tomtom5152 2015-03-28 20:02:47 +00:00
3a1c9e938a Remove threading due to issues with postgres tomtom5152 2015-03-28 20:02:47 +00:00
9f5d2867f5 Bug fix with not oppening the connection tomtom5152 2015-03-28 19:56:46 +00:00
ca7aeee3e1 Bug fix with not oppening the connection tomtom5152 2015-03-28 19:56:46 +00:00
356d6801b2 Uncomment out all import items tomtom5152 2015-03-28 19:33:49 +00:00
24ed32e7cb Uncomment out all import items tomtom5152 2015-03-28 19:33:49 +00:00
188f06afc2 Fix mouseover text. Tidy up non rig detail tomtom5152 2015-03-28 17:32:47 +00:00
9ca9a0f38d Fix mouseover text. Tidy up non rig detail tomtom5152 2015-03-28 17:32:47 +00:00
cc85b44ba3 Add rig collected by information issue #25 tomtom5152 2015-03-28 17:11:23 +00:00
ff0d703af5 Add rig collected by information issue #25 tomtom5152 2015-03-28 17:11:23 +00:00
1120409e88 Change save icon to floppy #24 tomtom5152 2015-03-28 16:51:55 +00:00
83ae129d72 Change save icon to floppy #24 tomtom5152 2015-03-28 16:51:55 +00:00
194337830d Improve UI on event screen for dealing with long email addresses. tomtom5152 2015-03-28 16:34:06 +00:00
422b7b063b Improve UI on event screen for dealing with long email addresses. tomtom5152 2015-03-28 16:34:06 +00:00
3030316ff5 Unkown bug fix, this appears to work. tomtom5152 2015-03-27 16:00:18 +00:00
8d79bb706d Unkown bug fix, this appears to work. tomtom5152 2015-03-27 16:00:18 +00:00
d7a3bdf3d6 Merge branch 'master' of bitbucket:nottinghamtec/pyrigs tomtom5152 2015-03-27 15:52:13 +00:00
8c7983c7ea Merge branch 'master' of bitbucket:nottinghamtec/pyrigs tomtom5152 2015-03-27 15:52:13 +00:00
4883b9dc01 Merged in users (pull request #1) Tom Price 2015-03-27 15:49:53 +00:00
c81cc952dd Merged in users (pull request #1) Tom Price 2015-03-27 15:49:53 +00:00
f013cfb968 Bug fix for #30 tomtom5152 2015-03-27 12:21:21 +00:00
896c30881f Bug fix for #30 tomtom5152 2015-03-27 12:21:21 +00:00
2a3875f198 Bug fix for non unicode in admin panel. tomtom5152 2015-03-27 12:15:10 +00:00
7977b6a17c Bug fix for non unicode in admin panel. tomtom5152 2015-03-27 12:15:10 +00:00
d70ad24c53 Bugfix for #27 tomtom5152 2015-03-26 14:16:03 +00:00
534d82a7df Bugfix for #27 tomtom5152 2015-03-26 14:16:03 +00:00
bc09075776 Template improvements to registration form tomtom5152 2015-03-26 13:51:35 +00:00
b46c0867ed Template improvements to registration form tomtom5152 2015-03-26 13:51:35 +00:00
17417e38cd Bug fix for #27 tomtom5152 2015-03-26 13:44:50 +00:00
4002206fa9 Bug fix for #27 tomtom5152 2015-03-26 13:44:50 +00:00
7c52d8334c Bug fix for #23 tomtom5152 2015-03-26 13:19:47 +00:00
56979fa81a Bug fix for #23 tomtom5152 2015-03-26 13:19:47 +00:00
f1e75d1656 Add missing profile_form.html template tomtom5152 2015-03-25 21:10:45 +00:00
5f53925730 Add missing profile_form.html template tomtom5152 2015-03-25 21:10:45 +00:00
cc27822b34 Add links to user details to base. tomtom5152 2015-03-25 20:44:58 +00:00
a1d3987d5d Add links to user details to base. tomtom5152 2015-03-25 20:44:58 +00:00
048c4b801a Add user editing tomtom5152 2015-03-25 20:21:54 +00:00
d699a596f5 Add user editing tomtom5152 2015-03-25 20:21:54 +00:00
e5fa55ea6c Added viewing user profiles tomtom5152 2015-03-25 18:56:29 +00:00
c805379a7f Added viewing user profiles tomtom5152 2015-03-25 18:56:29 +00:00
3230b03606 Minor improvement to tracking code. Tom Price 2015-03-13 15:43:08 +00:00
7fdeeec9d5 Minor improvement to tracking code. Tom Price 2015-03-13 15:43:08 +00:00
64d6d134b6 Fixed syntax error in analytics.html Tom Price 2015-03-13 15:28:34 +00:00
8aeeb31491 Fixed syntax error in analytics.html Tom Price 2015-03-13 15:28:34 +00:00
2ae6e305e2 Added analytics code. tjp03u 2015-03-11 14:57:33 +00:00
52fb9e17fe Added analytics code. tjp03u 2015-03-11 14:57:33 +00:00
2568517a8f Readded start>end checking. Template improvements tomtom5152 2015-03-05 18:20:43 +00:00
3ce01e79c5 Readded start>end checking. Template improvements tomtom5152 2015-03-05 18:20:43 +00:00
d6bcc2f5dd Removed logic for the exception of start > end. This didn't add anything to UX so will need to find a better way of doing this. Ultimately, saying that there are no events available IS the correct response. tomtom5152 2015-03-05 15:11:23 +00:00
7f0ef83f1c Removed logic for the exception of start > end. This didn't add anything to UX so will need to find a better way of doing this. Ultimately, saying that there are no events available IS the correct response. tomtom5152 2015-03-05 15:11:23 +00:00
3876318fe5 Added error message for start > end tomtom5152 2015-03-04 16:08:36 +00:00
7ede9b566b Added error message for start > end tomtom5152 2015-03-04 16:08:36 +00:00
2930f43937 Fix for #9 tomtom5152 2015-03-04 15:49:00 +00:00
4ba308357c Fix for #9 tomtom5152 2015-03-04 15:49:00 +00:00
b4829d9d16 Slight bugfix for 3e1fa4b with incorrect logic. tomtom5152 2015-03-04 03:11:54 +00:00
0a54a1f2e3 Slight bugfix for 3e1fa4b with incorrect logic. tomtom5152 2015-03-04 03:11:54 +00:00
3e1fa4b9ab Potential fix for #12. tomtom5152 2015-03-04 03:06:43 +00:00
a5be8aa38b Potential fix for #12. tomtom5152 2015-03-04 03:06:43 +00:00
50d34af428 Fix for #14 root 2015-03-04 02:24:04 +00:00
920f937c59 Fix for #14 root 2015-03-04 02:24:04 +00:00
ed660b9106 Reverted to using Django ORM for the calculation of event totals and payment totals on an invoice. Need to pay closer attention to the docs which state that the SUM(arg[0], fields) arg[0] is the returned type. root 2015-03-03 17:29:38 +00:00
4247351253 Reverted to using Django ORM for the calculation of event totals and payment totals on an invoice. Need to pay closer attention to the docs which state that the SUM(arg[0], fields) arg[0] is the returned type. root 2015-03-03 17:29:38 +00:00
a3b30ceed8 Merge remote-tracking branch 'origin/master' Tom Price 2015-03-03 02:44:50 +00:00