raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
17,016 Commits 5 Branches 0 Tags 296 MiB
Commit Graph

2542 Commits

Author SHA1 Message Date
Tomas Groth a0616ddf0f A few fixes for the alpha. 2020-01-06 21:15:11 +00:00
Tim Bentley 5aa2065741 Change Structure of OpenLP and move a test 
Signed-off-by: Tim <tim.bentley@gmail.com>
 2020-01-04 21:24:32 +00:00
Tomas Groth c20b7f5301 Fix bibleserver integration. 2020-01-03 22:50:00 +01:00
Tim Bentley 6ea4893ad6 Change Year 
Signed-off-by: Tim <tim.bentley@gmail.com>
 2020-01-01 02:53:08 +00:00
Tim Bentley 63f67f6e17 Migrate setting definitions to Core from plugins 
Signed-off-by: Tim <tim.bentley@gmail.com>
 2019-12-30 08:42:49 +00:00
Daniel 11dcf5b9ad Change transition direction 2019-12-14 11:44:42 +00:00
Daniel d00c9c8f11 Add time out to the loops and a delay in the second 
Also add RegistryProperties, don't know how it was working without that
 2019-12-12 01:03:35 +00:00
Raoul Snyman ec329eff2f Refactor the theme wizard into separate pages 
- Refactor wizard pages into external page components
- Refactor form labels into a central label with the alignment already set
- Fix some tests
- Write more tests
 2019-12-11 19:31:48 +00:00
Raoul Snyman d5fc4c5b88 Display more detailed instructions when VLC and pymediainfo are missing 
- On Fedora, mention the need for RPMFusion
- on macOS, reference the VLC website
- On other systems, just display a generic message
- Don't try to load the VLC path on macOS
 2019-12-07 11:41:30 +00:00
Tim Bentley 9fd6752a83 Try to fix paths in coverage report generation 
- Add the local path to coverage config
- Fix the paths before generating an HTML report
 2019-12-04 20:01:02 +00:00
Raoul Snyman 771e97862f Add distribution detection in is_linux() function 
- Optional argument to check Linux distro
- Add a test for the new argument
- Add some other tests to expand test coverage
- Remove Windows from testing
- If "distro" module is missing, create a replacement that returns False
 2019-12-04 18:15:24 +00:00
