Commit Graph

257 Commits

Author SHA1 Message Date
Stevan Pettit
cb50427af1 Merge branch. Fixed conflict 2012-06-09 00:23:24 -04:00
Tim Bentley
577e39bdee Fix typing 2012-05-27 06:46:08 +01:00
Stevan Pettit
f1586052a6 Added code to allow OpenLP to run portable 2012-05-11 08:22:34 -04:00
Raoul Snyman
10dbb5ee16 Changed some things to comply with Debian's packaging policies. 2012-05-02 22:57:12 +02:00
Raoul Snyman
070ed7fcb5 Merged HEAD from trunk and fixed a conflict.
Some more refactoring.
2012-04-22 21:37:11 +02:00
Andreas Preikschat
69b616a3ec added favicon to remote pages 2012-04-21 09:03:32 +02:00
Raoul Snyman
b4538541f9 Updated libraries and made some UI and usability improvements to the web remote.
bzr-revno: 1946
2012-04-20 21:36:10 +02:00
Raoul Snyman
4810bce920 Removed animations due to rendering issues on some browsers.
Removed the "close dialog" call since it was being called after the "go to" in some browsers (instead of before).
2012-04-18 22:44:47 +02:00
Tim Bentley
33e6fc328e Fix default 2012-04-17 18:28:35 +01:00
Raoul Snyman
aae1d3753b Updated jQuery.
Updated jQuery Mobile.
Fixed headers at the top.
Fixed toolbars at the bottom.
Removed top toolbars.
Added navigation to the top of most screens.
Added a "Add & Go to Service" button on the search result options dialog.
Implemented Theme and Desktop blank types.
Changed "back" button to say "Home" instead, and actually added the text.
2012-04-16 23:57:10 +02:00
Tim Bentley
04b4a34c68 Add service count for remotes 2012-04-10 20:38:25 +01:00
Jon Tibble
50f3f2c9b8 Various code cleanups and fix bugs #888815 and #941966
bzr-revno: 1912
Fixes: https://launchpad.net/bugs/888815, https://launchpad.net/bugs/941966
2012-03-19 06:10:37 +00:00
Jon Tibble
025a81d553 Head r1909 2012-03-18 09:33:05 +00:00
Mattias Põldaru
03d837b534 Merge. 2012-03-18 11:31:41 +02:00
Tim Bentley
f5a5c641b1 Remove extra blank line 2012-03-18 08:14:51 +00:00
Tim Bentley
a22907d639 Remove blank line 2012-03-18 08:06:13 +00:00
Mattias Põldaru
06ff33ac96 Style fix. Thanks to trb for nice example on he's branch. 2012-03-18 02:15:31 +02:00
Mattias Põldaru
5710e2aefd Drop received alerts if alerts plugin is disabled.
Prevent tracebacks when url does not contain data= element.
2012-03-18 01:44:16 +02:00
Tim Bentley
83629a1b22 Get it working this time 2012-03-17 10:51:04 +00:00
Tim Bentley
d00840d1e0 Make plugin config updates generic
Fix up some copyright issues missed
2012-03-17 10:40:06 +00:00
Tim Bentley
283d85fbd9 Fix remote search to not use display errors on the main UI 2012-03-17 10:23:52 +00:00
Mattias Põldaru
5cd7162cec Let's catch also all errors when response from remote is not correct JSON or it does not contain required item. 2012-03-17 10:11:42 +02:00
Mattias Põldaru
4ed5c33584 Better fix for the encoding and related issue, less doube-encoding. Now we unquote the characters after JSON has decoded it's bits. 2012-03-17 09:55:59 +02:00
Mattias Põldaru
00390ed688 Alphabetic import order, remove old catcher from python 2.5. 2012-03-17 08:55:12 +02:00
Mattias Põldaru
103d38d016 Fix double loading of songs when using remote's search and setting the song live after. 2012-03-17 08:24:42 +02:00
Mattias Põldaru
76221b4f52 Fix JS event not found error when being called from poll response. 2012-03-17 08:19:52 +02:00
Mattias Põldaru
081f9b04c2 Fix 404 not found errors. 2012-03-17 08:18:59 +02:00
Mattias Põldaru
dc69eb087d Merge. 2012-03-17 08:16:36 +02:00
Jon Tibble
5ded814527 Head r1906 2012-03-16 22:56:06 +00:00
Tim Bentley
b092f19606 Fix remote Search displaying errors on UI 2012-03-15 06:15:21 +00:00
Mattias Põldaru
f8a559c633 + is restricted as well. 2012-03-13 12:08:24 +02:00
Mattias Põldaru
c599a1785d Make escaping function a one-liner. 2012-03-13 11:11:36 +02:00
Mattias Põldaru
f7752255b0 Encode characters using URL encoding not JSON unicode markup. 2012-03-13 11:05:07 +02:00
Mattias Põldaru
8bd4ad02fd Fixes traceback when sending # or ; from web remote search or alert field.
Fixes: https://launchpad.net/bugs/908226
2012-03-13 02:58:30 +02:00
Jon Tibble
9785e7f1be Cleanups 2012-03-12 19:35:29 +00:00
Samuel Findlay
0b15238245 fixed bug #944510 'web remote doesn't scale to screen'
Fixes: https://launchpad.net/bugs/944510
2012-03-03 16:13:48 +11:00
Philip Ridout
addc049c5b Set word wrap on qrDescriptionLabel so that it doesn't cause the groupbox to resize. 2012-01-30 17:44:37 +00:00
Philip Ridout
b77b0d18d7 Added QR Code and link to download android app to settings tab 2012-01-25 22:04:36 +00:00
Jon Tibble
4280e03c47 Head r1859 2011-12-29 18:47:39 +00:00
Tim Bentley
2a5e8935bb New year merge 2011-12-27 10:33:55 +00:00
Jon Tibble
b25fe75070 Fix unused imports 2011-12-26 16:33:11 +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
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
Mattias Põldaru
5f9f87e8fa Style fixed. 2011-12-21 10:15:07 +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