Commit Graph

497 Commits

Author SHA1 Message Date
0a22c7f77a Merge branch 'CCLI-fixes' into 'master'
CCLI fixes

Closes #245

See merge request openlp/openlp!132
2020-02-10 21:29:31 +00:00
Daniel
b455077ff8 Allow searching past the first page of songs
Previously the first ten songs were just repeated
2020-02-10 21:29:30 +00:00
Daniel
0b3ee4e1ba Fix common settings crash 2020-02-09 08:01:15 +00:00
Tim Bentley
020661059f Migrate Display
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-02-01 21:12:07 +00:00
Tim Bentley
45e38c4959 Migrate API to Settings
Fix missing / incorrect copyright

Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-29 06:50:09 +00:00
Tim Bentley
fa97550301 Migrate more plugins for settings
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-26 17:12:45 +00:00
Tim Bentley
debbced7e3 Update the plugin classes and remove the uneeded code
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-18 21:00:13 +00:00
Tim Bentley
6ea4893ad6 Change Year
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-01 02:53:08 +00:00
1e76868a23 Remove vim lines from files and add a .editorconfig for editors that support it 2019-10-10 15:28:16 +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
95a056e504 Remove some pylint occurences 2019-09-21 13:14:23 +02: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
6b8352abea fix tests to allow for SongbookNumberInTitle defaulting to false and add hints tests 2019-09-03 10:52:09 +01:00
John Lines
2e89ec1f29 enable whole song impoerter test 2019-07-19 12:11:16 +01: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
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
66712873b4 Singing The Faith Importer - Add the importer, and tests 2019-06-17 09:44:34 +01:00
Phill
5482e70e6d Break out json and path refactors from fixes branch 2019-05-22 07:47:00 +01:00
Bastian Germann
be1a398f7b License change to GPL-3.0-or-later 2019-04-13 15:00:22 +02: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
bddc3f02dc Just skip the darn test 2019-03-26 22:52:15 -07:00
Philip Ridout
07a61c57e6 HEAD 2019-03-09 06:59:19 +00:00
cc4b8e4242 PJLink2 Update U 2019-03-08 07:19:57 -08: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
Philip Ridout
f3485513f1 Test and PEP8 fixes 2019-02-27 22:14:08 +00:00
Samuel Mehrbrodt
fcf4cb1c5c Merge trunk 2019-02-21 22:26:36 +01:00
Tomas Groth
fa4ec96054 Updated to 2019 in copyright headers 2019-02-14 16:09:09 +01:00
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
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
Tim Bentley
f1c7664125 Merge media trunk and fix up 2019-01-27 14:42:23 +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
Kyle Nweeia
98bc575ba2 2018-12-13 20:46:55 -05:00
Kyle Nweeia
ea14f6cea8 2018-12-13 20:27:59 -05:00
Tomas Groth
e7526f1e59 merge trunk 2018-10-30 20:46:55 +01:00
Bastian Germann
191273fbe8 Remove unused imports 2018-10-27 13:05:41 +02:00
Bastian Germann
6aa998edd0 Replace PyICU with PyQt's QCollator
Use QCollator as new collator to get rid of the PyICU dependency.
Simplify the natural sorting with its numeric mode.
Simplify one test that is heavily dependent on implementation.
Run one sorting test on macOS which was disabled.
2018-10-27 12:50:15 +02:00
d1c4cea777 Fix linting issues 2018-10-26 18:40:20 -07:00
aa3b0c4bcc HEAD 2018-10-01 21:39:42 -07:00
37424b3b13 HEAD 2018-09-07 07:59:21 -07:00