Daniel 7c4d9a5ffd Time out after 10 seconds in wait till loaded fn 
also fixes comment, update_preview_images() does not handle the timeout case but in reality it should never happen. (just in the case it does, it won't stall the whole application)
 2019-12-03 17:30:35 +00:00
Daniel f8ae9cf719 Change theme_list in theme manager to a dictionary containing the theme objects 
This prevents the need to read the theme file every time it's data is needed.
 2019-12-02 18:07:41 +00:00
Ee Savior 5935bbe850 core-ui-media-__init__: Create test and fix docstring error for format_milliseconds(...). Achieve 100% coverage for __init__.py module 2019-12-02 18:02:13 +00:00
Tomas Groth 4f4de6249d Do not resolve paths, since it does not work as expected on windows. 2019-11-29 17:00:12 +00:00
Tim Bentley 8838e671fc Try to fix paths in coverage report generation 
- Add the local path to coverage config
- Fix the paths before generating an HTML report
 2019-11-26 17:49:41 +00:00
Raoul Snyman 1c4052c627 Some small fixes 
- Convert the return value of 'keys' to a list so that we have an actual copy of it
- Always resolve the path returned by AppLocation
 2019-11-20 18:52:16 +00:00
Tim Bentley 35f7190e00 Try to fix paths in coverage report generation 
- Add the local path to coverage config
- Fix the paths before generating an HTML report
 2019-11-03 21:17:47 +00:00
Raoul Snyman 06339426d2 Fix presentations on Linux (and hopefully Windows too) 2019-11-03 20:46:21 +00:00
Daniel 1ac6c052c7 Fix clone theme with missing background source 2019-11-02 07:14:10 +00:00
Raoul Snyman f606838641 Pre-select a screen as the display if there is no screen config 
- Force the last screen in the list to be the display screen by default
- Always select the first screen in the widget
- Increase the size of the FTW so that it stops jumping in size
- Add some more tests for the widgets
- Refactored widgets tests into a single file
- Fix #302 properly
 2019-11-02 06:21:23 +00:00
John Morris ecaa587e44 Initial release of the test for SplashScreen.py 2019-11-01 15:44:53 +00:00
Raoul Snyman dd9701cb50 Fix issue #302 where theme previews were not being generated after the FTW 
- Fix the theme preview generation to happen in the right place after the First Run Wizard
- Mock the settings in the DisplayWindow tests to see if that helps the Arch runner
- Add tests for the new form
 2019-11-01 12:26:47 +00:00
Raoul Snyman 8cc2e3af9d Fix the tests so that the Arch runner goes back to green 2019-10-31 20:40:18 +00:00
Daniel cef0e67bd2 Allow x11 override 2019-10-30 17:33:07 +00:00
Daniel 76ff4be598 Fix "Use default location" buttons 2019-10-26 10:00:07 +00:00
Daniel d2e31c26e9 Added new values to theme.json and added logic for ui 
Also fixed normal speed not working and changed "Default" to "Normal" in the enums as it makes more sense.
 2019-10-26 09:57:00 +00:00
Simon Hanna bc51c7ca7f Do not test PyMuPDF if it's not installed 
Fixes #288
 2019-10-24 19:56:08 +02:00
Daniel c0aa199ac3 Add background_source to Theme and use it in the theme wizard 
The theme wizard (while editing a theme) now changes both background_source and background_filename then sets filename to the new cache location on apply (also added the filename_source var to Theme). The new var is needed so when the user goes to change the theme again, they see the file they selected, not the cached one. This commit fixes the issue of changing theme backgrounds not deleting the cached file but deleting the original file.
 2019-10-23 22:54:29 +00:00
Raoul Snyman 1c4224e3d7 Skip certain tests if we're running on GitLab or AppVeyor 2019-10-18 16:54:00 +00:00
Raoul Snyman 99d2ec7715 Create a Theme Preview dialog, plus some theme background fixes. 
- Update .gitignore to ignore virtualenvs and eggs directory
- Create a dialog to generate theme previews/thumbnails
- Use theme preview generation dialog all over
- Create a test for the new method
- Update existing theme manager tests
- Skip Bible HTTP tests when in GitLab CI
- Make theme backgrounds scale and centred
 2019-10-18 06:12:09 +00:00
Raoul Snyman 1e76868a23 Remove vim lines from files and add a .editorconfig for editors that support it 2019-10-10 15:28:16 +00:00
Raoul Snyman a1a101793d Fix issue #280 where the constructor was not accepting the custom_geometry argument 2019-10-09 08:26:42 +00:00
Tomas Groth 1e8f72d49f LiveWorship importer 2019-10-07 17:12:38 +00:00
Stoivo 6e640fe7a5 Sort the authors when exporting the songs 
I export all our songs and store it in git so I know what changes and can revert
if someone change incorrectly.
 2019-10-01 20:58:20 +00:00
Mat c6ed9e6a01 Allow searching by Song Number 2019-09-26 20:49:05 +00:00
Bastian Germann 1a756def20 Replace launchpad references 2019-09-21 13:15:11 +02:00
Bastian Germann 95a056e504 Remove some pylint occurences 2019-09-21 13:14:23 +02:00
Tim Bentley 3e5dfdb730 Add initial cleanup files for media fixes. 
Signed-off-by: Tim <tim.bentley@gmail.com>
 2019-09-21 04:56:43 +00:00
Raoul Snyman cb2ccac22c Skip the Mac LO tests on non-Mac platforms; Make detection work for a missing Pyro4 as well 
bzr-revno: 2902
 2019-09-14 08:27:40 +01:00
Raoul Snyman 25a7c6f5b3 Skip the Mac LO tests on non-Mac platforms; Make detection work for a missing Pyro4 as well 2019-09-12 23:09:19 -07:00
John Lines f2c7bf0367 put default hints plugin directory and chnage name to singingthefaith-hints.tag 2019-09-04 17:06:44 +01:00
John Lines 3c677bc077 Linting fix 2019-09-03 13:42:06 +01:00
John Lines 53bf0fe420 Merge trunk updates 2019-09-03 11:20:46 +01:00
John Lines 6b8352abea fix tests to allow for SongbookNumberInTitle defaulting to false and add hints tests 2019-09-03 10:52:09 +01:00
Tim Bentley f6713ddf52 Fix linting errors 2019-08-30 13:09:02 +01:00
Tim Bentley 19dfcc15aa Head 2019-08-30 10:32:05 +01:00
Tim Bentley 9e376c1e85 updates 2019-08-30 10:23:12 +01:00
Raoul Snyman 2557eeeaa6 Changed button to say 'Contribute', moved some text around, removed some unnecessary text 2019-08-22 20:21:15 -07:00
John Lines 4cbc4c9d82 Merge trunk updates 2019-08-12 07:34:02 +01:00
Phill a950a9bcce fixes 2019-08-06 22:33:43 +01:00
Phill dd4d9b9255 Add a singletom Metaclass 2019-07-20 13:27:28 +01:00
Phill 4f0ee2b0d3 Minor fixes and changes 
bzr-revno: 2887
 2019-07-19 19:43:14 +01:00
John Lines 2e89ec1f29 enable whole song impoerter test 2019-07-19 12:11:16 +01:00
John Lines 9cdf4faa5b Merge trunk updates 2019-07-19 11:51:25 +01:00
Phill c1ff239002 Lint fix 2019-07-18 20:26:54 +01:00
Phill ba99025a5f Fix tests 2019-07-18 20:14:58 +01:00
Raoul Snyman 5121431281 Add Zeroconf services to OpenLP so that external devices can find OpenLP on the network. 
bzr-revno: 2885
 2019-07-04 12:00:24 -07:00
Phill 9c35b7dcdc Minor fixes, and changes 2019-07-03 14:23:23 +01:00
Raoul Snyman 7c1eb9f24d Update test 2019-07-02 20:53:20 -07:00
Raoul Snyman 11ad9dbb22 Further refactor the code, and fix up the tests 2019-07-02 20:05:01 -07:00
Raoul Snyman 0618f63ede Added a Zeroconf service to aid devices detecting OpenLP on the network 2019-07-01 15:36:14 -07:00
John Lines d52d5bb0e2 Fix lint warning in tests and importer.py 2019-06-30 20:13:33 +01:00
john 2bfa620ebf Merge trunk updates 2019-06-29 15:04:27 +01:00
john 184462d852 Test fixed for single verse, all verses failing test not run yet 2019-06-29 14:59:03 +01:00
Phill 28da80ecf9 Fix up and improve the Words Of Worship importer 
bzr-revno: 2883
 2019-06-28 21:15:27 +01:00
Phill e81a97f582 PEP Fixes 2019-06-28 19:29:39 +01:00
Phill f79e8803c9 Word of Worship file importer fixes / rework 2019-06-28 19:09:25 +01:00
john 703eb0079b Merge trunk updates 2019-06-27 13:10:34 +01:00
john 66712873b4 Singing The Faith Importer - Add the importer, and tests 2019-06-17 09:44:34 +01:00
Tim Bentley 7143fbb8d1 Fix streaming part1 2019-06-14 18:54:04 +01:00
Raoul Snyman 596c484bd7 Add presentations through LibreOffice on macOS. 
bzr-revno: 2878
 2019-06-10 22:01:02 -07:00
Tomas Groth 04d3efef9e fix some broken tests 2019-06-07 23:05:02 +02:00
Raoul Snyman 7819a9eb02 Fix license issues 2019-06-04 21:57:26 -07:00
Raoul Snyman bae4cb2a44 HEAD 2019-06-04 21:53:18 -07:00
Phill 52eb196e5b PEP8 2019-05-31 21:19:15 +01:00
Phill cdf29876e2 More media clean-up 2019-05-26 21:53:54 +01:00
Phill c2550777c3 VLC extension tidyups 2019-05-26 11:30:37 +01:00
Phill c901ec3d75 Move suffixes from list to set, remove VlcPlayer.is_active as it was never ser 2019-05-24 23:11:11 +01:00
Phill 3476174313 Pep fix 2019-05-23 20:49:13 +01:00
Phill 5482e70e6d Break out json and path refactors from fixes branch 2019-05-22 07:47:00 +01:00
Raoul Snyman 3d18478ac7 Fix up the tests 2019-05-18 08:56:22 -07:00
Raoul Snyman 8029a8b767 HEAD 2019-05-17 21:56:15 -07:00
Raoul Snyman bb6b2b32b9 HEAD 2019-05-10 10:08:32 -07:00
Tim Bentley 9e22ed86e3 remove unneeded test 2019-05-08 14:58:06 +01:00
Phill 0f640368e1 Just to trigger the tests :-) 
bzr-revno: 2867
 2019-05-07 17:56:21 +01:00
