PyRIGS

arona/PyRIGS

Fork 0

mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-06-12 04:13:35 +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/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

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
bab8b98db3 Merge remote-tracking branch 'origin/master' Tom Price 2015-03-03 02:44:50 +00:00
e1cef5bd87 Made raw queries portable to postgresql engine as well Tom Price 2015-03-03 02:44:16 +00:00
31d246fb27 Made raw queries portable to postgresql engine as well Tom Price 2015-03-03 02:44:16 +00:00
472cc3f1bb Changed the calculations of sum totals to be raw SQL queries for speed boost. Not ideal but the best we are going to get. Tom Price 2015-03-03 02:20:07 +00:00
2456092da5 Changed the calculations of sum totals to be raw SQL queries for speed boost. Not ideal but the best we are going to get. Tom Price 2015-03-03 02:20:07 +00:00
c7b483e0ad Changed the calculations of sum totals to be raw SQL queries for speed boost. Not ideal but the best we are going to get. Tom Price 2015-03-03 02:20:07 +00:00
4408b4afdc Changed the calculations of sum totals to be raw SQL queries for speed boost. Not ideal but the best we are going to get. Tom Price 2015-03-03 02:20:07 +00:00
ff1d5730a2 Fixed issue with calculating the balance on an invoice Tom Price 2015-02-09 17:48:59 +00:00
c928f41e03 Fixed issue with calculating the balance on an invoice Tom Price 2015-02-09 17:48:59 +00:00
46aa363851 Made entire importer atomic for consistency. Tom Price 2015-02-01 23:42:41 +00:00
61f474fb70 Made entire importer atomic for consistency. Tom Price 2015-02-01 23:42:41 +00:00
76939409bb Increased query efficiency Tom Price 2015-02-01 23:41:03 +00:00
3dc856c489 Increased query efficiency Tom Price 2015-02-01 23:41:03 +00:00
d8cff2779f Created invoice importer Tom Price 2015-01-31 23:13:09 +00:00
e00a8771cc Created invoice importer Tom Price 2015-01-31 23:13:09 +00:00
c6d89416a1 Fixed incorrect url on bootstrap fonts. tomtom5152 2015-01-30 13:47:56 +00:00
b527a3faa9 Fixed incorrect url on bootstrap fonts. tomtom5152 2015-01-30 13:47:56 +00:00
af1396a168 Added the ability to invoice an event tomtom5152 2015-01-30 00:26:15 +00:00
20264f570a Added the ability to invoice an event tomtom5152 2015-01-30 00:26:15 +00:00
bbce968478 Added more invoice buttons tomtom5152 2015-01-30 00:25:45 +00:00
6606408f48 Added more invoice buttons tomtom5152 2015-01-30 00:25:45 +00:00
8086d13756 Enabled invoices button tomtom5152 2015-01-30 00:22:48 +00:00
f841cc886a Enabled invoices button tomtom5152 2015-01-30 00:22:48 +00:00
a0e3f6bfc1 Added default value to Invoice.void (False) tomtom5152 2015-01-30 00:16:29 +00:00
a0cf841d91 Added default value to Invoice.void (False) tomtom5152 2015-01-30 00:16:29 +00:00
2ce45b9297 Basic working invoice system. Need to add a way to create invoices. tomtom5152 2015-01-29 23:17:50 +00:00
b1b5906038 Basic working invoice system. Need to add a way to create invoices. tomtom5152 2015-01-29 23:17:50 +00:00
5f88e1e759 Merge remote-tracking branch 'origin/master' tomtom5152 2015-01-29 20:02:40 +00:00
8d9a0ee124 Merge remote-tracking branch 'origin/master' tomtom5152 2015-01-29 20:02:40 +00:00
f913b94345 Started making use of gravatar icons. tomtom5152 2015-01-29 20:00:07 +00:00
6c322e39cb Started making use of gravatar icons. tomtom5152 2015-01-29 20:00:07 +00:00
391c874508 Started making use of gravatar icons. tomtom5152 2015-01-29 20:00:07 +00:00
6aaae0d69e Started making use of gravatar icons. tomtom5152 2015-01-29 20:00:07 +00:00
3df97c9e61 Fixed display issue with the base template root 2015-01-29 18:46:21 +00:00
6838444501 Fixed display issue with the base template root 2015-01-29 18:46:21 +00:00
a82a65f8ec Added setting user passwords to uuid4 so forgotten password should work root 2015-01-29 16:04:19 +00:00
1ad47107c1 Added setting user passwords to uuid4 so forgotten password should work root 2015-01-29 16:04:19 +00:00
dd88b5361f Fixed added the ability to import tomtom5152 2015-01-28 18:45:40 +00:00
4d667b64a4 Fixed added the ability to import tomtom5152 2015-01-28 18:45:40 +00:00
fd36688147 Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs tomtom5152 2015-01-28 16:59:54 +00:00
d9e8e4d03f Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs tomtom5152 2015-01-28 16:59:54 +00:00
29edcebb88 Added missing fields to event form and detail tomtom5152 2015-01-28 16:49:10 +00:00
e24a95ec7a Added missing fields to event form and detail tomtom5152 2015-01-28 16:49:10 +00:00
1c29b9275d Fixes for the selection of current rigs. tomtom5152 2015-01-28 16:30:32 +00:00
41bd6bc384 Fixes for the selection of current rigs. tomtom5152 2015-01-28 16:30:32 +00:00
8339ec70d3 Fixes for the importer root 2015-01-28 16:28:59 +00:00
1e16542747 Fixes for the importer root 2015-01-28 16:28:59 +00:00
ca1fd274e2 Improved the way current events is queried tomtom5152 2015-01-28 15:29:00 +00:00
df67788865 Improved the way current events is queried tomtom5152 2015-01-28 15:29:00 +00:00
b2b5438e12 Updated some email settings to be used in production root 2015-01-27 16:56:46 +00:00
f5f4770247 Updated some email settings to be used in production root 2015-01-27 16:56:46 +00:00
1aff7bcadb Minor fix for importer adding @nottingham.ac.uk to empty emails. tomtom5152 2015-01-27 16:51:58 +00:00
ce3536714e Minor fix for importer adding @nottingham.ac.uk to empty emails. tomtom5152 2015-01-27 16:51:58 +00:00
75f9d2ffc4 Fixed some dependency version issues. tomtom5152 2015-01-27 16:43:12 +00:00
47e67e4c94 Fixed some dependency version issues. tomtom5152 2015-01-27 16:43:12 +00:00
8c8a724566 Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs root 2015-01-27 01:06:09 +00:00
ea9803f70a Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs root 2015-01-27 01:06:09 +00:00
ef708b3a9a Fixed typo in z3c.rlm -> z3c.rml root 2015-01-27 01:01:46 +00:00
a4c824fc6a Fixed typo in z3c.rlm -> z3c.rml root 2015-01-27 01:01:46 +00:00
343e34662b Added archive link Tom Price 2015-01-26 16:09:22 +00:00
4a908fd95f Added archive link Tom Price 2015-01-26 16:09:22 +00:00
6f27474a88 Performance optimisation of the related models by letting the DB deal with the relation straight off Tom Price 2015-01-26 15:19:37 +00:00
5b1cdbf182 Performance optimisation of the related models by letting the DB deal with the relation straight off Tom Price 2015-01-26 15:19:37 +00:00
9c9dc07929 Everyone's favourite, past events, now working and loading in ~800ms Tom Price 2015-01-26 15:06:39 +00:00
c4bb7fbee6 Everyone's favourite, past events, now working and loading in ~800ms Tom Price 2015-01-26 15:06:39 +00:00
13ce96809b Corrected permissions to duplicate a rig Tom Price 2015-01-26 11:11:11 +00:00
93feaaf334 Corrected permissions to duplicate a rig Tom Price 2015-01-26 11:11:11 +00:00
98ef7539e9 Improved person/organisation cross referencing via events Tom Price 2015-01-22 22:06:24 +00:00
941bd2319e Improved person/organisation cross referencing via events Tom Price 2015-01-22 22:06:24 +00:00
c6aed3db75 Moved the table element from the main rigboard out to something reusuable. Tom Price 2015-01-22 20:48:37 +00:00
ff9bca1e61 Moved the table element from the main rigboard out to something reusuable. Tom Price 2015-01-22 20:48:37 +00:00
e2d01cc6c5 Fix for issue #5. Added verbose name to Event.mic Tom Price 2015-01-22 19:34:25 +00:00
346c05759a Fix for issue #5. Added verbose name to Event.mic Tom Price 2015-01-22 19:34:25 +00:00
c4a14e97c2 Fix for issue #4. Changed edited by username to standard name format. Tom Price 2015-01-22 19:31:43 +00:00
387a7566c7 Fix for issue #4. Changed edited by username to standard name format. Tom Price 2015-01-22 19:31:43 +00:00
e3e57554c6 Fixed issue with item modals not displaying. Tom Price 2015-01-22 19:26:16 +00:00
5c236819f4 Fixed issue with item modals not displaying. Tom Price 2015-01-22 19:26:16 +00:00
33ec095612 Improved Event UI Tom Price 2015-01-22 19:12:01 +00:00
7f2c4d2f18 Improved Event UI Tom Price 2015-01-22 19:12:01 +00:00
2d41815f9d Recollected static Tom Price 2015-01-22 19:11:23 +00:00
bd4127f064 Recollected static Tom Price 2015-01-22 19:11:23 +00:00
b6aa8ce1e2 Updated bootstrap asset files to V3.3.3 Tom Price 2015-01-22 18:52:32 +00:00
85dc7746a2 Updated bootstrap asset files to V3.3.3 Tom Price 2015-01-22 18:52:32 +00:00
542eb91f9e Fixed an error with the glypicon fonts having the wrong URL CI TEC 2015-01-22 18:46:39 +00:00
68b82bd612 Fixed an error with the glypicon fonts having the wrong URL CI TEC 2015-01-22 18:46:39 +00:00
c9c4ac03f8 Updated css files to latest version with new bootstrap CI TEC 2015-01-22 18:40:12 +00:00