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
|
9941aaac16
|
Replace mention of pylint by flake8
|
2019-09-21 13:14:23 +02:00 |
|
Bastian Germann
|
95a056e504
|
Remove some pylint occurences
|
2019-09-21 13:14:23 +02:00 |
|
Tim Bentley
|
ab19467c0b
|
Merge branch 'test_fixes' into 'master'
test_fixes
See merge request openlp/openlp!13
|
2019-09-21 06:22:42 +00: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 |
|
Benjamin Hoving
|
3271e15401
|
Merge remote-tracking branch 'upstream/master' into test_fixes
|
2019-09-19 20:07:44 -04:00 |
|
|
c1933352ea
|
Ignore some generated files, make generate resources script check for an existing file; ignore pdfcontroller test for now
|
2019-09-18 18:29:05 +00:00 |
|
Benjamin Hoving
|
e0fc84f218
|
remove test_bzr_tags
|
2019-09-17 19:20:15 -04:00 |
|
Benjamin Hoving
|
04a70ac59e
|
remove test_pylint
|
2019-09-17 19:20:04 -04:00 |
|
|
9d16ae2b06
|
Based on ic90's code, this just simplifies some of the code, and streamlines how things work, plus a couple of CSS fixes.
bzr-revno: 2904
|
2019-09-15 17:22:22 +02:00 |
|
|
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 |
|
|
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 |
|
|
671abe1def
|
Fix the queued alerts not being displayed
|
2019-09-12 15:39:57 -07:00 |
|
|
3b87327682
|
Fix all the tests
|
2019-09-11 23:06:35 -07:00 |
|
|
83cd5c1a88
|
HEAD
|
2019-09-11 21:41:43 -07:00 |
|
|
3af3068027
|
Fix alerts to scroll properly, and simplify how everything works
|
2019-09-11 21:41:30 -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
|
b2f3496093
|
add tests with hints subdirectory
|
2019-09-03 12:53:54 +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 |
|
Tomas Groth
|
842b0c07c7
|
trunk
|
2019-08-28 21:50:03 +02:00 |
|
Tomas Groth
|
b999b2a55e
|
Added support for more meta directives.
|
2019-08-28 21:28:27 +02:00 |
|
|
2557eeeaa6
|
Changed button to say 'Contribute', moved some text around, removed some unnecessary text
|
2019-08-22 20:21:15 -07:00 |
|
|
3ce073c4bf
|
Fix image height, update tests, and make 'npm test' only run the tests once instead of continually
|
2019-08-22 09:40:45 -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 |
|
|
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 |
|
|
a8e46110ed
|
Fix an incorrect if and update tests
|
2019-07-02 23:30:01 -07:00 |
|
|
7c1eb9f24d
|
Update test
|
2019-07-02 20:53:20 -07:00 |
|
|
11ad9dbb22
|
Further refactor the code, and fix up the tests
|
2019-07-02 20:05:01 -07:00 |
|
|
0618f63ede
|
Added a Zeroconf service to aid devices detecting OpenLP on the network
|
2019-07-01 15:36:14 -07:00 |
|
Nico Opiyo
|
b42034de47
|
Changed variable names to camelCase and added parameter for Jenkins JS tests
|
2019-07-01 20:45:08 +03:00 |
|
Nico Opiyo
|
14f53eef89
|
Pulled in latest changes from trunk
|
2019-07-01 09:47:38 +03:00 |
|
Nico Opiyo
|
0eff721f24
|
Fixed unit tests for alerts branch
|
2019-06-30 22:16:54 +03:00 |
|
John Lines
|
d52d5bb0e2
|
Fix lint warning in tests and importer.py
|
2019-06-30 20:13:33 +01:00 |
|
john
|
8f91f0c787
|
Fix undefined auto_verse_order_ok case, and add some test resources
|
2019-06-29 15:43:32 +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
|
26e4606ed2
|
Fix test data
|
2019-06-28 19:20:11 +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
|
8a4c349f9e
|
Tidy up auto verse order generation
|
2019-06-27 13:01:11 +01:00 |
|
john
|
66712873b4
|
Singing The Faith Importer - Add the importer, and tests
|
2019-06-17 09:44:34 +01:00 |
|
john
|
20d0b40f8b
|
Singing The Faith Importer - Initial version
|
2019-06-17 09:30:45 +01:00 |
|
Tim Bentley
|
7143fbb8d1
|
Fix streaming part1
|
2019-06-14 18:54:04 +01:00 |
|
Tomas Groth
|
9bf639a3cb
|
merge trunk
|
2019-06-11 21:13:35 +02:00 |
|
Tomas Groth
|
7cb8758fdd
|
Fixed test on windows by mocking out render.
|
2019-06-11 21:12:33 +02:00 |
|
|
596c484bd7
|
Add presentations through LibreOffice on macOS.
bzr-revno: 2878
|
2019-06-10 22:01:02 -07:00 |
|
Tomas Groth
|
0c7fe8d97c
|
fix test
|
2019-06-09 22:06:20 +02:00 |
|
Tomas Groth
|
04d3efef9e
|
fix some broken tests
|
2019-06-07 23:05:02 +02:00 |
|
|
7819a9eb02
|
Fix license issues
|
2019-06-04 21:57:26 -07:00 |
|
|
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 |
|
Nico Opiyo
|
e8edb7e52f
|
Pulled in changes from trunk
|
2019-05-22 10:28:25 +03:00 |
|
Phill
|
5482e70e6d
|
Break out json and path refactors from fixes branch
|
2019-05-22 07:47:00 +01:00 |
|
|
fa7e8f9d3c
|
PJLink 2 Update v07
bzr-revno: 2871
|
2019-05-20 20:25:33 +01:00 |
|
|
3d18478ac7
|
Fix up the tests
|
2019-05-18 08:56:22 -07:00 |
|
|
8029a8b767
|
HEAD
|
2019-05-17 21:56:15 -07:00 |
|
|
2069c94a10
|
Remove extraneous parens
|
2019-05-15 06:23:58 -07:00 |
|
|
0c14ddf31f
|
PJLink2 Update v07
|
2019-05-11 02:07:40 -07:00 |
|
|
bb6b2b32b9
|
HEAD
|
2019-05-10 10:08:32 -07:00 |
|
Tim Bentley
|
9e22ed86e3
|
remove unneeded test
|
2019-05-08 14:58:06 +01:00 |
|
|
b4d5425887
|
PJLink2 Update v06
bzr-revno: 2869
|
2019-05-07 17:57:35 +01:00 |
|
|
984e79faa9
|
PJLink2 Update v05
bzr-revno: 2868
|
2019-05-07 17:57:02 +01:00 |
|
Phill
|
0f640368e1
|
Just to trigger the tests :-)
bzr-revno: 2867
|
2019-05-07 17:56:21 +01:00 |
|
|
855828939f
|
PJLink2 update v06
|
2019-05-04 21:08:32 -07:00 |
|
Tim Bentley
|
a7821bdd26
|
rename additions to arguments
|
2019-05-04 20:47:06 +01:00 |
|
Tim Bentley
|
3526c3de64
|
Head
|
2019-05-04 20:29:20 +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 |
|
|
a503c61a51
|
PJLink2 update v05
|
2019-05-04 03:21:48 -07:00 |
|
Phill
|
15f3b0fcca
|
Seperate some fixes out of annother branch
|
2019-05-04 10:13:29 +01:00 |
|
|
2a479a15da
|
pjlink2 update v04
|
2019-05-03 22:25:07 -07: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 |
|
|
d6cf6cf6bf
|
PJLink2 update V03
|
2019-04-28 00:03:51 -07:00 |
|
|
ddd14a5fc2
|
pjlink2 update v02
|
2019-04-26 00:39:37 -07:00 |
|
Tim Bentley
|
e607a95b86
|
Fix tests
|
2019-04-21 09:53:59 +01:00 |
|
|
5f6887f837
|
PJLink2 Update V1
|
2019-04-20 18:04:59 -07: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 |
|
Nico Opiyo
|
628cfbf213
|
Fixed alert positioning with CSS flexbox and also fixed non-scrolling alert display
|
2019-04-05 17:29:27 +03:00 |
|
Nico Opiyo
|
e56971fa81
|
Fixed queue bug when showing alerts from the queue
|
2019-04-02 22:08:27 +03:00 |
|
Nico Opiyo
|
0e1989f06f
|
Fixed all tests and changed entrance transition to class based toggling
|
2019-03-29 17:18:54 +03:00 |
|
Nico Opiyo
|
c25f4d8197
|
Cleaned up Javascript and refactored the functions and tests plus optimized animation of text
|
2019-03-29 15:36:32 +03: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 |
|
|
bddc3f02dc
|
Just skip the darn test
|
2019-03-26 22:52:15 -07:00 |
|
|
a69ff65bfc
|
Duh. Height
|
2019-03-26 10:03:09 -07:00 |
|
|
386985349d
|
The width of the PDF is not the same as the width of the screen
|
2019-03-26 09:45:10 -07:00 |
|
|
136735c53f
|
Get the screen resolution directly from Windows and X11, or return the previous resolution
|
2019-03-25 15:16:45 -07:00 |
|
|
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 |
|
Nico Opiyo
|
fe6130a534
|
Fixed buggy alerts and refactored CSS
|
2019-03-17 22:05:31 +03: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 |
|
Nico Opiyo
|
7a1c82096d
|
Fixed tests and refactored event listeners for effective testing
|
2019-03-15 17:46:26 +03:00 |
|
Nico Opiyo
|
53d8b239ff
|
Added scrolling option to alerts
|
2019-03-12 22:37:07 +03: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 |
|
|
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 |
|
Tomas Groth
|
b6a36f2324
|
pep8 fixes
|
2019-03-07 20:23:04 +01:00 |
|
Nico Opiyo
|
93a6a6a75b
|
Added a few tests and fixed failing JS tests
|
2019-03-06 13:05:28 +03: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 |
|
Nico Opiyo
|
72980b5365
|
Added queuing functionality to the alerts
|
2019-03-04 13:29:08 +03:00 |
|
Philip Ridout
|
1fe56bc089
|
Fix some asserts
|
2019-03-03 17:44:40 +00: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 |
|
Nico Opiyo
|
7a5ddc454e
|
Refactored the tests for the alerts to mkae them DRY
|
2019-03-01 15:39:29 +03: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 |
|
Nico Opiyo
|
d44e54c1b3
|
Refactored transition code and added settings from alert settings configuration
|
2019-02-22 14:31:38 +03: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
|
6d7c19256b
|
Fixes
|
2019-02-15 20:22:02 +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 |
|
|
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 |
|
|
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
|
6b4ed77fee
|
fix up tests
|
2019-02-12 20:55:58 +00:00 |
|
Tim Bentley
|
4547b7b4eb
|
fix up tests
|
2019-02-12 19:55:08 +00:00 |
|
Nico Opiyo
|
fe431b2b2c
|
Refactored alert tests and optimized alert code plus fixed spacing
|
2019-02-12 13:08:25 +03: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 |
|
Philip Ridout
|
c7e4be5512
|
fix test
|
2019-02-07 19:38:11 +00:00 |
|
gregzovic@bazaar.launchpad.net
|
03bfe63135
|
Minor test fix
|
2019-02-06 23:55:17 +03: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 |
|
gregzovic@bazaar.launchpad.net
|
b83df5cd29
|
Fixed alerts and removed unnecessary debug statements and added tests
|
2019-02-06 23:33:16 +03:00 |
|
Tomas Groth
|
2e93377cd3
|
Fix a few tests.
|
2019-02-06 21:26:33 +01:00 |
|
Tim Bentley
|
6ea3ac875c
|
fix the fix! renderer not included any more
|
2019-02-04 17:21:34 +00:00 |
|
Tomas Groth
|
078c8d41eb
|
Fix unresolved conflict - for real.
|
2019-02-03 21:45:24 +01:00 |
|
Tomas Groth
|
aa5554a696
|
Fix unresolved conflict.
|
2019-02-03 21:44:46 +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 |
|
|
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 |
|
gregzovic@bazaar.launchpad.net
|
178df476bd
|
Added alert animations and transitions
|
2019-01-24 12:49:45 +03:00 |
|
Tim Bentley
|
469a888563
|
clean ups and settings
|
2019-01-20 17:58:41 +00:00 |
|
|
28a920b540
|
Fix up some of the Javascript tests
|
2019-01-15 23:15:21 -07: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
|
c2a03e205d
|
try again
|
2019-01-04 18:21:38 +00:00 |
|
Tim Bentley
|
7836aa4234
|
try again
|
2019-01-04 18:15:21 +00:00 |
|
Tim Bentley
|
72cd432f10
|
try again
|
2019-01-04 18:11:15 +00:00 |
|
Tim Bentley
|
4d6659e889
|
try again
|
2019-01-04 18:01:54 +00:00 |
|
Tim Bentley
|
0601c8e774
|
for fixes
|
2019-01-03 21:57:38 +00:00 |
|
Tim Bentley
|
d1eff87c30
|
for fixes
|
2019-01-03 21:53:34 +00:00 |
|
Tim Bentley
|
83601e49be
|
for fixes
|
2019-01-03 21:50:42 +00:00 |
|
Tim Bentley
|
64adcb9d06
|
for fixes
|
2019-01-03 21:43:16 +00:00 |
|
Tim Bentley
|
3ed5b214c6
|
for fixes
|
2019-01-03 21:37:26 +00:00 |
|
Tim Bentley
|
67badd0f29
|
for fixes
|
2019-01-03 21:34:03 +00:00 |
|
Tim Bentley
|
55ba43eae4
|
for fixes
|
2019-01-03 21:31:38 +00:00 |
|
Tim Bentley
|
c177755136
|
for fixes
|
2019-01-03 21:21:41 +00:00 |
|
Tim Bentley
|
16c594365f
|
for fixes
|
2019-01-03 21:12:53 +00:00 |
|
Tim Bentley
|
9a9ee4bafd
|
for fixes
|
2019-01-03 21:00:21 +00:00 |
|
Tim Bentley
|
6780c64855
|
try again
|
2019-01-03 20:46:11 +00:00 |
|
Tim Bentley
|
100d72c571
|
remove unneeded
|
2019-01-03 20:39:53 +00:00 |
|
Tim Bentley
|
7f799b09d2
|
fixes
|
2018-12-22 14:54:35 +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
|
9a39c46e2b
|
Fix tests and code
|
2018-12-02 09:08:00 +00:00 |
|
Tim Bentley
|
c1a1ac58ba
|
Fix tests and code
|
2018-12-02 09:03:01 +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 |
|
|
e58e0ee485
|
Fix all the tests
|
2018-11-30 22:52:49 -07:00 |
|
|
56f76b1179
|
Fixed up some more tests
|
2018-11-15 21:34:49 -07:00 |
|
|
16027a43a9
|
Fixed a couple tests
|
2018-11-12 22:42:43 -07:00 |
|