Tim Bentley a7821bdd26 rename additions to arguments 2019-05-04 20:47:06 +01:00
Phill 5cb0d2a772 test fix 2019-05-04 19:13:57 +01:00
Phill 1d736a58f5 Fix up tests 2019-05-04 13:05:53 +01:00
Phill 7aa7e5c635 Move some changes out of annother branch 2019-05-04 12:49:20 +01:00
Phill 15f3b0fcca Seperate some fixes out of annother branch 2019-05-04 10:13:29 +01:00
Tim Bentley feaee351b2 head 2019-05-03 18:26:37 +01:00
Bastian Germann db9cc8c310 Add PyMuPDF as additional PDF controller and missing mupdf file formats 
bzr-revno: 2864
 2019-05-02 14:47:05 -07:00
Bastian Germann 3e23de5bbe Make pylint happy 2019-05-02 19:11:55 +02:00
Bastian Germann 605eadb0c2 Add epub, cbz, and fb2 support to pdf controller 2019-05-02 15:45:07 +02:00
Bastian Germann 1c23a1f372 Make PDF tests run for each backend 2019-05-02 15:12:45 +02:00
Bastian Germann 2ed038ee2e Make PyMuPDF mandatory for tests 2019-05-02 12:35:29 +02:00
Tomas Groth 5f63b1297f trunk 2019-05-01 21:22:01 +02:00
Tomas Groth 85879122ab Implement suggestions and fix test. 2019-05-01 21:19:21 +02:00
Tomas Groth e14dd69817 trunk 2019-04-30 21:02:42 +02:00
Bastian Germann d74e5203c3 Merge HEAD 2019-04-28 21:21:23 +02:00
Tim Bentley e607a95b86 Fix tests 2019-04-21 09:53:59 +01:00
Bastian Germann be1a398f7b License change to GPL-3.0-or-later 2019-04-13 15:00:22 +02:00
Tomas Groth f669b8cd7e Followup fix... 2019-04-13 10:24:15 +02:00
Tim Bentley 49384aa672 head 2019-04-09 19:35:10 +01:00
Samuel Mehrbrodt b478b4e58f Make footer configurable 
bzr-revno: 2854
 2019-04-08 23:07:24 -07:00
