shish
|
c4fdf771ee
|
backports
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@895 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-06-09 11:23:02 +00:00 |
|
shish
|
94725f1266
|
subtitles
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@888 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-06-08 15:08:24 +00:00 |
|
shish
|
f1ce267015
|
stable
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@886 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-05-28 22:39:41 +00:00 |
|
shish
|
25bfb82653
|
now that flash file dimentions are detected, it's good enough for stable \o/
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@884 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-05-26 22:08:11 +00:00 |
|
shish
|
0c334f05ed
|
backports~
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@881 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-05-25 23:06:10 +00:00 |
|
shish
|
bea09d836d
|
to 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@878 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-05-22 20:42:20 +00:00 |
|
shish
|
384e8bbdda
|
backport
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@876 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-05-20 19:35:23 +00:00 |
|
shish
|
96509995a8
|
2.2 merge
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@871 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-05-20 03:07:26 +00:00 |
|
shish
|
642a3d02e1
|
fixes / reworking to 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@868 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-05-19 17:11:08 +00:00 |
|
shish
|
f180624ebf
|
get_random_image in 2.2 also
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@866 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-05-19 13:07:16 +00:00 |
|
shish
|
482312b11e
|
featured image for 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@862 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-05-19 02:21:47 +00:00 |
|
shish
|
aaa8ccf874
|
2.2 also
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@857 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-05-18 03:33:11 +00:00 |
|
shish
|
c2ab5e5fcd
|
xmldb removal changes to 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@855 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-05-18 02:38:36 +00:00 |
|
shish
|
3f0d6562ef
|
data dir is unused, and could be a security hole in the way I'd intended it to be used...
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@854 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-05-18 02:32:04 +00:00 |
|
shish
|
d1ce3db7e2
|
2.2 also
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@841 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-05-04 21:00:29 +00:00 |
|
shish
|
24a35c37ea
|
same weird non-bug
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@838 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-30 12:33:36 +00:00 |
|
shish
|
457d5d8ad9
|
a couple more bbcode tags
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@837 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-30 12:33:19 +00:00 |
|
shish
|
56ccd7df40
|
2.2 merge
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@828 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-19 18:59:00 +00:00 |
|
shish
|
f8b414a15f
|
2.2 too
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@825 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-16 10:02:11 +00:00 |
|
shish
|
51f6c486a2
|
backport :3
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@820 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-14 11:21:38 +00:00 |
|
shish
|
367546fe06
|
back to 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@818 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-14 10:51:25 +00:00 |
|
shish
|
ffde804f24
|
SVG should be fit for stable \o/
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@815 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-11 06:59:23 +00:00 |
|
shish
|
b57ba4d484
|
backport
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@813 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-11 06:27:28 +00:00 |
|
shish
|
ce8d6f71fd
|
and 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@811 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-11 06:14:59 +00:00 |
|
shish
|
1fd2fe084b
|
apply cleanups to 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@807 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-11 05:47:16 +00:00 |
|
shish
|
7e92bdbd8e
|
backport
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@802 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-11 05:26:02 +00:00 |
|
shish
|
4c5f415da7
|
2.2 too
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@798 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-11 01:49:55 +00:00 |
|
shish
|
b7fc28e17f
|
changed include file
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@795 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-09 01:10:29 +00:00 |
|
shish
|
b2f8165a59
|
remove user enable / disable in 2.2 too
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@794 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-09 00:34:08 +00:00 |
|
shish
|
57b50d8881
|
all those into 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@793 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-08 21:59:20 +00:00 |
|
shish
|
9f595e6273
|
backport
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@788 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-08 17:16:56 +00:00 |
|
shish
|
0c9fff3d11
|
backport
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@786 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-08 16:58:31 +00:00 |
|
shish
|
d3ceb8ef97
|
changes to 2.2, and remove broken text score
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@784 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-08 16:56:12 +00:00 |
|
shish
|
64db094721
|
2.2 too, as this is probably useful to a lot of people
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@780 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-08 16:03:30 +00:00 |
|
shish
|
d47fd5f25c
|
regex thing in index in 2.2 too
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@778 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-08 15:42:05 +00:00 |
|
shish
|
f7d1df2727
|
both of those into 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@775 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-07 23:18:32 +00:00 |
|
shish
|
67455583e5
|
This feature freeze is more of a feature mild chill...
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@769 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-06 21:07:29 +00:00 |
|
shish
|
2e40bc73c8
|
I wonder if 2.2 should have branched this early <_<;;
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@767 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-06 18:42:52 +00:00 |
|
shish
|
c012717bce
|
readme update
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@765 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-06 18:00:35 +00:00 |
|
shish
|
7b4dde4918
|
and, again, 2.2~
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@764 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-06 17:57:04 +00:00 |
|
shish
|
5ad77079a6
|
2.2.too
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@762 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-06 17:44:02 +00:00 |
|
shish
|
43028ebd67
|
both of them to 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@760 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-06 16:47:44 +00:00 |
|
shish
|
f821e752fc
|
back to 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@757 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-06 16:38:32 +00:00 |
|
shish
|
73d5fe129a
|
UploadingImageEvent -> DataUploadEvent
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@754 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-04 22:16:48 +00:00 |
|
shish
|
a226a17787
|
and in 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@751 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-04 10:38:41 +00:00 |
|
shish
|
03c9d6b298
|
better cache dir in 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@748 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-01 11:02:30 +00:00 |
|
shish
|
37a0aeb8ae
|
ban by range in 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@747 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-04-01 11:00:19 +00:00 |
|
shish
|
47361369ff
|
pull a couple of mostly cosmetic changes into stable
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@741 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-03-31 03:01:35 +00:00 |
|
shish
|
6c53088929
|
version number
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@736 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-03-30 06:06:00 +00:00 |
|
shish
|
a6d68c6f1b
|
and commit it to 2.2...
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@735 7f39781d-f577-437e-ae19-be835c7a54ca
|
2008-03-29 04:13:54 +00:00 |
|