Tim Bentley
fedfb703fe
Head
2011-12-24 13:44:14 +00:00
Martin Zibricky
70c0125255
Include media player files with build for Mac OS X
2011-12-24 13:26:50 +01:00
Martin Zibricky
3f89542cc6
[merge] Merge with trunk r1856.
2011-12-24 13:22:45 +01:00
Jonathan Corwin
f81c87b467
Head
2011-12-23 21:53:58 +00:00
Jonathan Corwin
2b9f09b32a
Minor fixes
2011-12-23 21:52:54 +00:00
Raoul Snyman
c001d1298b
Merge the latest translations into trunk for the 1.9.8 release.
...
bzr-revno: 1856
2011-12-23 21:19:57 +02:00
Mattias Põldaru
b48dda3c74
Converts <> marks to <> to make it impossible to insert HTML to alerts.
...
Fixes: https://launchpad.net/bugs/908197
2011-12-23 21:14:49 +02:00
Raoul Snyman
67d17ec429
Forgot the pt_BR translation
2011-12-23 20:43:34 +02:00
Raoul Snyman
e96f3398a3
Updated translation files.
2011-12-23 20:39:25 +02:00
Jonathan Corwin
70ffa5b988
Head
2011-12-23 18:37:27 +00:00
Jonathan Corwin
5600946e0e
divergences
2011-12-23 17:35:58 +00:00
Jonathan Corwin
ec035d6d37
Set correct monitor in wizard
2011-12-23 17:25:05 +00:00
Mattias Põldaru
e59d5b014b
Fix support issue 354, Web Remote causes a stacktrace when sending an Alert message.
...
bzr-revno: 1855
2011-12-23 16:35:51 +00:00
Mattias Põldaru
173915f956
Made search function's replace greedy as well. Thanks to gushie the world is better place now :).
2011-12-23 18:03:37 +02:00
Mattias Põldaru
514773abe8
Make replace work for two or more occurrences.
2011-12-23 17:47:36 +02:00
Mattias Põldaru
e94ab832eb
Escape \ and " characters first, to prevent traceback when sending such an alert from remote.
2011-12-23 17:23:32 +02:00
Mattias Põldaru
7f6edda463
Add a missing pair of quotes to fix #354 .
2011-12-23 16:54:53 +02:00
Mattias Põldaru
706fa7ff49
Revert previous change.
2011-12-23 16:54:08 +02:00
Jonathan Corwin
3a5723cbaa
Don't show initial display window if on same screen as application window, override or not.
2011-12-23 14:38:02 +00:00
Mattias Põldaru
2508e71a44
Supposedly fix for #354 in support.openlp.org, a traceback when JSON response from remote cannot be decoded.
2011-12-23 15:15:19 +02:00
Martin Zibricky
5f6962f4c7
This fixes bug #906926 .
...
bzr-revno: 1854
Fixes: https://launchpad.net/bugs/906926
2011-12-22 23:36:22 +02:00
Jonathan Corwin
69490c8f2c
Ensure visible flags correct, and display if single screen works on Windows
2011-12-22 20:11:52 +00:00
Martin Zibricky
fe173f33d0
Fix for display screen on mac.
...
bzr-revno: 1853
Fixes: https://launchpad.net/bugs/907857
2011-12-22 21:07:23 +02:00
Martin Zibricky
79c5a3a4d4
refactoring: merge with trunk and use sys.platform
2011-12-22 19:29:55 +01:00
Martin Zibricky
4071bc8deb
remove disabling opengl - done in new branch
2011-12-22 19:21:22 +01:00
Martin Zibricky
6828fc9ef5
fixed bug 907857: opengl rendering disabled for mac
2011-12-22 19:17:35 +01:00
Jonathan Corwin
1f6be045f5
Fix display issues with Gnome Shell
...
bzr-revno: 1852
2011-12-22 17:47:44 +00:00
Martin Zibricky
82728e148e
#906926 fix stay on top for OS X
2011-12-22 15:46:47 +01:00
Jonathan Corwin
1cd3206f96
Redundant imports
2011-12-22 13:23:04 +00:00
Jonathan Corwin
16043527fc
Check for Unity instead
2011-12-22 12:27:54 +00:00
Jonathan Corwin
b9c1da189a
Head
2011-12-21 21:19:52 +00:00
Jonathan Corwin
febf40884f
Just remove X11 bypass
2011-12-21 21:19:35 +00:00
Raoul Snyman
5bcfbb9433
Fixed bug #907164 : Exclude footnotes div and the comment after it.
...
bzr-revno: 1851
Fixes: https://launchpad.net/bugs/907164
2011-12-21 12:30:16 +02:00
Mattias Põldaru
40783e1a3b
Fixes error when trying to import an openlp.org songs or bibles database with non-ascii filename. Also some in-code notes about error handling.
...
bzr-revno: 1850
2011-12-21 12:29:08 +02:00
Mattias Põldaru
b80e2ffa5b
Enable searching in web remote by pressing enter when search bar is focused.
...
bzr-revno: 1849
2011-12-21 12:27:54 +02:00
Mattias Põldaru
856bc82045
Fix a warning which was created by previous fix. Codecs returns unicode and it could not be compared to such a str.
...
bzr-revno: 1848
2011-12-21 11:53:23 +02:00
Mattias Põldaru
c1d1d38eba
Such precision would not be needed in user errors, I suppose. The ones who would benefit from this can read log anyway.
2011-12-21 10:21:37 +02:00
Mattias Põldaru
5f9f87e8fa
Style fixed.
2011-12-21 10:15:07 +02:00
Raoul Snyman
4e94986aa8
Fixed bug #907164 : Exclude footnotes div and the comment after it.
...
Fixes: https://launchpad.net/bugs/907164
2011-12-21 07:22:49 +02:00
Mattias Põldaru
35665ff336
Fixes error when trying to import openlp.org v1 bible or songs db from a file with non-ascii characters. Also some notes about error handling.
2011-12-21 00:44:35 +02:00
Mattias Põldaru
b721559419
This line created a warning since codecs returns unicode strings.
2011-12-21 00:09:52 +02:00
Mattias Põldaru
72521be196
Merge trunk changes.
2011-12-20 23:00:20 +02:00
Mattias Põldaru
bfd0708f3a
Enable search by pressing enter in web remote.
2011-12-20 22:43:57 +02:00
Meinert Jordan
e974df4c54
recover v1.x theme file names from XML info
...
bzr-revno: 1847
2011-12-20 20:25:27 +00:00
Meinert Jordan
d94816d481
recover v1.x theme file names from XML info
...
bzr-revno: 1846
2011-12-20 20:23:36 +00:00
Raoul Snyman
479598ab0b
Fixed up bug #905367 : The values were being sent through to the server unquoted.
...
- Fixed an issue where the search options were getting called too early. Now they are called on page load.
- Upgraded jQuery Mobile to 1.0 final.
- Removed the dependency on json2.js, and removed json2.js
- Converted the back button to a home button, as that was its original intention.
bzr-revno: 1845
2011-12-20 20:21:58 +00:00
M2j
cc37336ec5
make mediacontroller sliders reacting on scroll wheel (Bug #899312 )
2011-12-19 23:46:31 +01:00
Martin Zibricky
5d13873ce1
updated czech translation
...
bzr-revno: 1844
2011-12-19 16:57:03 +00:00
Andreas Preikschat
644e02996a
Added floft to the list of packagers
...
bzr-revno: 1843
2011-12-19 17:42:43 +01:00
Martin Zibricky
dca69e361f
updated czech translation
2011-12-19 14:07:03 +01:00