Commit Graph

3661 Commits

Author SHA1 Message Date
Andreas Preikschat ca406df0a4 head 2013-03-08 09:14:39 +01:00
Raoul Snyman d6d1ecf616 Naming convention cleanups and a few merges from the upstream branch. 2013-03-07 23:04:19 +02:00
Andreas Preikschat 25919a34b2 fixed objectNames 2013-03-07 18:58:15 +01:00
Andreas Preikschat 7adb4bbdb5 do not override build-ins, clean ups 2013-03-07 13:59:35 +01:00
Andreas Preikschat 7e8b21b99f progress bar fix 2013-03-07 12:11:35 +01:00
Andreas Preikschat d2df81141f last old signals 2013-03-07 12:10:16 +01:00
Andreas Preikschat 6066c80194 changed most of the signals to our new style 2013-03-07 12:01:06 +01:00
Andreas Preikschat 1031651db0 printform/dialog: code standards 2013-03-07 11:25:27 +01:00
Andreas Preikschat 99cdaa61ca fixed docs, and signals 2013-03-07 09:24:12 +01:00
Andreas Preikschat d2d34ed175 fixed display 2013-03-07 09:14:26 +01:00
Andreas Preikschat a27b251060 songimporters 2013-03-07 09:05:43 +01:00
Andreas Preikschat 33ebf40630 toolbar: code standards 2013-03-07 07:48:09 +01:00
Raoul Snyman e5c87ed6f2 HEAD 2013-03-07 08:47:43 +02:00
Andreas Preikschat 14b61cabf4 renamed canFolder 2013-03-07 00:00:57 +01:00
Andreas Preikschat e1f35e002a some media renames 2013-03-06 23:54:16 +01:00
Andreas Preikschat 1d9425c3b7 renamed videoBehindText 2013-03-06 23:50:49 +01:00
Andreas Preikschat 8383acf636 renamed isValid 2013-03-06 23:49:13 +01:00
Andreas Preikschat c403e78684 renamed mediaObject, fixed songVerseMenu 2013-03-06 23:42:52 +01:00
Andreas Preikschat 86efc5629c fixed formattigtagsform/dialog 2013-03-06 23:32:59 +01:00
Andreas Preikschat 1660fbf2f8 fixed formattigtagsform/dialog 2013-03-06 23:27:22 +01:00
Andreas Preikschat 8bb4c7e131 renamed serviceItem 2013-03-06 23:23:01 +01:00
Andreas Preikschat b864d360d3 r2201 2013-03-06 22:54:13 +01:00
Tim Bentley ca920ff774 Merge issues 2013-03-06 21:49:46 +00:00
Tim Bentley 13f18e271b Fix review comments 2013-03-06 17:46:19 +00:00
Andreas Preikschat 555e38275a changed order 2013-03-05 18:12:40 +01:00
Tim Bentley 4fb0aca862 Fix review comments 2013-03-05 17:11:58 +00:00
Andreas Preikschat 33db8e143b fixed maindisplay opening again 2013-03-05 18:08:15 +01:00
Andreas Preikschat 4625f1f3a1 fixed object names 2013-03-05 15:18:05 +01:00
Andreas Preikschat 11db599cb1 exception form: code standards 2013-03-05 15:14:37 +01:00
Andreas Preikschat 8fed2230d3 exception form: code standards 2013-03-05 15:05:19 +01:00
Andreas Preikschat 4f1933dcfe execptionform: code standards 2013-03-05 15:02:56 +01:00
Andreas Preikschat 5d68663c10 reverted maindisplay changes (avoid conflict) 2013-03-05 14:56:34 +01:00
Andreas Preikschat 6730d03373 fixed signal connecting 2013-03-05 14:55:50 +01:00
Andreas Preikschat 24bb3567ed r2198 2013-03-05 14:43:04 +01:00
Andreas Preikschat a835930990 renamed JS function 2013-03-05 11:36:41 +01:00
Andreas Preikschat a4f4ef0d7d r2198 2013-03-05 10:41:00 +01:00
Raoul Snyman e2c0ab3d8a HEAD 2013-03-05 08:25:16 +02:00
Raoul Snyman f1c2515502 HEAD 2013-03-04 22:40:28 +02:00
Andreas Preikschat 7c36d78ed8 r2197 2013-03-04 21:17:45 +01:00
Tim Bentley bb48e35c5f Fix theme load bug 2013-03-04 19:35:33 +00:00
Andreas Preikschat 2ed067ea0c enable OpenGL again 2013-03-04 20:22:43 +01:00
Andreas Preikschat 6d66e6b957 fixed preview 2013-03-04 20:14:36 +01:00
Tim Bentley 5ee12ff1c0 Fix bug from bootstrap merge 2013-03-04 18:01:57 +00:00
Tim Bentley 847eb4d910 remove print 2013-03-04 16:56:41 +00:00
Tim Bentley 3a44717acf Head and conflict 2013-03-04 16:55:13 +00:00
Andreas Preikschat ac50ae1553 head 2013-03-04 11:55:02 +01:00
Andreas Preikschat 557c90129a started to work on transitions 2013-03-04 11:52:38 +01:00
Raoul Snyman 6c1a0aa5e7 HEAD 2013-03-04 10:53:43 +02:00
Tim Bentley 73fb71b4ce Head + conflicts 2013-03-01 17:45:17 +00:00
Tim Bentley 188aa53082 Head + conflicts 2013-03-01 17:36:43 +00:00