PyRIGS

arona/PyRIGS

Fork 0

mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-18 22:12: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

9c06f9f9f9 Remove uneeded linebreaks to make it easier to trace what is going on. Tom Price 2015-05-31 23:04:59 +01:00
b92b1bdf78 Remove uneeded linebreaks to make it easier to trace what is going on. Tom Price 2015-05-31 23:04:59 +01:00
ce0ac7f44b Add missing dry hire 11. Tom Price 2015-05-31 23:04:29 +01:00
f90191a53e Add missing dry hire 11. Tom Price 2015-05-31 23:04:29 +01:00
ec424f2db3 Fix for incorrect logic in current dry hires Tom Price 2015-05-31 23:01:52 +01:00
37fe98b801 Fix for incorrect logic in current dry hires Tom Price 2015-05-31 23:01:52 +01:00
e2b352557c Change the way current events are tested Tom Price 2015-05-31 22:57:17 +01:00
381f646f8e Change the way current events are tested Tom Price 2015-05-31 22:57:17 +01:00
f8e17da645 Merge master into testing Tom Price 2015-05-31 22:37:20 +01:00
4d93e05257 Merge master into testing Tom Price 2015-05-31 22:37:20 +01:00
a8331261f0 Merged in hotfixes (pull request #42) Tom Price 2015-05-31 16:35:06 +01:00
6e62f3da48 Merged in hotfixes (pull request #42) Tom Price 2015-05-31 16:35:06 +01:00
0bc97e1705 Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes Tom Price 2015-05-31 16:31:57 +01:00
64e2402ede Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes Tom Price 2015-05-31 16:31:57 +01:00
6bfcbeb8aa Fix for #140 Tom Price 2015-05-31 16:31:38 +01:00
ec0e9652d5 Fix for #140 Tom Price 2015-05-31 16:31:38 +01:00
f42628d23f Fixed too many save buttons #99 David Taylor 2015-05-29 17:00:59 +01:00
1a24897411 Fixed too many save buttons #99 David Taylor 2015-05-29 17:00:59 +01:00
2da8980be4 Fix for postgres requring an explicit definition of what the output field type is with summing mixed fields Tom Price 2015-05-29 15:59:08 +01:00
82ea08ad51 Fix for postgres requring an explicit definition of what the output field type is with summing mixed fields Tom Price 2015-05-29 15:59:08 +01:00
0f2733c2f1 Merge branch 'hotfixes' Tom Price 2015-05-29 15:48:29 +01:00
fea986dc91 Merge branch 'hotfixes' Tom Price 2015-05-29 15:48:29 +01:00
3dc82e2de7 Add missing explicit fields definition django 1.8 realted Tom Price 2015-05-29 15:45:14 +01:00
8345ab3228 Add missing explicit fields definition django 1.8 realted Tom Price 2015-05-29 15:45:14 +01:00
bc14c0e33e Fix for changes to sum function Tom Price 2015-05-29 15:42:57 +01:00
2899c684ac Fix for changes to sum function Tom Price 2015-05-29 15:42:57 +01:00
8ed299f23f Fix for events without an MIC causing 500 errors for people with permission to view profiles. Tom Price 2015-05-29 15:20:29 +01:00
c867ce49ef Fix for events without an MIC causing 500 errors for people with permission to view profiles. Tom Price 2015-05-29 15:20:29 +01:00
187ba9113e Merge branch 'hotfixes' Tom Price 2015-05-29 02:06:58 +01:00
9fc5555a00 Merge branch 'hotfixes' Tom Price 2015-05-29 02:06:58 +01:00
e8e2178e49 Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes Tom Price 2015-05-29 02:02:33 +01:00
86b570e3e8 Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes Tom Price 2015-05-29 02:02:33 +01:00
713197b986 Change to using manifest static files as a cachebuster. Tom Price 2015-05-29 02:02:23 +01:00
ba66a418d0 Change to using manifest static files as a cachebuster. Tom Price 2015-05-29 02:02:23 +01:00
c6d15c5fca Fixed impending static files fail David Taylor 2015-05-29 02:02:11 +01:00
4b5d55c840 Fixed impending static files fail David Taylor 2015-05-29 02:02:11 +01:00
4846d858aa Prevent modal inception Tom Price 2015-05-29 01:46:12 +01:00
9063a5d0f7 Prevent modal inception Tom Price 2015-05-29 01:46:12 +01:00
ac106ef864 Add links to user page in events Tom Price 2015-05-29 01:32:07 +01:00
e0f80c38fc Add links to user page in events Tom Price 2015-05-29 01:32:07 +01:00
be7fe9ee9b Added profile Modals & links from activity feed David Taylor 2015-05-29 01:28:36 +01:00
346ee19862 Added profile Modals & links from activity feed David Taylor 2015-05-29 01:28:36 +01:00
a2bba0895b Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes Tom Price 2015-05-29 01:17:30 +01:00
d556ebabc4 Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes Tom Price 2015-05-29 01:17:30 +01:00
a1591004d7 Increase contrast in navbar Tom Price 2015-05-29 00:57:04 +01:00
fff913fffe Increase contrast in navbar Tom Price 2015-05-29 00:57:04 +01:00
7da332ed9d Added days of week David Taylor 2015-05-29 00:38:00 +01:00
3b6e905881 Added days of week David Taylor 2015-05-29 00:38:00 +01:00
e684ee0b2d Stop emails falling of the end of the world #122 Tom Price 2015-05-29 00:36:47 +01:00
622b44d5ba Stop emails falling of the end of the world #122 Tom Price 2015-05-29 00:36:47 +01:00
e72b76f972 Add item description class for indents on new items. Tom Price 2015-05-29 00:29:12 +01:00
252d48a3e1 Add item description class for indents on new items. Tom Price 2015-05-29 00:29:12 +01:00
ca3cae4af8 Change 'Collected by' to lowercase so it shows up correctly in the activity feed Tom Price 2015-05-29 00:19:25 +01:00
3f373d807a Change 'Collected by' to lowercase so it shows up correctly in the activity feed Tom Price 2015-05-29 00:19:25 +01:00
cb0151fd23 Change profile to use the correct user display name. Tom Price 2015-05-29 00:12:26 +01:00
e3e1bf6892 Change profile to use the correct user display name. Tom Price 2015-05-29 00:12:26 +01:00
d5fac0d146 Add translating choice fields to correct values. Tom Price 2015-05-29 00:06:06 +01:00
e37431dddc Add translating choice fields to correct values. Tom Price 2015-05-29 00:06:06 +01:00
480cd0b820 Add appropriate linebreaks #130. Tom Price 2015-05-28 23:38:20 +01:00
7dd9dd021e Add appropriate linebreaks #130. Tom Price 2015-05-28 23:38:20 +01:00
ab905d8063 Change line about PyRIGS #127 Tom Price 2015-05-28 23:34:11 +01:00
c4715df341 Change line about PyRIGS #127 Tom Price 2015-05-28 23:34:11 +01:00
e14ce1424e Add note about contracts not being invoices. Tom Price 2015-05-28 23:33:05 +01:00
7fd1bc6e7c Add note about contracts not being invoices. Tom Price 2015-05-28 23:33:05 +01:00
6f84b8ecc1 Merge branch 'django-update' Tom Price 2015-05-28 23:02:59 +01:00
390a15c56e Merge branch 'django-update' Tom Price 2015-05-28 23:02:59 +01:00
585c47b38c Merge branch 'django-update' of bitbucket.org:nottinghamtec/pyrigs into django-update Tom Price 2015-05-28 22:59:19 +01:00
b1ed77b235 Merge branch 'django-update' of bitbucket.org:nottinghamtec/pyrigs into django-update Tom Price 2015-05-28 22:59:19 +01:00
6763f371d4 Workaround for context bug David Taylor 2015-05-28 22:41:02 +01:00
5802696229 Workaround for context bug David Taylor 2015-05-28 22:41:02 +01:00
7310c8fe3a Fix import error changed in Django 1.8 Tom Price 2015-05-28 22:28:01 +01:00
e9bbf08c87 Fix import error changed in Django 1.8 Tom Price 2015-05-28 22:28:01 +01:00
148bf399ca Added explicit field declarations to edit & update views David Taylor 2015-05-28 22:20:48 +01:00
3d6d19ffd9 Added explicit field declarations to edit & update views David Taylor 2015-05-28 22:20:48 +01:00
85f9801f23 Remove MySQL import Tom Price 2015-05-28 20:57:48 +01:00
894234f167 Remove MySQL import Tom Price 2015-05-28 20:57:48 +01:00
67d0d755f7 Removed static widget_tweaks and added to requirements David Taylor 2015-05-28 20:20:59 +01:00
a0569ae4bc Removed static widget_tweaks and added to requirements David Taylor 2015-05-28 20:20:59 +01:00
ceae2acf61 Removed url import all-together David Taylor 2015-05-28 20:17:58 +01:00
02601bed9d Removed url import all-together David Taylor 2015-05-28 20:17:58 +01:00
f78ce621d5 Removed "from future" for url imports David Taylor 2015-05-28 20:07:45 +01:00
5a47851ddb Removed "from future" for url imports David Taylor 2015-05-28 20:07:45 +01:00
cbe49fc9dd Scrap that - bad idea! David Taylor 2015-05-28 20:00:46 +01:00
6754064ebc Scrap that - bad idea! David Taylor 2015-05-28 20:00:46 +01:00
284604e4a4 Explicitly imported django.contrib.sites David Taylor 2015-05-28 19:48:20 +01:00
e8c2589790 Explicitly imported django.contrib.sites David Taylor 2015-05-28 19:48:20 +01:00
ad4784ff15 Explicitly set redirect view permanent/temporary David Taylor 2015-05-28 19:42:05 +01:00
271e52ea80 Explicitly set redirect view permanent/temporary David Taylor 2015-05-28 19:42:05 +01:00
f55adc0c40 Removed unnecessary select_related David Taylor 2015-05-28 19:36:30 +01:00
e610e28c35 Removed unnecessary select_related David Taylor 2015-05-28 19:36:30 +01:00
ec0d959f73 Remove legacy database David Taylor 2015-05-28 19:32:05 +01:00
16b2b71979 Remove legacy database David Taylor 2015-05-28 19:32:05 +01:00
1d9014ce97 Updated requirements David Taylor 2015-05-28 17:03:27 +01:00
335b815cc8 Updated requirements David Taylor 2015-05-28 17:03:27 +01:00
f4c882bc95 Fixed moronity David Taylor 2015-05-28 16:26:27 +01:00
26c074c302 Fixed moronity David Taylor 2015-05-28 16:26:27 +01:00
7a0f845284 Added easter egg event tracking David Taylor 2015-05-28 16:21:47 +01:00
cc40aeef42 Added easter egg event tracking David Taylor 2015-05-28 16:21:47 +01:00
d883f4b66e Implemented project ship David Taylor 2015-05-27 02:36:30 +01:00
8c6199ea2d Implemented project ship David Taylor 2015-05-27 02:36:30 +01:00