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

• f5bf40bd9b Proof of concept discourse authentication David Taylor 2016-11-02 02:43:16 +00:00
• 289b30e823 Merge pull request #271 from nottinghamtec/hotfix/duplicate-message David Taylor 2016-10-23 14:15:08 +01:00
• b939bc5a64 Do not display "not saved" message when the event has been saved David Taylor 2016-10-23 14:05:25 +01:00
• 5e8f2312d3 Merge pull request #270 from nottinghamtec/po-duplicate David Taylor 2016-10-23 13:06:29 +01:00
• 90c8b19915 Added tests for PO non-duplication David Taylor 2016-10-23 12:45:27 +01:00
• d82ef3f8d1 Merge branch 'master' into master David Taylor 2016-10-23 12:36:29 +01:00
• fc006dc53e Merge pull request #269 from johnathan99j/patch-1 David Taylor 2016-10-23 12:36:10 +01:00
• 3ce191aaf2 Update README.md Johnathan Graydon 2016-10-23 12:26:35 +01:00
• 6fc89727f2 Stop PO number from duplicating when copying event Johnathan Graydon 2016-10-21 15:45:29 +01:00
• b235ac540f Merge pull request #265 from nottinghamtec/ra-link David Taylor 2016-10-19 10:35:58 +01:00
• 97decf8c52 Add link to pre-event RA Sam Osborne 2016-10-19 00:54:42 +01:00
• 97cdf34c18 Merge pull request #263 from nottinghamtec/feature/forum-embed David Taylor 2016-10-11 18:56:02 +01:00
• 92c77c07e0 Fix tailing line breaks Tom Price 2016-10-11 18:47:13 +01:00
• 0541a70cec Fixed event title link (_blank) David Taylor 2016-10-09 11:30:13 +01:00
• e0cb2f4925 Linked RIGS title David Taylor 2016-10-09 11:26:32 +01:00
• 68a46af1a8 Fixed rounded corner fail David Taylor 2016-10-09 11:22:34 +01:00
• f61158b9c0 Rounded corners, transparent background David Taylor 2016-10-09 11:20:43 +01:00
• 88954eca5c Removed weird background from embed David Taylor 2016-10-09 10:40:18 +01:00
• 3fc04616b3 Added test for cookie warning David Taylor 2016-10-09 10:36:30 +01:00
• 2d5f768523 Added cookie check with nice error message David Taylor 2016-10-09 10:32:58 +01:00
• 5949ff74ec Added javascript cookie check, if blocked, login in new tab David Taylor 2016-10-08 22:55:27 +01:00
• 879ecd1f6d Made font size smaller in embed David Taylor 2016-10-08 21:49:03 +01:00
• 0e72c3f896 Made pretty, and made embedding accessible to non-keyholders David Taylor 2016-10-08 21:38:12 +01:00
• b93a716a3b Added unit tests David Taylor 2016-10-08 20:37:01 +01:00
• 0d92c3812a Tidied up python David Taylor 2016-10-08 19:56:56 +01:00
• fc110a0bff Fixed padding David Taylor 2016-10-08 19:55:31 +01:00
• 008edd8bee Lots of tidying up, moved inline CSS into SCSS David Taylor 2016-10-08 19:32:45 +01:00
• ac7e85c24a PEP8 and comments David Taylor 2016-10-08 17:30:23 +01:00
• 73b8ce4add Revert "Added decorator for X-Frame header" David Taylor 2016-10-08 17:19:35 +01:00
• 511ce554b1 Revert "Try allow-from header (limited browser support)" David Taylor 2016-10-08 17:19:27 +01:00
• 536842971d Revert "Try just removing the header, this should work in all browsers" David Taylor 2016-10-08 17:19:18 +01:00
• 3e224a33a7 Try just removing the header, this should work in all browsers David Taylor 2016-10-08 17:14:29 +01:00
• 3f4c362bfa Try allow-from header (limited browser support) David Taylor 2016-10-08 17:01:37 +01:00
• 8a838aa4bd Added decorator for X-Frame header David Taylor 2016-10-07 02:51:08 +01:00
• 7e379b33db Fixed login autofocus and error messages David Taylor 2016-10-07 02:24:24 +01:00
• 5e9f7e2c63 More prettying David Taylor 2016-10-06 17:00:45 +01:00
• 3f752cd7b7 Made embed prettier David Taylor 2016-10-06 16:48:19 +01:00
• 25a3ef3f0c Don't login in new window David Taylor 2016-10-06 16:15:53 +01:00
• 1b28efb6af Allow the embedded login to be embedded (useful feature) David Taylor 2016-10-06 16:10:51 +01:00
• 441a2be0b8 Added embedded login, and all iframe links open in new tab David Taylor 2016-10-06 16:08:01 +01:00
• 1bdc4bd293 Fixed description = none in embed David Taylor 2016-10-06 13:22:47 +01:00
• f0bb4c5b02 Move exemption to urls.py (cleaner) David Taylor 2016-10-06 13:13:09 +01:00
• 4660322964 Remove hardcoded URL David Taylor 2016-10-06 13:04:33 +01:00
• 59efc2c485 Fixed JSON David Taylor 2016-10-06 12:59:37 +01:00
• 69b0ff9fae Made embed page, with clickjacking protection turned off David Taylor 2016-10-06 12:52:33 +01:00
• 4b94ea7ef2 Made login redirect JS for event detail David Taylor 2016-10-06 12:02:44 +01:00
• 0244f5cfca Restored login security to events David Taylor 2016-10-05 10:42:49 +01:00
• 17c7a3c524 Made embed tag use absolute URL David Taylor 2016-10-05 10:39:50 +01:00
• a02087bf2a Fixed fail David Taylor 2016-10-04 21:11:43 +01:00
• 585f909d3f Escape JSON David Taylor 2016-10-04 21:05:07 +01:00
• eb10c8e21f Add meta to detail page David Taylor 2016-10-03 23:13:25 +01:00
• f7ea0cb834 Remove security from event detail (for testing in staging) David Taylor 2016-10-03 23:09:57 +01:00
• 64f3842a13 Added iframe to embed David Taylor 2016-10-03 23:02:19 +01:00
• 6370679b62 Initial proof of concept David Taylor 2016-10-03 22:45:57 +01:00
• e77728c52c Merge pull request #260 from nottinghamtec/subhire-form David Taylor 2016-09-22 13:40:05 +01:00
• 92f4e26883 Added link to subhire form Sam Osborne 2016-09-22 12:58:43 +01:00
• a93f337d17 Fixed random line break hotfix/formatting David Taylor 2016-08-09 20:57:48 +01:00
• bd0832f284 Revert changes that crossed over from feature/ember branch Tom Price 2016-08-09 19:48:47 +01:00
• 567f899a39 Reformat all the things Tom Price 2016-08-09 19:42:39 +01:00
• f0f88470a1 Fix jQuery-ui fails feature/ember Tom Price 2016-08-09 18:40:47 +01:00
• 60cf5dbb71 Convert event forms to be partially embery. Tom Price 2016-08-09 18:26:16 +01:00
• bccd82c6aa Move navbar to it's own included file Tom Price 2016-08-09 16:39:34 +01:00
• b8af1e255b Fix ember config Tom Price 2016-08-09 16:10:24 +01:00
• e0eb408664 Cleanup and delete old asset files Tom Price 2016-08-09 15:57:05 +01:00
• 27f86c427f Fix ember-bootstrap fonts. Tom Price 2016-08-09 15:53:07 +01:00
• d051f230dc Enable ajax-bootstrap-select. Tom Price 2016-08-09 15:46:08 +01:00
• b194feb36b Add SCSS to ember project Tom Price 2016-08-09 15:24:52 +01:00
• abc0394724 Reconfigure statilfiles for ember. Tom Price 2016-08-09 14:28:57 +01:00
• 8e679b3885 Fix a few ember init fails. Tom Price 2016-08-09 13:34:27 +01:00
• bfdf0cabbe Add ember to project Tom Price 2016-08-09 13:18:19 +01:00
• 024f08562b Merge pull request #254 from nottinghamtec/hotfix/newrig-overflow davidtaylorhq 2016-07-14 08:21:21 +01:00
• b4246fe170 Fix for MIC field overflowing the bottom of the panel #218 Tom Price 2016-07-14 00:04:09 +01:00
• fc6db5bff2 Heroku Staging Setup (#250) davidtaylorhq 2016-07-13 23:19:31 +01:00
• c5d3e7c0f2 Merge pull request #252 from nottinghamtec/hotfix/register-emails davidtaylorhq 2016-07-12 23:18:19 +01:00
• 10b57adb37 Merge branch 'master' into hotfix/register-emails Tom Price 2016-07-11 23:35:49 +01:00
• 4f839d05f9 Fix issues with special characters in registration email subject. Tom Price 2016-07-11 23:28:15 +01:00
• 84393e9e4a Modify user creation test to replicate special character issue in #251 Tom Price 2016-07-11 23:26:43 +01:00
• b94cef92d2 Update selenium due to OS X based firefox issue Tom Price 2016-07-11 23:26:12 +01:00
• 10c04be051 Merge branch 'feature/heroku-review' (needs to be in master) David Taylor 2016-07-11 20:17:21 +01:00
• 7ecd6212ac Initial commit of app.json (for heroku review apps) David Taylor 2016-07-11 20:15:48 +01:00
• 11180e507c Merged branch develop into master Tom Price 2016-07-11 13:11:37 +01:00
• 1c90ce5b41 Merged feature/invoiceDelete into develop Tom Price 2016-07-11 13:08:47 +01:00
• 11dd9ad02f Add tmp directory to gitignore Tom Price 2016-07-11 13:08:05 +01:00
• db571d5df0 Merged branch develop into search Tom Price 2016-07-11 12:48:34 +01:00
• 27c0deaba3 Add codeclimit coverage reporting Tom Price 2016-07-11 12:44:47 +01:00
• 4c09258566 Enable code climate Tom Price 2016-07-11 12:40:39 +01:00
• 7d14429d84 Update status badges Tom Price 2016-07-11 12:38:43 +01:00
• 190825f5ef Tidy up coverage to use a .coveragerc file instead of having it .travis.yml Tom Price 2016-07-11 12:34:51 +01:00
• 021edfd39d Filter coverage down to just our code Tom Price 2016-07-11 12:27:00 +01:00
• 3052f28329 Enable coveralls reporting Tom Price 2016-07-11 12:15:17 +01:00
• 4cec20e357 Add collect static command Tom Price 2016-07-11 12:07:19 +01:00
• 8a0cbe32bd Remove erroneous travis pip command. Tom Price 2016-07-11 12:03:21 +01:00
• 8a3a52a21b Add missing pip commands. Tom Price 2016-07-11 12:02:16 +01:00
• 98a9b22e0e Switch to using travis for builds Tom Price 2016-07-11 11:58:56 +01:00
• e35f3daa09 Made single search box for all search types David Taylor 2016-07-10 14:55:26 +01:00
• d2fbdd8d97 Added search help page (very pretty) David Taylor 2016-07-10 14:02:56 +01:00
• 74bb5d2792 Made invoice archive sort by reverse invoice date (rather than order added to database) David Taylor 2016-07-10 13:56:05 +01:00
• ce3acf6b76 Added invoice search to home page (if you have permissions) David Taylor 2016-07-10 13:55:29 +01:00
• 93458ea5a9 Set default ordering of people, organisations & venues to alphabetical (rather than order of addition to database) David Taylor 2016-07-10 13:40:07 +01:00
• 472996545b Stopped 404 on failed search David Taylor 2016-07-10 12:50:59 +01:00