Samuel Mehrbrodt 68ebb22d17 Merge trunk 2019-04-08 23:03:57 +02:00
Phill 98f7c28d65 Add proxy settings to ftw. Option to skip sample data 
bzr-revno: 2853
 2019-03-28 22:03:32 +01:00
Tim Bentley ae2109e509 fix pep8.5 2019-03-27 18:59:03 +00:00
Tim Bentley b7bb59a837 vlc tests pass 2019-03-27 17:46:12 +00:00
Raoul Snyman bddc3f02dc Just skip the darn test 2019-03-26 22:52:15 -07:00
Raoul Snyman a69ff65bfc Duh. Height 2019-03-26 10:03:09 -07:00
Raoul Snyman 386985349d The width of the PDF is not the same as the width of the screen 2019-03-26 09:45:10 -07:00
Raoul Snyman 136735c53f Get the screen resolution directly from Windows and X11, or return the previous resolution 2019-03-25 15:16:45 -07:00
Raoul Snyman efa446a356 Get the screen resolution directly from macOS, or return the previous resolution 2019-03-25 14:26:48 -07:00
Tim Bentley f849b0eeb0 head 2019-03-25 21:24:51 +00:00
Philip Ridout eb115a0ad4 More pathlib clean ups 2019-03-17 10:01:52 +00:00
Philip Ridout e1d2c67f33 HEAD? 2019-03-15 20:56:32 +00:00
Philip Ridout 056b902cf9 PEP8 2019-03-15 20:47:47 +00:00
Philip Ridout 50598e9058 pathlib cleanups 2019-03-10 21:01:39 +00:00
Philip Ridout 0578ab8908 Test fix 2019-03-09 07:06:00 +00:00
Philip Ridout 07a61c57e6 HEAD 2019-03-09 06:59:19 +00:00
Philip Ridout 87216707d3 Test fixes 2019-03-09 06:58:52 +00:00
Philip Ridout 1523d9ffa6 mac test fix? 2019-03-08 22:51:27 +00:00
Philip Ridout fc8255d658 PEP fixes 2019-03-08 21:00:16 +00:00
Ken Roberts cc4b8e4242 PJLink2 Update U 2019-03-08 07:19:57 -08:00
Tomas Groth 07ebc22fa7 Update the appveyor build script. Fix various bugs that caused the frozen app from working. 
bzr-revno: 2848
 2019-03-07 21:51:00 +01:00
