Tim Bentley
33fe52cae1
tidy ups
2017-06-11 20:41:34 +01:00
Tim Bentley
e0308bfce5
start to change error handling
2017-06-10 11:53:52 +01:00
b0af7fdd2e
Revert songs.upgrade, move pjlink_list from class to __init__
2017-06-09 22:57:00 -07:00
Tim Bentley
be145b7675
handle the version from the web site
2017-06-09 21:53:13 +01:00
Tim Bentley
da51b046b2
Head
2017-06-09 16:56:40 +01:00
Tim Bentley
fbcef30044
settings tab
2017-06-09 16:55:39 +01:00
79ad031272
Fix missing sqlalchemy exception import
2017-06-09 07:04:52 -07:00
208c1b022f
Test for db upgrade skip
2017-06-09 06:45:18 -07:00
4b22def91d
More db fixes
2017-06-09 05:12:39 -07:00
Philip Ridout
c0f2a9a777
HEAD
2017-06-09 07:06:49 +01:00
Tim Bentley
e7fa46b5f5
move websocket to asynio
2017-06-08 20:56:19 +01:00
Azaziah
80d30bf272
Fixed bugs:
...
Bug #1639860 : Close button is disabled in numerous windows
Bug #1652559 : Find duplicates wizard does not reset cursor if closed from "x" instead of "cancel" button and causes traceback on exit
Bug #1666272 : Linked audio "next" button results in traceback
Bug #1678292 : Space after Bible book name auto-completion is missing
Bug #1694732 : wizard sub title does not wrap
Bug #1695268 : Bibles plugin fails to load due to invalid "last search type"
Bug: If Bible book name contains dot aft...
bzr-revno: 2749
2017-06-08 19:17:14 +01:00
Tim Bentley
1c4f335f23
head without some chords stuff!
2017-06-06 21:58:12 +01:00
Tim Bentley
08a135de78
sort out ftw
2017-06-06 21:45:59 +01:00
Tim Bentley
6d375de3db
move deploy and fix tests
2017-06-06 21:35:57 +01:00
Olli Suutari
48c6810f0c
- Added a test for checking that next calls the next playlist item
2017-06-05 21:22:14 +03:00
Olli Suutari
798f3738b8
Value of old last used Bible search type is no longer transferred to settings since it's invalid and gets replaced on boot anyways.
2017-06-05 09:05:54 +03:00
Jonathan Springer
f0d528954d
merge trunk
2017-06-04 14:22:58 -04:00
Olli Suutari
89856d78b2
two pep8 fixes
2017-06-04 17:30:10 +03:00
Olli Suutari
d247cf2388
Fixed bug: https://bugs.launchpad.net/openlp/+bug/1694732
2017-06-04 17:03:41 +03:00
Olli Suutari
c135028b46
Fixed bug https://bugs.launchpad.net/openlp/+bug/1666272
...
By renaming: self.playerlist.next() to self.playlist.next()
in maindisplay.py derf next(self)
2017-06-04 15:26:50 +03:00
Olli Suutari
f8b32578f4
Fixed 32 missing "x" buttons for closing windows and forms. (Left it unavailable for bug report.)
2017-06-04 15:14:23 +03:00
Olli Suutari
3ae8caceb0
Added "last search type" to obsolete settings list.
2017-06-04 14:19:19 +03:00
Olli Suutari
3e70173be4
Renamed "last search type" to "last used search type"
2017-06-04 12:52:15 +03:00
9f8433a18e
Merge trunk
2017-06-01 15:36:38 -07:00
0fc49e3df1
Translations and more minor cleanups
2017-06-01 15:35:57 -07:00
Philip Ridout
2915a8f0e7
Head
2017-06-01 07:18:47 +01:00
80369c8b0b
pylint fixes - minor cleanups
2017-05-30 16:26:37 -07:00
Tim Bentley
21af845791
Finally got round to finishing the Theme clean up from 2,2!
...
Themes now save to JSON and read XML or JSON so fully compatible with 2.4.
Add this to your merge proposal:
--------------------------------
lp:~trb143/openlp/themecleanup (revision 2743)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2036/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1946/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1875/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analy ...
bzr-revno: 2744
2017-05-30 22:48:41 +02:00
Philip Ridout
8b71ff765c
PEP
2017-05-30 20:54:30 +01:00
Philip Ridout
c0915fa8b6
PEP
2017-05-30 20:51:23 +01:00
Philip Ridout
a4ffbce6c3
HEAD
2017-05-30 19:50:39 +01:00
Philip Ridout
a24d5f8f15
TODO's TODOne, and a few other cleanups
2017-05-30 19:42:35 +01:00
Tim Bentley
fc5c6561e7
Minor tweeks
2017-05-30 14:55:39 +01:00
Jonathan Springer
9d43c19a03
Fix transparent display on macOS
2017-05-29 12:33:22 -04:00
Jonathan Springer
fdcb8ae0c7
Use media controller methods to pause and play media when hiding, blanking, and unblanking display to keep UI in sync with media state.
2017-05-29 12:31:14 -04:00
Jonathan Springer
e9d41ebc6e
Zero position label when stopping media to match seek sliders behavior
2017-05-29 12:29:15 -04:00
Jonathan Springer
5b9171866b
Fix video backboard not being hidden when switching to next non media slide
2017-05-29 12:27:42 -04:00
Jonathan Springer
37c3f96885
Keep position label from causing seek slider and volume slider from jumping
2017-05-29 12:26:14 -04:00
Jonathan Springer
762b9fba4e
Fix system player stopping instead of pausing when asked to paused
2017-05-29 12:16:20 -04:00
3ea37800b7
Fix db.Manager upgrade/PJlink2 update D
2017-05-27 11:21:24 -07:00
Philip Ridout
48ca33092a
PEP
2017-05-26 14:44:28 +01:00
Philip Ridout
78f38780ce
head
2017-05-26 14:30:54 +01:00
Tim Bentley
2faf588c99
clean up files
2017-05-24 21:04:48 +01:00
Tim Bentley
7c1fffdf41
clean up pep8
2017-05-24 21:01:46 +01:00
Tim Bentley
3b7852b569
clean up pep8
2017-05-24 20:55:30 +01:00
Tim Bentley
32668193c6
fix up tests
2017-05-24 20:31:48 +01:00
Tim Bentley
6fe9dfeb04
Head
2017-05-23 06:00:42 +01:00
Tim Bentley
b7001116da
start to fix tests
2017-05-23 05:59:35 +01:00
Philip Ridout
c3677857e8
More all file filters
2017-05-22 20:56:54 +01:00
Philip Ridout
234ba34a5b
Head
2017-05-22 19:27:40 +01:00
Philip Ridout
47b640004e
Added some extra params to the constructor
2017-05-22 19:22:43 +01:00
Philip Ridout
f4227c93b2
Changed the allfiles filter from *.* to *
2017-05-22 17:32:24 +01:00
8ee2c0b549
-- Update test data for Class 2 tests
...
-- Update Projector() db class with new data
-- Update test_projectordb tests
-- Rename PJLink1 class to PJLink
-- Fix/update power on/off tests (Qt error not caught properly during test)
-- Remove skip from projector constants test
--------------------------------
lp:~alisonken1/openlp/pjlink2-c (revision 2739)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2020/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1930/
[SUCCESS] https://ci ...
bzr-revno: 2740
2017-05-22 17:26:45 +01:00
Phill
cf4a39732b
Fix the depreciated code, and refactor it.
...
lp:~phill-ridout/openlp/import-depreciations (revision 2736)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2013/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1923/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1859/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1239/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1097/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/226/
[FA...
bzr-revno: 2738
2017-05-22 17:25:44 +01:00
Tim Bentley
cad03b9abd
fix tests
2017-05-21 17:06:40 +01:00
Tim Bentley
0387286a93
fix up import functionality
2017-05-21 16:30:02 +01:00
Tim Bentley
fa89be414c
Clean up theme export
2017-05-21 08:11:36 +01:00
cb5c0f82a3
PJlink class 2 updates C
2017-05-19 22:51:58 -07:00
81be8f5093
- Added PJLINK_DEFAULT_CODES to pjink1 imports
...
- Refactor command class checks and methods
- Update PJLink1.get_data for UTF-8
- Added method to clear busy flags and send received data signals
- Added class check on command reply data v. stated projector class compatibility
- Added test for PJLink1.socket_abort
- Added test for PJLink1.poll_loop
- Fix regression in test_projector_process_power_on
--------------------------------
lp:~alisonken1/openlp/pjlink2-b (revision 2735)
[SUCCESS] https...
bzr-revno: 2737
2017-05-17 21:35:43 +01:00
503c6e3f69
Initial PJLink class 2 updates
...
- Converted PJLINK_DEFAULT_CODES from a static dictionary to dynamically-built dictionary
- Added _not_implemented method to be able to list future methods while updating
- Added class list to hold future method functionality
- Added class list for UDP commands
- Added test for building PJLINK_DEFAULT_CODES dictionary
- Added test for _not_implemented method
- Removed extraneous TODO
--------------------------------
lp:~alisonken1/openlp/pjlink2-a (revision 27...
bzr-revno: 2736
2017-05-17 21:34:14 +01:00
Tomas Groth
5988f1c56a
Fixed an issue and added a test.
2017-05-17 22:06:45 +02:00
23047ae354
Remove extraneous TODO
2017-05-15 09:32:20 -07:00
Philip Ridout
eedfd0dd34
pep
2017-05-15 11:24:28 +01:00
Philip Ridout
be9d9c45ff
Reworked the extension_loader function
2017-05-15 11:09:59 +01:00
Philip Ridout
70019b570b
Update and refactor dynamic import code
2017-05-14 11:11:10 +01:00
ed144657bc
PJLink class 2 updates 2
2017-05-13 02:00:29 -07:00
Tim Bentley
08a58844c6
fix editing theme load and save
2017-05-13 09:37:38 +01:00
Tim Bentley
3d1be586fe
fix editing themes
2017-05-13 09:22:48 +01:00
Tim Bentley
48a87780d4
theme clean up
2017-05-13 08:47:22 +01:00
Philip Ridout
aa794ecf66
minor stylistic changes
2017-05-13 08:35:39 +01:00
Philip Ridout
30825cb8d1
Might help to ad the new functionality!
2017-05-12 22:37:55 +01:00
Philip Ridout
353b2b3067
Implement a custom widget for editing paths
2017-05-12 22:05:50 +01:00
a5335adbc4
Initial PJLink class 2 updates
2017-05-12 02:51:56 -07:00
Tomas Groth
7f64106acb
Fix a traceback when serviceitem type isn't set
2017-05-05 20:47:19 +02:00
Theodore Frederick
a4d7ed13cc
Add Option to Ignore Aspect Ratio and Stretch Images
2017-04-30 04:26:32 -05:00
Theodore Frederick
a09a8f3edd
Stretch Images When Ignore Aspect Ratio Setting is True
2017-04-30 04:05:28 -05:00
Theodore Frederick
2c149d9e60
Stretch Images When Ignore Aspect Ratio Setting is True
2017-04-30 04:00:31 -05:00
Theodore Frederick
1abf02af6c
Updated resize_image to Optionally Ignore Aspect Ratio
2017-04-30 03:47:01 -05:00
Tomas Groth
bdfac76483
improve db cleanup
2017-04-25 21:36:37 +02:00
Tomas Groth
e9e7285b8c
remove session instead of close to release file.
2017-04-25 21:18:03 +02:00
Tomas Groth
3b46b8416d
Only convert bracket tags to chords on songs when chords are enabled.
2017-04-25 20:46:50 +02:00
Tomas Groth
55f63a0a0f
Only convert bracket tags to chords for songs.
2017-04-25 16:41:35 +02:00
Tomas Groth
d36d576dc9
Added another chord test.
2017-04-18 21:20:36 +02:00
Tomas Groth
5187b7b945
Added some tests and fixed a bug.
2017-04-11 14:44:28 +02:00
Tomas Groth
111cff72a1
trunk
2017-04-11 10:05:13 +02:00
Philip Ridout
fc9ed3bc2c
PEP Fixes
2017-04-03 21:32:13 +01:00
Philip Ridout
eee14a654a
Tests and added icon
2017-04-02 21:28:55 +01:00
Philip Ridout
53b210d9cd
Changeged 'combined' bible verses and made a seperate 'saved' list
2017-03-31 19:41:38 +01:00
fc505c2a13
Fix the author_type import properly
...
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-author_type (revision 2731)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1950/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1861/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1802/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1528/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/ ...
bzr-revno: 2730
2017-03-28 11:43:40 -07:00
4f6afb71d1
Fix the author_type import properly
2017-03-27 22:15:05 -07:00
815c32b87f
Fix a problem with loading Qt's translation files, bug #1676163
...
Fixes: https://launchpad.net/bugs/1676163
2017-03-27 17:36:54 -07:00
a2a51b95dd
Various fixes:
...
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
- Fix song database upgrades by moving upgrades 4 and 5 into 6 and writing some damage control
- Add a CHANGELOG.rst file
2017-03-22 21:43:13 -07:00
Tomas Groth
9ae1af72c7
Minor adjustsments + a test.
2017-03-17 22:12:29 +01:00
Tomas Groth
31ee3999c0
merge lastest trunk
2017-03-15 20:51:10 +01:00
324652c347
Port some bugfixes from 2.4 to trunk
2017-03-09 22:42:38 -07:00
Tim Bentley
9451e4def6
add switch to turn off servers
2017-03-05 17:43:18 +00:00
Tim Bentley
1bcb6415c1
fix tests
2017-03-05 16:55:58 +00:00
Tim Bentley
9c3195d166
fix tests
2017-03-05 16:36:16 +00:00
Tim Bentley
ef6252bf4b
FTW working and UI Strings
2017-03-05 10:02:22 +00:00
Tim Bentley
7a72b2cad4
download and deploy works
2017-03-05 09:23:28 +00:00
Tim Bentley
b3fb5764c6
fix years
2017-03-04 19:17:59 +00:00
Tim Bentley
8b0f64317c
fix up change to xdb and handle missing remotes directories
2017-03-04 09:45:14 +00:00
Tim Bentley
5d917de2f8
Head
2017-03-03 19:27:31 +00:00
f68336a49f
Make the settings dialog as small as possible
...
Fixes: https://launchpad.net/bugs/1668669
2017-03-01 17:07:16 -07:00
Tomas Groth
dbdc4a6712
Made to possible to disable chord support completely. Now everything between [ and ] is considered a chord.
2017-02-26 22:14:49 +01:00
Tomas Groth
aac10c5d2c
more chord polish...
2017-02-23 22:40:22 +01:00
Tomas Groth
cec3cf5f96
More chord polishing.
2017-02-20 22:22:17 +01:00
Tomas Groth
32794d7e97
Reintroduced span-based chord html for main and stage view.
2017-02-19 22:35:40 +01:00
Philip Ridout
162c178d6e
HEAD
2017-02-18 07:23:15 +00:00
Tomas Groth
7da6d5c686
Small fix for chord printing
2017-02-13 21:53:37 +01:00
Tomas Groth
045e12e6c4
Added support for printing chords.
2017-02-02 22:55:05 +01:00
Tomas Groth
111826dd69
Added better support for rendering formatting tags when using chords.
2017-02-02 21:32:35 +01:00
Tomas Groth
dda37552d1
More chord-table stuff..
2017-01-29 22:25:52 +01:00
Tomas Groth
c3a953ce1b
More work on using tables.
2017-01-28 23:04:16 +01:00
Tomas Groth
02d6a42ac4
fix missing end spaces
2017-01-26 22:14:19 +01:00
Tomas Groth
56d2eaa4c2
trunk
2017-01-25 22:17:27 +01:00
Tomas Groth
82aa92698e
First steps for using tables instead for spans.
2017-01-25 22:08:30 +01:00
046bfe493f
Add this to your merge proposal:
...
--------------------------------
lp:~raoul-snyman/openlp/hide-projectors (revision 2719)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1894/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1805/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1744/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1480/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1070/
[SUCCESS] https://ci.openlp.io/ ...
bzr-revno: 2720
2017-01-24 20:59:12 -07:00
Tim Bentley
8486205ee5
head
2017-01-23 19:28:41 +00:00
Tim Bentley
aa3eebfad3
updated translations
2017-01-23 18:25:41 +00:00
32328cfe6a
Hide the Projectors manager by default so that it doesn't confuse people
2017-01-22 11:12:41 -07:00
suutari.olli@gmail.com
eaacfe0ab8
In this branch:
...
- Added "Full License" field for Bibles (1623631)
- Added a setting for controlling visibility of "Written by:" (1557579)
- Added placeholder texts for Bible metadata fields
- Re-organized uistrings to alphabetical order
bzr-revno: 2716
2017-01-20 21:57:54 +01:00
Tim Bentley
ad788f5ee7
Fix up date in about form
2017-01-11 20:03:04 +00:00
Olli Suutari
1c2ea31112
- Merged trunk on 8.1.17
2017-01-08 21:12:12 +02:00
Tim Bentley
a7ff760425
Missed about form
2016-12-31 11:14:00 +00:00
Tim Bentley
74ca42e220
Yet another year goes by
2016-12-31 11:01:36 +00:00
Tim Bentley
0d540ae40b
Add remotes file checking
2016-12-24 09:10:13 +00:00
Olli Suutari
a9520ced68
- Merged trunk on 23.12.16
2016-12-23 22:16:24 +02:00
Tim Bentley
a1f9029d25
Add start of tab and update poll
2016-12-23 16:11:47 +00:00
Tomas Groth
d1bca6d52a
trunk
2016-12-23 10:14:22 +01:00
Tim Bentley
126c5462a0
Head
2016-12-22 15:12:03 +00:00
Tim Bentley
01d3217598
fix startup
2016-12-22 15:10:44 +00:00
Tim Bentley
0643ecdd10
Remove extra self
2016-12-21 12:46:35 +00:00
Tim Bentley
7323b3797d
missed one
2016-12-21 10:20:35 +00:00
Tim Bentley
7bd645bc72
pep8
2016-12-21 10:00:14 +00:00
Tim Bentley
8570fb5e8c
Fix tests
2016-12-21 09:41:57 +00:00
Tim Bentley
a368a1d695
Move urg_get_file
2016-12-20 21:59:40 +00:00
Tim Bentley
95e70465de
Add files
2016-12-20 21:21:17 +00:00
Tim Bentley
4008ed008f
Move url size
2016-12-20 21:20:54 +00:00
Philip Ridout
849bbd2c51
Pep fixes
2016-12-18 18:42:28 +00:00
Philip Ridout
09227c3bfc
Refactors
2016-12-18 15:10:30 +00:00
Philip Ridout
e261d2e1ba
Refactors
2016-12-18 15:10:05 +00:00
Philip Ridout
f9d01e414a
settings.py
2016-12-18 13:35:03 +00:00
Tim Bentley
cc8a812619
move http root
2016-12-17 06:58:44 +00:00
95eb290226
Make the tab style affect only the media library tabs, not everything else too
2016-12-15 22:36:04 +02:00
d7ea8e4386
HEAD
2016-12-15 19:58:23 +02:00
47ab1ce1a7
Hide the splash screen when the backup dialog shows and when the exception form shows
2016-12-15 19:45:46 +02:00
4a222d1310
HEAD
2016-12-13 08:41:59 +02:00
97dfafba4e
Make the tabs in the media library prettier
2016-12-13 08:04:27 +02:00
79934596ac
Fix the problem with the Library/Media Manager icons not showing up.
2016-12-13 00:14:45 +02:00
d2e2985229
Add an importer for WordProject bibles, and fix some annoying GUI quirks in wizards.
...
http://forums.openlp.org/discussion/3340/wordproject-format
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/wordproject-importer (revision 2709)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1848/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1759/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1697/
[SUCCESS] https://ci.openlp.io/j ...
bzr-revno: 2708
2016-12-04 07:53:18 +00:00
Olli Suutari
f3ce137233
- Merged trunk on 4.12.16
2016-12-04 00:48:30 +02:00
955fdc50ac
Fix bug #1645867 by setting an application attribute related to OpenGL
...
Fixes: https://launchpad.net/bugs/1645867 , https://launchpad.net/bugs/1591749
2016-11-29 23:57:27 +02:00
ccdc88c4cb
Change the name of the help menu to try to fix the double-help-menu problem
2016-11-29 17:44:32 +02:00
846476c4ad
Stop wizards from resizing themselves based on the contents of comboboxes
2016-11-25 15:58:33 +02:00
826bfd02dd
Add a WordProject Bible importer
2016-11-24 23:48:51 +02:00
second@tgc.dk
20ab44be0f
Continuation of lp:~suutari-olli/openlp/bug-fixes-2-4-3
...
This branch fixes the following bugs:
Bug #1487788 : Importing photos does not give focus to OpenLP
Bug #1512040 : Loop tooltip gets stuck to "Stop playing..."
Bug #1513490 : List of authors uses localized "and" instead of English
Bug #1624661 : Missing DB in unmounted disk results in Traceback
bzr-revno: 2706
2016-11-22 21:34:14 +01:00
Tomas Groth
b31d5ad08e
pep8 fix
2016-11-21 21:56:48 +01:00
Tomas Groth
5e600f4417
Change the text for missing data path text.
2016-11-21 21:21:31 +01:00
Tomas Groth
f83d9ad520
Insert real button label in text to make sure it shows correct text.
2016-11-20 21:24:11 +01:00
Tomas Groth
467d29374d
Remove chords from printing.
2016-11-16 20:39:23 +01:00
phill.ridout@gmail.com
f6de30de23
Move the "no results" code in to the list widget.
...
lp:~phill-ridout/openlp/no-results (revision 2709)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1839/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1750/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1688/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1434/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1024/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_ ...
bzr-revno: 2705
2016-11-16 00:44:11 +02:00
Tomas Groth
5468def937
pep8 fixes
2016-11-15 22:13:52 +01:00
Tomas Groth
bbc670cc36
trunk
2016-11-15 21:53:50 +01:00
Tim Bentley
b1576d0819
Fix bugs and lost images
2016-11-15 20:37:21 +00:00
Philip Ridout
9133c078c7
Pep againbzr pushbzr push
2016-11-12 11:50:06 +00:00
Philip Ridout
f031df3637
Fixed Tests
2016-11-12 11:19:52 +00:00
Philip Ridout
6a3982bab9
Moved over to using UiStrings
2016-11-12 10:00:36 +00:00
Philip Ridout
80793f9412
Modified SaveEdit, so that it saves the chosen search type
2016-11-11 21:23:03 +00:00
Philip Ridout
94fca706ff
Move no results functionality to the ListWidgetWithDnD
2016-11-10 07:09:04 +00:00
Tim Bentley
913b2a0654
fix search
2016-11-04 21:24:01 +00:00
Philip Ridout
ec19cc5f07
Modified some resources and added test
2016-10-30 08:29:22 +00:00
Philip Ridout
997cb859d3
Changed some icons to use svg
2016-10-27 18:45:50 +01:00
Tim Bentley
4adcef75fa
Head
2016-10-26 19:13:49 +01:00
Tim Bentley
2d695f13ea
Head
2016-10-26 19:12:38 +01:00
Tim Bentley
e6571644dd
head
2016-10-23 20:24:53 +01:00
7acfe1dbfd
Add new branding to OpenLP for when we get to 2.6
2016-10-23 20:28:30 +02:00
Olli Suutari
aef0941e18
- Modified the def create_separated_list by suggestions of TRB143
2016-10-17 22:42:07 +03:00
Olli Suutari
a7b4d001c7
- Merged trunk and fixed conflict.
2016-10-17 20:40:45 +03:00
Olli Suutari
98b51a1db8
- Code cleanup
2016-10-17 07:29:08 +03:00
Olli Suutari
340b2f3298
- Actually fixed the missing DB bug.
2016-10-17 07:17:33 +03:00
Olli Suutari
0887ca6645
- Removed self from def handle_db_error
2016-10-04 17:21:40 +03:00
Olli Suutari
5d9d76f62d
pep8
2016-10-04 17:14:28 +03:00
Olli Suutari
39916d59ed
- Attempt to fix jen
2016-10-04 17:09:53 +03:00
Olli Suutari
3c733ddd20
- Merged trunk on 4.10.16
2016-10-04 16:39:14 +03:00
Olli Suutari
ebdad8519f
- Added one missing empty row
2016-10-04 16:31:09 +03:00
Olli Suutari
be9c394b63
- For jenkins
2016-10-04 16:27:41 +03:00
Olli Suutari
7ee7ef8846
- Not sure why the db bug is fixed in this branch
2016-10-04 16:07:53 +03:00
Olli Suutari
421555e578
- Improved one comment
2016-10-04 15:27:52 +03:00
Olli Suutari
ece524e2a1
- def handle_db_error now uses except FileNotFoundError to handle the missing data path
2016-10-04 15:16:42 +03:00
Olli Suutari
ce4d8224a2
-redid some mistakenly removed text changes
2016-10-04 10:37:08 +03:00
Olli Suutari
869caa9bf5
- pep8 (one ident)
2016-10-04 10:27:08 +03:00
Olli Suutari
036907eb5e
- Changed "&" back to "and"
2016-10-04 03:03:15 +03:00
Olli Suutari
946fb02d57
The def create_separated_list now uses the perfectly made and re-formatted code by the mastermind alisonken1
2016-10-02 21:57:38 +03:00
Olli Suutari
c7a682ebfb
- The footer now follows proper english grammar rules.
2016-10-02 20:03:59 +03:00
Olli Suutari
cff02e6b7a
Fixed bug: 1513490
2016-10-02 18:51:16 +03:00
Olli Suutari
4471338a19
- Fixed bug 1624661
2016-10-02 14:31:35 +03:00
Tim Bentley
c5e761a153
fix poll api for remotes
2016-09-30 20:50:48 +01:00
Olli Suutari
238397fa3c
- Made a better fix for giving OpenLP focus, it now works more than once.
2016-09-30 05:57:44 +03:00
Olli Suutari
8dbd79dba0
- cleanup.. The drag&drop focus solution only works for the 1st drag&drop... Why?
2016-09-30 05:36:32 +03:00
Olli Suutari
337edf039f
Fixed bug 1487788
2016-09-30 05:26:04 +03:00
Olli Suutari
d716f62d57
- reverted some other changes made while trying to find the fix
2016-09-30 04:11:41 +03:00
Olli Suutari
141c07d42a
Fixed bug 1512040
2016-09-30 04:06:51 +03:00
Tim Bentley
c8dad716cc
Review Comments
2016-09-19 19:51:48 +01:00
Olli Suutari
2edf579ec3
- Added the placeholder texts to uistrings
...
- Added placeholder texts for Bible importer & Edit.
2016-09-17 01:24:27 +03:00
Olli Suutari
ba3b2396e7
- Merged trunk on 16.9.16
2016-09-16 22:54:25 +03:00
Olli Suutari
1fae73014e
- Removed one unrequired code line
2016-09-12 15:11:59 +03:00
Olli Suutari
639c01dfe2
- Merged trunk on 9.9.16
2016-09-09 10:58:15 +03:00
Olli Suutari
a99bd8603f
- Combined some <strong> tags in expection dialogue.
...
- Added new line to the end of the test.
2016-09-09 10:57:11 +03:00
Philip Ridout
80cdc35433
Move already refactored imorters over to using the log methods in OpenLPMixin
2016-09-04 17:15:57 +01:00
Tim Bentley
15adb41256
add song reporting
2016-09-03 07:42:45 +01:00
Olli Suutari
aecd6b8858
Fixed 1 strong tag
2016-09-02 19:54:00 +03:00
Olli Suutari
e4e46d40f5
- Setting migration for escape item
...
- Renamed shortcut descriptions for blanks
2016-09-02 19:19:28 +03:00
Olli Suutari
2fcd292969
- Renamed some code
2016-09-02 18:52:44 +03:00
Olli Suutari
2c4dbda42f
- The new method now also stops loops.
2016-09-02 18:41:16 +03:00
Olli Suutari
4f48cb5df2
- fixed the "blank only" button visibility
2016-09-02 18:34:39 +03:00
Olli Suutari
875481d2d9
- A working only blank to desktop
2016-09-02 18:22:29 +03:00
Olli Suutari
46a7c92a90
- Merged trunk
2016-08-25 22:27:55 +03:00
Olli Suutari
7fba73843b
- Added the missing </strong> tag to expection form. (bug 1616441)
2016-08-25 22:24:59 +03:00
Tomas Groth
25c268145a
merge trunk
2016-08-18 21:04:44 +02:00
Olli Suutari
4f900dbffb
- Removed for_display=True which was causing traceback since it's apparently no longer used.
...
- Added manual row split for the duplicated key error message.
(Looks bad to have 12 words in one row and then one word in the row after that)
2016-08-15 19:37:53 +03:00
Olli Suutari
33aaf53c42
- Pep8 (Over ident fixed)
2016-08-15 00:14:35 +03:00
Olli Suutari
3ac99b3e28
- Merged trunk on 14/8/16
2016-08-15 00:04:22 +03:00
Olli Suutari
35758b306a
- Restored the default Help shortcut.
2016-08-15 00:01:48 +03:00
Tim Bentley
c6c7931323
head
2016-08-14 10:23:12 +01:00
c2b05e3454
Fix bug #1547964 by ignoring the exception (it's harmless)
...
Fixes: https://launchpad.net/bugs/1547964
2016-08-14 10:24:17 +02:00
14b351f2ae
HEAD
...
Fixes: https://launchpad.net/bugs/1608194
2016-08-13 16:57:38 +02:00
879a51a1fe
Fix the tests for SongSelect and write tests for the SystemPlayer
2016-08-13 16:29:12 +02:00
Tim Bentley
f38ad2cc14
move startup code
2016-08-13 06:18:46 +01:00
Tim Bentley
7f22d9c223
add files http_endpoint
2016-08-13 06:03:12 +01:00
Tim Bentley
43a539db64
remove http_endpoint
2016-08-13 06:02:54 +01:00
Tim Bentley
fa19108885
tidy up media
2016-08-12 20:16:39 +01:00
Tim Bentley
225160be24
Head
2016-08-12 19:21:30 +01:00
c79917502b
Update slot signatures to comply with PyQt5.6's stricter checks.
...
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/stricter-slot-signatures (revision 2685)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1723/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1634/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1572/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1333/
[SUCCESS] https://ci.openlp.io/j ...
bzr-revno: 2693
2016-08-12 18:28:34 +01:00
phill.ridout@gmail.com
a503c1a0f9
Some more bible refactors. Mainly focusing on xml parsing and the csv importer
...
lp:~phill-ridout/openlp/more-bible-refactors (revision 2699)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1708/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1619/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1557/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1319/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/909/
[SUCCESS] htt...
bzr-revno: 2692
2016-08-12 18:26:54 +01:00
f92302a41e
HEAD
2016-08-12 12:30:07 +02:00
c9ff88ebfc
Removed a log line I never wrote and move a variable for a test I need it in
2016-08-12 12:24:54 +02:00
Tim Bentley
304032cd7d
Merge and fix mess
2016-08-12 06:15:56 +01:00
suutari.olli@gmail.com
6f5495bcbf
This branch includes various UI string changes, such as:
...
- Media Manager, Projector Manager, Service Manager, Theme Manager,
Preview Panel and Live Panel have been renamed to: ”Library,
Projectors, Service, Themes, Preview and Live."
- Tooltips/texts for these have been changed.
- Removed version from window title
- Removed version from web remote page window names.
- Re-did the trace back message.
- etc...
In "Configurate OpenLP":
- Changed typing for all labels to lowercase
- Remove...
bzr-revno: 2691
2016-08-12 00:12:50 +02:00
Olli Suutari
8c107048b4
- Created a shortcut for the new help button, removed the old two shortcuts and created obsolete settings transfer.
2016-08-12 00:32:20 +03:00
Olli Suutari
851a35a822
- Removed Local & Online help buttons, created "User manual" button.
2016-08-12 00:11:34 +03:00
Olli Suutari
f590294b4a
- Coded a combined help button, which opens the Local Help if using Mac or Win and Online help if using other OS's.
...
(still need to change the help menu items)
2016-08-11 23:54:56 +03:00
Olli Suutari
9794d26e95
- Changed the order of blank to modes in Shortcuts list from:
...
Black, theme, desktop to desktop, theme, black.
- Pep8 fix (Ident)
2016-08-11 16:28:30 +03:00
Olli Suutari
4cb3debb65
- Fixed bug: https://bugs.launchpad.net/openlp/+bug/1612187
...
- Changed the default hotkey for "Blank to Desktop" to "Esc", added "D" as an alternative shortcut.
- Removed the default shortcut for "Escape item".
2016-08-11 14:32:44 +03:00
Tim Bentley
0da295f834
move core endpoint definitions
2016-08-10 22:19:00 +01:00
Tim Bentley
098697a2cc
more endpoint moves
2016-08-10 21:52:27 +01:00
Olli Suutari
50131ba202
- Merged trunk and resolved conflict that was created by ui-messages-part-1 branch.
2016-08-10 21:50:40 +03:00
suutari.olli@gmail.com
ae81497fe3
This branch includes various UI string changes, such as:
...
- Media Manager, Projector Manager, Service Manager, Theme Manager,
Preview Panel and Live Panel have been renamed to: ”Library,
Projectors, Service, Themes, Preview and Live."
- Tooltips/texts for these have been changed.
- Removed version from window title
- Removed version from web remote page window names.
- Re-did the trace back message.
- etc...
In "Configurate OpenLP":
- Changed typing for all labels to lowercase
- Remove...
bzr-revno: 2688
2016-08-10 19:31:33 +01:00
c35a2d1430
String conversions with templates part 1
...
- Fix string format key error in first time wizard from previous string conversion
- Fix projector pjlink1 test to use MagicMock
- Part 1 string conversions where format template is a string variable that's filled later
- Update projectordb test
- Fix a test on htmlbuilder string formatting
- Revert openlp/core/lib/htmlbuilder.py
- Convert renderer to use Template()
- Added test for renderer css
- Merge trunk and fix conflict
- Fix formatting in excep...
2016-08-10 19:29:21 +01:00
0fc598fab5
HEAD
2016-08-10 11:13:45 +02:00
51f3a0f406
Fix some slot signatures that were the incorrect type
2016-08-10 11:07:49 +02:00
Olli Suutari
fc3b2f021e
- Merged trunk on 10/8/16.
2016-08-10 00:37:59 +03:00
Philip Ridout
b502c0b79d
Moved get file encoding from lib to common
2016-08-09 07:24:04 +01:00
Tim Bentley
80f927f5d6
Tidy up code more
2016-08-08 22:01:09 +01:00
Philip Ridout
a0882bd523
Refactor csv importer
2016-08-08 21:02:18 +01:00
Philip Ridout
a78c3d67e7
head
2016-08-08 19:11:32 +01:00
Philip Ridout
e9ec672756
improved encoding detection code. Tests added
2016-08-08 19:09:33 +01:00
ff56739f35
String format error
2016-08-07 14:08:03 -07:00
a89495063e
merge trunk
2016-08-07 13:52:42 -07:00
1ff94a74a3
Qt5 updates for projector/signal mismatches
2016-08-07 13:51:35 -07:00
Philip Ridout
97dbc85918
move chardet function in to core
2016-08-07 20:29:35 +01:00
Tim Bentley
3593e21033
Add media endpoints
2016-08-07 20:08:29 +01:00
Tim Bentley
cade36a332
Head
2016-08-07 19:37:15 +01:00
suutari.olli@gmail.com
fb105f2e0b
This branch introduces following improvements to Quick Bible search:
...
- Combined Reference/Text search which first performs the Reference
search and then moves to Text search if nothing is found.
- Added Search while typing functionality for Quick Bible search
- Possibility to use “.” when shortening Book names in Reference search.
For an example Gen. 1 = Gen 1 = Genesis 1.
- New/Improved error messages
(E.g. added actual example verses to Reference error)
- 3 New settings for controllin...
bzr-revno: 2686
Fixes: https://launchpad.net/bugs/1591480
2016-08-07 19:33:46 +01:00
2f7a1ab456
Merge trunk
2016-08-05 12:41:22 -07:00
b41b4a5918
Fix some todo notes
2016-08-05 12:18:47 -07:00
suutari-olli
1c63fb6ec0
- Changed stuff based on suggestions by superfly
2016-08-04 00:19:14 +03:00
Philip Ridout
8257dbb282
HEAD
2016-08-03 21:27:05 +01:00
Philip Ridout
bf28102401
More style fixes
2016-08-03 21:17:48 +01:00
Philip Ridout
60767c8ce4
Fixes bug #917164 . A start on refactoring bibles
2016-08-03 18:26:10 +01:00
suutari-olli
7eac4d5e38
- Merged trunk on 2.8.16
2016-08-02 23:18:26 +03:00
Tomas Groth
c473212107
Added pylint test to jenkins script, and fixed a format error.
2016-08-02 20:57:10 +02:00
suutari-olli
1298b629f1
- Merged trunk on 31.7.16
2016-07-31 14:58:54 +03:00
suutari-olli
0923ca6a40
- Merged trunk on 28.7.16
2016-07-28 22:57:21 +03:00
Tomas Groth
b781fa6169
some cleanups, comments and a test.
2016-07-26 21:02:35 +02:00
Tomas Groth
de54ec2715
merge trunk
2016-07-25 22:48:30 +02:00
Tomas Groth
611c970eb0
More work on chords
2016-07-25 22:07:07 +02:00
suutari-olli
aa1cd8fa91
- Merged trunk on 24.7.16
...
- Added superflys startup traceback fix to my code
- Resolved conflicts
2016-07-24 23:20:25 +03:00
suutari-olli
0c8503a266
- Changed stuff based on comments by TRB143.
2016-07-24 22:58:34 +03:00
suutari-olli
b364bb5cf0
- merged trunk on 24.7.16
2016-07-24 21:56:13 +03:00
e231398010
HEAD
2016-07-24 14:25:46 +02:00
ebefc03674
Fix the disappearance of a variable :-)
2016-07-23 23:41:24 +02:00
Tim Bentley
ca2ceba972
Head
2016-07-23 05:59:26 +01:00
Tim Bentley
25a43669d7
fix test
2016-07-23 05:48:36 +01:00
second@tgc.dk
c426b8c1a2
"Added a test using pylint to test the code for the most serious issues.
...
Added pylintrc for finding more potential issues with pylint (not used in the test).
Made some fixes as suggested by pylint."
bzr-revno: 2681
2016-07-21 23:32:25 +02:00
0150291e4d
"- Convert calls to md5_hash and qmd5_hash to use UTF-8 for non-ascii characters
...
- Fixed test to verify UTF-8 returns valid ASCII hash
- Switch back to qmd5_hash to stay within the Qt framework
--------------------------------
lp:~alisonken1/openlp/projector-cleanups (revision 2679)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1646/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1557/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1495/
[SUCCESS] https://ci.o ..."
bzr-revno: 2680
2016-07-21 23:29:58 +02:00
Tomas Groth
530f119938
Various improvements for chords on the mainview.
2016-07-21 22:37:25 +02:00
Tomas Groth
c10f71db3a
Started work on chords on maindisplay.
2016-07-20 22:43:46 +02:00
98f5a5c856
Fix another slot signature
2016-07-19 22:22:37 +02:00
a8b72ed876
Fix up the types in the signals and slots - PyQt 5.6 is stricter about them now.
2016-07-18 23:36:16 +02:00
97d6586462
Fixed another part of the permission denied error
2016-07-17 21:12:00 +02:00
suutari-olli
f5bc8056f7
- removed one unrequired if statement.
2016-07-17 19:11:51 +03:00
suutari-olli
08bcb2c5d4
- Moved them to another init since something broke
2016-07-17 18:53:27 +03:00
suutari-olli
437039efed
- Moved the 2nd new registry flag from one init to an another init which also has the 1st
2016-07-17 18:49:15 +03:00
suutari-olli
496c57cdfc
- Fixed the issue where items sent to Preview from Service may cause tracebacks.
2016-07-17 18:41:55 +03:00
Tim Bentley
16a1b1a0af
next prev 2
2016-07-17 08:28:25 +01:00
Tim Bentley
6e5070316c
next prev
2016-07-17 08:12:42 +01:00
3cdd42bfe0
Catch the PermissionError too
2016-07-17 00:20:56 +02:00
suutari-olli
4874f6a218
- Reduced comments
...
- Removed unrequired reg_value from test.
2016-07-16 19:51:08 +03:00
suutari-olli
02b4d27b96
pep8 fixes, test still broken.
2016-07-14 21:13:58 +03:00
suutari-olli
1c133398e2
Merged trunk on 14.7.16
2016-07-14 21:03:57 +03:00
suutari-olli
7b643b06ac
- Tried to make the new text work with the registry changes but failed.
...
> Test is broken, do not merge!
2016-07-14 21:02:23 +03:00
Tim Bentley
70288c8ae1
More fixes
2016-07-10 07:25:25 +01:00
Tim Bentley
da32a56c0c
remove extra code
2016-07-09 12:26:07 +01:00
Tim Bentley
3a7aff9c0e
migrate settings
2016-07-09 12:21:25 +01:00
Tim Bentley
cd3d809610
fix syle
2016-07-09 11:48:23 +01:00
Tim Bentley
4b0b8b9647
fix test
2016-07-09 09:45:08 +01:00
de3f4046b7
Convert md5sum calls to utf-8 for non-ascii pins
2016-07-08 12:19:08 -07:00
Tim Bentley
eaa7904f58
More remotes removal and custom pages
2016-07-07 06:14:52 +01:00
Tomas Groth
1992a51339
More pylint-fixes
2016-07-06 21:48:57 +02:00
Tomas Groth
99e6ab6657
Fix various issues as suggested by pylint
2016-07-05 22:31:29 +02:00
Tim Bentley
dc95d77511
Thumbnails work
2016-07-04 22:10:47 +01:00
Tim Bentley
1e77ce9678
Fix up static and assets
2016-07-03 16:22:52 +01:00
Tim Bentley
28a5f5c3fd
More updates and getting things working
2016-07-03 08:26:09 +01:00
Tomas Groth
8aa917c89c
A bunch of fixes suggested by pylint.
2016-07-01 23:17:20 +02:00
Tim Bentley
a81cc8292b
fix some tests
2016-06-28 22:39:16 +01:00
Tim Bentley
7aa1acc176
More fixes
2016-06-27 21:55:36 +01:00
suutari-olli
22ff4247ad
- Merged trunk on 27.6.16
2016-06-27 02:23:50 +03:00
suutari-olli
6078e28171
Comment cleanup / Improvements
2016-06-27 02:20:57 +03:00
suutari-olli
68b4d62502
- Turned the two new hidden settings into registry flags
2016-06-27 02:14:24 +03:00
d3a2dd399a
Fix missing format key, updated test
2016-06-25 04:39:57 -07:00
de754e2cb1
Convert exceptionform._create_report to return dict
2016-06-24 05:39:47 -07:00
d878d8b8cb
Missed closing paren
2016-06-23 21:38:18 -07:00
c2d884df48
Missing format key
2016-06-23 21:28:23 -07:00
Tim Bentley
ac841a934c
Add plugin endpoints
2016-06-22 20:47:11 +01:00
Tim Bentley
e642335fd3
working fixed point
2016-06-20 17:32:29 +01:00
Tim Bentley
f92701ff98
More updates
2016-06-19 18:39:48 +01:00
Tim Bentley
549598e5be
cleanups
2016-06-19 09:57:38 +01:00
Tim Bentley
9e62366d2b
move 2 more apis
2016-06-19 07:58:15 +01:00
Tim Bentley
36885263bb
cleanup
2016-06-19 07:16:31 +01:00
Tim Bentley
fa5ce45db0
it works
2016-06-19 07:16:01 +01:00
8806a06ab9
Test cleanups
2016-06-17 19:45:02 -07:00
7cc56af2bb
bugfix 1593883 pjlink authenticatino test
2016-06-17 19:02:53 -07:00
7e8eb21510
Pep8 and notes about hashing
2016-06-17 16:54:04 -07:00
d1ff2385ae
bug 1593883 fix - switch from qmd5_hash to md5_hash
2016-06-17 16:48:32 -07:00
aaba690c97
Fix call to wrong signal on error
2016-06-17 16:05:26 -07:00
c64df391aa
bug 1593882 fix
2016-06-17 15:46:21 -07:00
76ffe35621
bug 1593882 - fix authenticated connection but bin not set
2016-06-17 15:06:55 -07:00
c8754c86aa
Merge trunk fix conflict
2016-06-16 18:08:21 -07:00
Tim Bentley
8b98ee002b
now upto date
2016-06-16 22:00:20 +01:00
Tim Bentley
22f85538cc
stage now working again
2016-06-16 21:58:42 +01:00
Tim Bentley
3d602d41b3
First changes now working
2016-06-16 21:50:01 +01:00
7a8b519b8c
Add test for renderer change to template string
2016-06-16 07:44:32 -07:00
968a0ab87a
Add static routes for serving files, and template rendering built into endpoints
2016-06-15 23:52:46 +02:00
b627736e5e
Convert renderer string to Template()
2016-06-15 08:05:05 -07:00
30ee384a9b
Move the API around a bit
2016-06-15 00:03:08 +02:00
Tomas Groth
0c2b68ac54
merge trunk
2016-06-14 23:12:54 +02:00
Tim Bentley
f8ca67b67e
pep8
2016-06-14 21:56:50 +01:00
suutari-olli
db003d7ec6
- Merged trunk on 14.6.16
...
To do?
- Add clear search results button for locked Bible search results
- Prevent duplicated search results on "Lock search results"
2016-06-14 23:54:36 +03:00
