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

4d31f445be New paperwork design David Taylor 2015-04-21 19:24:49 +01:00
ef1e4bc9a5 Merged in web-calendar (pull request #7) Tom Price 2015-04-21 18:14:39 +01:00
dd335c7d02 Merged in web-calendar (pull request #7) Tom Price 2015-04-21 18:14:39 +01:00
a5448ce0a9 Merge from master Tom Price 2015-04-21 18:13:07 +01:00
f03ff47062 Merge from master Tom Price 2015-04-21 18:13:07 +01:00
44e8f03cf7 Merged in password-change (pull request #8) Tom Price 2015-04-21 17:33:24 +01:00
00e285cfd0 Merged in password-change (pull request #8) Tom Price 2015-04-21 17:33:24 +01:00
619487a48b Merged in print-new-tab (pull request #13) Tom Price 2015-04-21 17:05:11 +01:00
78dbe38aac Merged in print-new-tab (pull request #13) Tom Price 2015-04-21 17:05:11 +01:00
5449fba708 Merged in sum-total (pull request #14) Tom Price 2015-04-21 17:04:52 +01:00
cda7385eaa Merged in sum-total (pull request #14) Tom Price 2015-04-21 17:04:52 +01:00
8eec20d2ab Merged in invoice-buttons (pull request #15) Tom Price 2015-04-21 17:02:32 +01:00
d1388cf2f0 Merged in invoice-buttons (pull request #15) Tom Price 2015-04-21 17:02:32 +01:00
e65c476471 In event_invoice template, new invoice opens new tab, changed icon to gbp to match rest of system David Taylor 2015-04-21 12:04:44 +01:00
329c54c24f In event_invoice template, new invoice opens new tab, changed icon to gbp to match rest of system David Taylor 2015-04-21 12:04:44 +01:00
bf2a48dae6 Changed item_table to use "Total (ex. VAT)" instead of "Sum Total" David Taylor 2015-04-21 11:57:49 +01:00
66fb87a95e Changed item_table to use "Total (ex. VAT)" instead of "Sum Total" David Taylor 2015-04-21 11:57:49 +01:00
a1d8d38d91 Set target of print buttons to _blank David Taylor 2015-04-21 11:44:02 +01:00
11271898db Set target of print buttons to _blank David Taylor 2015-04-21 11:44:02 +01:00
a3e0a417e9 Indented item-description by 1em - issue #56 David Taylor 2015-04-21 11:39:55 +01:00
11517d7178 Indented item-description by 1em - issue #56 David Taylor 2015-04-21 11:39:55 +01:00
3a57193179 Changed top to match headed paper David Taylor 2015-04-21 11:03:58 +01:00
3884519bb1 Changed top to match headed paper David Taylor 2015-04-21 11:03:58 +01:00
ad2ed85ad6 Add url to description David Taylor 2015-04-20 15:43:02 +01:00
1f1d5db72a Add url to description David Taylor 2015-04-20 15:43:02 +01:00
013fa7441b Merge commit '0d719b328fd95504bdc6dabea96d65e5a485677b' into web-calendar David Taylor 2015-04-20 15:20:29 +01:00
1213971f1f Merge commit '3869751b8c5795a73418a3645c0ec2d8a27cf70c' into web-calendar David Taylor 2015-04-20 15:20:29 +01:00
d2c95a46c4 Merge commit '0d719b328fd95504bdc6dabea96d65e5a485677b' into ics-interface David Taylor 2015-04-20 15:19:25 +01:00
57b2fd5a69 Merge commit '3869751b8c5795a73418a3645c0ec2d8a27cf70c' into ics-interface David Taylor 2015-04-20 15:19:25 +01:00
0d719b328f Merged in change-gravatar (pull request #5) Tom Price 2015-04-20 14:01:21 +01:00
8d11331963 Merged in change-gravatar (pull request #5) Tom Price 2015-04-20 14:01:21 +01:00
4174baebd2 Merged in end-times-hidden (pull request #11) Tom Price 2015-04-20 13:59:35 +01:00
20ebca6c81 Merged in end-times-hidden (pull request #11) Tom Price 2015-04-20 13:59:35 +01:00
3954f00e21 Merged in meet_at (pull request #9) Tom Price 2015-04-20 13:57:41 +01:00
7406668288 Merged in meet_at (pull request #9) Tom Price 2015-04-20 13:57:41 +01:00
ca94c0b31b Fixed permissions - now has same access requirements as rig archive (login_required) David Taylor 2015-04-20 13:48:18 +01:00
7a24883ea7 Fixed permissions - now has same access requirements as rig archive (login_required) David Taylor 2015-04-20 13:48:18 +01:00
d60d6b66d0 Added api_key database migrations. Also includes other outstanding migrations: - Change Meta options on invoice - Add field api_key to profile - Alter field collector on event - Alter field initials on profile David Taylor 2015-04-20 12:57:42 +01:00
2930595b03 Added api_key database migrations. Also includes other outstanding migrations: - Change Meta options on invoice - Add field api_key to profile - Alter field collector on event - Alter field initials on profile David Taylor 2015-04-20 12:57:42 +01:00
12123f7b25 Actual fix for #57 (Django templates don't like parenthesis in logic) David Taylor 2015-04-20 00:59:00 +01:00
c224866a50 Actual fix for #57 (Django templates don't like parenthesis in logic) David Taylor 2015-04-20 00:59:00 +01:00
b9d2f1e9aa Fix for issue #57 David Taylor 2015-04-20 00:15:10 +01:00
3ce3a4ba67 Fix for issue #57 David Taylor 2015-04-20 00:15:10 +01:00
8c2af1fc67 Rig numbers for all invoice lists now link to event_detail page - issue #65 David Taylor 2015-04-20 00:03:40 +01:00
e3145ef986 Rig numbers for all invoice lists now link to event_detail page - issue #65 David Taylor 2015-04-20 00:03:40 +01:00
94a07c71c7 Fixed issue #61 - caused by typo in 0940d9f David Taylor 2015-04-19 23:40:12 +01:00
c1937eb2d7 Fixed issue #61 - caused by typo in 0940d9f David Taylor 2015-04-19 23:40:12 +01:00
d0cc119be6 Added templates for password_change_form and password_change_done. Added button to profile_detail. David Taylor 2015-04-19 23:32:05 +01:00
30210fe85a Added templates for password_change_form and password_change_done. Added button to profile_detail. David Taylor 2015-04-19 23:32:05 +01:00
0c8665d370 Added calendar view David Taylor 2015-04-19 22:25:59 +01:00
df1a285089 Added calendar view David Taylor 2015-04-19 22:25:59 +01:00
9f902eabb6 Made it work for users that already exist in database David Taylor 2015-04-19 17:28:22 +01:00
f40cfa7490 Made it work for users that already exist in database David Taylor 2015-04-19 17:28:22 +01:00
d0c44c921f Actually added authentication decorator this time David Taylor 2015-04-19 17:08:16 +01:00
a7a1d4d3b8 Actually added authentication decorator this time David Taylor 2015-04-19 17:08:16 +01:00
065fc6727f Added authentication decorator & reset key functionality David Taylor 2015-04-19 17:07:28 +01:00
a7f392f0bc Added authentication decorator & reset key functionality David Taylor 2015-04-19 17:07:28 +01:00
f1e5088271 Add interface to view API key David Taylor 2015-04-19 17:06:52 +01:00
29f873c640 Add interface to view API key David Taylor 2015-04-19 17:06:52 +01:00
f4ffb6f256 Added api key stuff to profile model David Taylor 2015-04-19 17:06:03 +01:00
df88222e00 Added api key stuff to profile model David Taylor 2015-04-19 17:06:03 +01:00
b7120aa8f3 Tidied up & added comments David Taylor 2015-04-18 23:12:57 +01:00
94194d0613 Tidied up & added comments David Taylor 2015-04-18 23:12:57 +01:00
895b1c177e Made more efficient & split view into a separate file David Taylor 2015-04-18 22:39:58 +01:00
f21ca248be Made more efficient & split view into a separate file David Taylor 2015-04-18 22:39:58 +01:00
0ba4c8982e Working version of ics interface - not very efficient David Taylor 2015-04-04 00:19:17 +01:00
980f863816 Working version of ics interface - not very efficient David Taylor 2015-04-04 00:19:17 +01:00
583b2514af Attempt using ical extension - not working David Taylor 2015-04-03 20:45:58 +01:00
5bef0226c8 Attempt using ical extension - not working David Taylor 2015-04-03 20:45:58 +01:00
defa1f9af4 Add user registration test Tom Price 2015-04-01 18:32:08 +01:00
8ebc4a25ab Add user registration test Tom Price 2015-04-01 18:32:08 +01:00
a23a04920a Add conditional to analytics code. Tom Price 2015-04-01 17:40:28 +01:00
4c6c605ce9 Add conditional to analytics code. Tom Price 2015-04-01 17:40:28 +01:00
86ba1b4780 Start work on some funational tests Tom Price 2015-04-01 17:26:06 +01:00
63e9884ef7 Start work on some funational tests Tom Price 2015-04-01 17:26:06 +01:00
4a8da69686 Add event pricing tests Tom Price 2015-04-01 17:09:06 +01:00
e627441f09 Add event pricing tests Tom Price 2015-04-01 17:09:06 +01:00
f8ced4c169 Add item ordering test Tom Price 2015-03-31 23:43:06 +01:00
884281db50 Add item ordering test Tom Price 2015-03-31 23:43:06 +01:00
b0b438250e Add item total cost test Tom Price 2015-03-31 22:13:31 +01:00
298d8c7b0d Add item total cost test Tom Price 2015-03-31 22:13:31 +01:00
29edd92c09 Add person <-> organisations Tom Price 2015-03-31 22:06:56 +01:00
fc367243df Add person <-> organisations Tom Price 2015-03-31 22:06:56 +01:00
e2ab112f7b Add person, organisation related tests Tom Price 2015-03-31 22:00:35 +01:00
7cd9bf28f9 Add person, organisation related tests Tom Price 2015-03-31 22:00:35 +01:00
23bf81fb8f Add reverse relation tests. Add status tests. Tom Price 2015-03-31 21:56:39 +01:00
c647094a87 Add reverse relation tests. Add status tests. Tom Price 2015-03-31 21:56:39 +01:00
ca015c4f94 Add current event events test: FAILING. Tom Price 2015-03-31 19:05:09 +01:00
c584cf8168 Add current event events test: FAILING. Tom Price 2015-03-31 19:05:09 +01:00
22f33013ec Add events and check count/rig_count Tom Price 2015-03-31 18:44:45 +01:00
1d14db165a Add events and check count/rig_count Tom Price 2015-03-31 18:44:45 +01:00
4f6d2333c0 Add VatRate model tests Tom Price 2015-03-31 18:01:15 +01:00
32647e7281 Add VatRate model tests Tom Price 2015-03-31 18:01:15 +01:00
c0522728fe Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs Tom Price 2015-03-31 16:50:43 +01:00
8c135fbc18 Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs Tom Price 2015-03-31 16:50:43 +01:00
d13d872c20 Update new item rows buttons with data. Issue #48 Tom Price 2015-03-31 16:50:19 +01:00
fbabed8be5 Update new item rows buttons with data. Issue #48 Tom Price 2015-03-31 16:50:19 +01:00
6dc101a961 Changed to wavatar default David Taylor 2015-03-31 16:50:14 +01:00
80e8efc763 Changed to wavatar default David Taylor 2015-03-31 16:50:14 +01:00
0940d9f275 Bug fix for incorrectly formatted dates issue #47 Tom Price 2015-03-31 16:40:15 +01:00