Bob Luursema 490f9bbe15 Fix linting 2019-03-05 22:21:12 +01:00
Bob Luursema c68d6dc3de Fixed bug 1800761 2019-03-05 21:55:37 +01:00
Bob Luursema 2a6378f489 Almost fixed bug 1800761 2019-03-04 21:37:11 +01:00
Tomas Groth d7e4798b96 trunk 2019-03-04 21:33:43 +01:00
Philip Ridout c761592095 Catch some OSErrors to provide user friendly error messages. Few other minor fixes 
Fixes: https://launchpad.net/bugs/1650910
 2019-03-03 09:49:01 +00:00
Philip Ridout f3485513f1 Test and PEP8 fixes 2019-02-27 22:14:08 +00:00
Philip Ridout 670c06db60 Add proxy settings button to FTW, ftw refactors, a few fixes! 2019-02-27 21:12:16 +00:00
Samuel Mehrbrodt fcf4cb1c5c Merge trunk 2019-02-21 22:26:36 +01:00
Philip Ridout bd99cee8fd minor changes 2019-02-16 08:57:11 +00:00
Philip Ridout d15bf8fc4c test fixes 2019-02-15 22:44:13 +00:00
Philip Ridout 9b2ef7d8f7 PEP8 2019-02-15 20:47:09 +00:00
Philip Ridout 8bc6cfc1a5 HEAD 2019-02-15 20:12:59 +00:00
Philip Ridout 097225c9d7 Code change for json config file. Titulate themes ftw page 2019-02-15 20:12:28 +00:00
Tomas Groth b10aa24119 Attempt to fix appveyor tests 2019-02-14 22:19:26 +01:00
Tim Bentley fc579f120a Head 2 2019-02-14 19:42:34 +00:00
Tim Bentley c0d328dc06 Head 2019-02-14 19:40:35 +00:00
Tomas Groth fa4ec96054 Updated to 2019 in copyright headers 2019-02-14 16:09:09 +01:00
Raoul Snyman d99c2f6996 Migration from WebKit to Webengine. Also introduced reveal.js for slide rendering, new screen setup dialogs and many other changes. 
bzr-revno: 2844
 2019-02-14 00:04:30 -07:00
Raoul Snyman 465ff767d6 Fix an unused import and some incorrect patch()s 2019-02-13 14:36:37 -07:00
Tomas Groth 5ac8bbc3f2 Even more pep8 fixes and removed the old htmlbuilder. 2019-02-13 22:19:24 +01:00
Tomas Groth 31ed94d88c pep8 fixes 2019-02-13 21:28:10 +01:00
Tomas Groth 927b68dc95 Fix more tests 2019-02-13 20:41:10 +01:00
Tim Bentley 4547b7b4eb fix up tests 2019-02-12 19:55:08 +00:00
Philip Ridout e62cfc64b8 Fix FTW tests 2019-02-11 21:21:22 +00:00
Samuel Mehrbrodt cf8feead1b Merge trunk 2019-02-08 12:22:39 +01:00
Kyle Nweeia 652b94e1ac Fixed bug #1678632 - SongSelect Importer Infinite Loop. 
bzr-revno: 2843
Fixes: https://launchpad.net/bugs/1678632
 2019-02-06 21:34:55 +01:00
Tomas Groth 2e93377cd3 Fix a few tests. 2019-02-06 21:26:33 +01:00
Tim Bentley 4151c0b79f remove THIS 2019-02-03 09:19:04 +00:00
Tim Bentley 8de6ff8832 Fixed trunk merge so now matches that. 2019-01-31 21:34:20 +01:00
Raoul Snyman 64251747fb HEAD 2019-01-29 10:27:34 -07:00
Tim Bentley f1c7664125 Merge media trunk and fix up 2019-01-27 14:42:23 +00:00
Philip Ridout af41798128 Make screen selection reusable 2019-01-26 08:17:07 +00:00
Tim Bentley 469a888563 clean ups and settings 2019-01-20 17:58:41 +00:00
Tim Bentley 392bfba099 pep8 2019-01-04 20:11:12 +00:00
Tim Bentley 953f0bae34 try again 2019-01-04 19:48:42 +00:00
Tim Bentley f0e19b2a09 try again 2019-01-04 18:28:39 +00:00
Tim Bentley 9ded7b43f6 try again 2019-01-04 18:25:43 +00:00
Tim Bentley 9027e92e0f fixes 2018-12-22 14:42:19 +00:00
Tim Bentley 0037ae4b6d fixes 2018-12-22 14:38:04 +00:00
Tim Bentley 3bfa92cd47 fix bits 2018-12-21 15:42:12 +00:00
Tim Bentley 7be849681a fix bits 2018-12-21 15:33:46 +00:00
Tim Bentley 0f538250b9 fixes 2018-12-15 08:31:16 +00:00
Tim Bentley 4316245f36 fixes 2018-12-15 08:15:19 +00:00
Tim Bentley 6fd940558d fixes 2018-12-15 08:07:11 +00:00
Kyle Nweeia 98bc575ba2 2018-12-13 20:46:55 -05:00
Kyle Nweeia ea14f6cea8 2018-12-13 20:27:59 -05:00
Tim Bentley 65739d1b95 test fixing 2018-12-13 19:29:13 +00:00
Tim Bentley 71c1051f88 test fixing 2018-12-13 19:25:20 +00:00
Tim Bentley efa1114fa6 test fixing 2018-12-13 19:06:25 +00:00
Tim Bentley d9a84baa6e Fix tests 2018-12-11 21:33:44 +00:00
Tim Bentley 79eca4756a Fix tests 2018-12-11 21:20:32 +00:00
Tim Bentley dd8503e435 Fix tests 2018-12-11 21:11:52 +00:00
Tim Bentley 17e78236c4 Fix tests 2018-12-11 21:06:48 +00:00
Tim Bentley a64036c8c1 Fix tests 2018-12-11 21:01:03 +00:00
Tim Bentley 36fd65f98c Fix tests 2018-12-11 20:52:17 +00:00
Tim Bentley 2868320d9d Fix tests 2018-12-11 20:39:56 +00:00
Tim Bentley 3478d18ad0 Fix tests 2018-12-11 20:19:30 +00:00
Tim Bentley ee4cdcc9e7 Fix tests 2018-12-11 20:00:33 +00:00
Tim Bentley dbd3d8f0ef Fix tests 2018-12-11 19:45:27 +00:00
Tim Bentley 47236b0238 Fix tests 2018-12-11 19:35:35 +00:00
Tim Bentley e224352846 Fix tests 2018-12-11 18:19:48 +00:00
Tim Bentley 88f413e700 Fix tests and code 2018-12-02 14:00:17 +00:00
Tim Bentley cfc18d5c1a Fix tests and code 2018-12-02 13:51:24 +00:00
Tim Bentley c7fe441087 Fix tests and code 2018-12-02 10:19:07 +00:00
Tim Bentley eeefc81174 Fix tests and code 2018-12-02 10:09:01 +00:00
Tim Bentley c1c8f3e75d Fix tests and code 2018-12-02 09:49:30 +00:00
Tim Bentley 65fb592d1f Fix tests and code 2018-12-02 09:20:06 +00:00
Tim Bentley c24fb0cb59 Fix tests and code 2018-12-02 08:39:53 +00:00
Tim Bentley fc675e9c99 fix up tests 2018-12-01 14:41:40 +00:00
Tim Bentley 746ec03e15 fix up tests 2018-12-01 14:35:35 +00:00
Tim Bentley 95bdfc1f64 head 2018-12-01 14:10:47 +00:00
Raoul Snyman e58e0ee485 Fix all the tests 2018-11-30 22:52:49 -07:00
Raoul Snyman 56f76b1179 Fixed up some more tests 2018-11-15 21:34:49 -07:00