Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.1 stable #24

Open
wants to merge 241 commits into
base: 1.1-stable
Choose a base branch
from
Open

1.1 stable #24

Changes from all commits
Commits
Show all changes
241 commits
Select commit Hold shift + click to select a range
4775864
Adding 1.0 stable branch to prepare for 1.0.0 RC
edavis10 Jul 16, 2010
4f5dc94
Merged r3845 from trunk.
edavis10 Jul 16, 2010
a2a3dae
Merged r3847 from trunk.
edavis10 Jul 18, 2010
0ae9cc7
Merged r3848 from trunk.
edavis10 Jul 18, 2010
619c148
Merged r3849 from trunk.
edavis10 Jul 18, 2010
1cc116f
Merged r3853 from trunk.
edavis10 Jul 18, 2010
6ed2e00
Merged r3854 from trunk.
edavis10 Jul 18, 2010
4b52b7a
Change version to the show this is the stable branch.
edavis10 Jul 18, 2010
8a1d45f
Merged r3860 from trunk.
edavis10 Jul 24, 2010
be52ccf
Merged r3859 from trunk.
edavis10 Jul 24, 2010
69f34a5
Merged r3865 and r3866 from trunk.
jplang Jul 25, 2010
f70a8cd
Merged r3869 from trunk.
jplang Jul 25, 2010
b412270
Merged r3871 from trunk.
jplang Jul 25, 2010
ec526c1
Merged r3873 from trunk.
jplang Jul 25, 2010
41c6d3c
Merged r3875 from trunk.
jplang Jul 25, 2010
41e3848
Merged r3877 from trunk.
jplang Jul 25, 2010
8146e09
Merged r3879 from trunk.
jplang Jul 25, 2010
52a12aa
Merged r3881 from trunk.
jplang Jul 25, 2010
e771fc0
Merged r3883, r3884 and r3885 from trunk.
jplang Jul 25, 2010
f682be8
Merged r3887 from trunk.
jplang Jul 25, 2010
29e7ae9
Merged r3889 from trunk.
jplang Jul 25, 2010
8f64938
Merged r3891 from trunk.
jplang Jul 25, 2010
0843b18
Merged r3893 from trunk.
edavis10 Jul 29, 2010
677fee3
Merged r3894 from trunk.
edavis10 Jul 29, 2010
59f9869
Merged r3897 from trunk.
edavis10 Jul 30, 2010
df120e4
Merged r3898 from trunk
edavis10 Jul 30, 2010
9af4cb5
Merged r3899 from trunk
edavis10 Jul 30, 2010
8458dc2
Merged r3903 from trunk.
edavis10 Aug 19, 2010
c731d11
Merged r3904 from trunk.
edavis10 Aug 19, 2010
ae3d542
Merged r3905 from trunk.
edavis10 Aug 19, 2010
8dde6e0
Merged r3906 from trunk.
edavis10 Aug 19, 2010
acaa223
Merged r3907 from trunk.
edavis10 Aug 19, 2010
7a9fab7
Merged r3908 from trunk.
edavis10 Aug 19, 2010
c20e85e
Merged r3909 from trunk.
edavis10 Aug 19, 2010
a640894
Merged r3910 from trunk.
edavis10 Aug 19, 2010
b024631
Merged r3911 from trunk.
edavis10 Aug 19, 2010
19bbb6e
Merged r3912 from trunk.
edavis10 Aug 19, 2010
3f1c3fa
Merged r3913 from trunk.
edavis10 Aug 19, 2010
4426fd6
Merged r3914 from trunk.
edavis10 Aug 19, 2010
7bdf0ab
Merged r3915 from trunk.
edavis10 Aug 19, 2010
102e845
Merged r3916 from trunk.
edavis10 Aug 19, 2010
9892ede
Merged r3917 from trunk.
edavis10 Aug 19, 2010
2f529fd
Merged r3918 from trunk.
edavis10 Aug 19, 2010
7cae433
Merged r3919 from trunk.
edavis10 Aug 19, 2010
dfe4401
Merged r3920 from trunk.
edavis10 Aug 19, 2010
4ff6070
Merged r3921 from trunk.
edavis10 Aug 19, 2010
31d233e
Merged r3922 from trunk.
edavis10 Aug 19, 2010
18d8415
Merged r3923 from trunk.
edavis10 Aug 19, 2010
c7e719f
Merged r3924 from trunk.
edavis10 Aug 19, 2010
a96eb37
Merged r3925 from trunk.
edavis10 Aug 19, 2010
b6bc3a3
Merged r3926 from trunk.
edavis10 Aug 19, 2010
c672725
Merged r3927 from trunk.
edavis10 Aug 19, 2010
36ad597
Merged r3928 from trunk.
edavis10 Aug 19, 2010
597266e
Merged r3929 from trunk.
edavis10 Aug 19, 2010
b5b8d34
Merged r3930 from trunk.
edavis10 Aug 19, 2010
358ee2e
Merged r3931 from trunk.
edavis10 Aug 19, 2010
72ce3e1
Merged r3932 from trunk.
edavis10 Aug 19, 2010
7ca197b
Merged r3933 from trunk.
edavis10 Aug 19, 2010
5345a2d
Merged r3934 from trunk.
edavis10 Aug 19, 2010
ab5ce45
Merged r3935 from trunk.
edavis10 Aug 19, 2010
fab5064
Merged r3936 from trunk.
edavis10 Aug 19, 2010
7af6106
Merged r3937 from trunk.
edavis10 Aug 19, 2010
6e5f567
Merged r3938 from trunk.
edavis10 Aug 19, 2010
10a76f5
Merged r3939 from trunk.
edavis10 Aug 19, 2010
8ca6941
Merged r3940 from trunk.
edavis10 Aug 19, 2010
2012c60
Merged r3941 from trunk.
edavis10 Aug 19, 2010
758feac
Merged r3942 from trunk.
edavis10 Aug 19, 2010
1c93f99
Merged r3943 from trunk.
edavis10 Aug 19, 2010
bc57078
Merged r3944 from trunk.
edavis10 Aug 19, 2010
a12a073
Merged r3945 from trunk.
edavis10 Aug 19, 2010
80e833c
Merged r3946 from trunk.
edavis10 Aug 19, 2010
d1a9f81
Merged r3947 from trunk.
edavis10 Aug 19, 2010
b9f23be
Merged r3948 from trunk.
edavis10 Aug 19, 2010
d457f90
Merged r3949 from trunk.
edavis10 Aug 19, 2010
3e692a9
Merged r3950 from trunk.
edavis10 Aug 19, 2010
047bf69
Merged r3951 from trunk.
edavis10 Aug 19, 2010
ccbc9f8
Merged r3952 from trunk.
edavis10 Aug 19, 2010
9e5d210
Merged r4003 from trunk.
edavis10 Aug 22, 2010
d60cc50
Merged r4004 from trunk.
edavis10 Aug 22, 2010
86e986f
Merged r4005 from trunk.
edavis10 Aug 22, 2010
27ef72c
Merged r4006 from trunk.
edavis10 Aug 22, 2010
e292446
Merged r4007 from trunk.
edavis10 Aug 22, 2010
b8d5a05
Merged r4008 from trunk.
edavis10 Aug 22, 2010
b419deb
Merged r4009 from trunk.
edavis10 Aug 22, 2010
7443f2a
Merged r4010 from trunk.
edavis10 Aug 22, 2010
519069b
Merged r4011 from trunk.
edavis10 Aug 22, 2010
b5d64b9
Merged r4012 from trunk.
edavis10 Aug 22, 2010
0d7cead
Merged r4013 from trunk.
edavis10 Aug 22, 2010
c8c4fb1
Merged r4014 from trunk.
edavis10 Aug 22, 2010
00b5328
Merged changelog from trunk, r4027.
edavis10 Aug 22, 2010
2bea4b3
Merged r4028 from trunk.
edavis10 Aug 22, 2010
29f9f3f
Merged r4029 from trunk.
edavis10 Aug 22, 2010
d090e53
Merged r4034 form trunk.
edavis10 Sep 20, 2010
cee0dce
Merged r4035 from trunk.
edavis10 Sep 20, 2010
b2e82fd
Merged r4036 from trunk.
edavis10 Sep 20, 2010
6fe600b
Merged r4037 from trunk.
edavis10 Sep 20, 2010
ada4c88
Merged r4038 from trunk.
edavis10 Sep 20, 2010
8a42ca8
Merged r4039 from trunk.
edavis10 Sep 20, 2010
af5d9ca
Merged r4040 from trunk.
edavis10 Sep 20, 2010
56fba47
Merged r4042 from trunk.
edavis10 Sep 20, 2010
7b472a6
Merged r4043 from trunk.
edavis10 Sep 20, 2010
8fa5019
Merged r4047 from trunk.
edavis10 Sep 20, 2010
f2711af
Merged r4048 from trunk.
edavis10 Sep 20, 2010
8de76de
Merged r4049 from trunk.
edavis10 Sep 20, 2010
771723c
Merged r4050 from trunk.
edavis10 Sep 20, 2010
d2a4265
Merged r4051 from trunk.
edavis10 Sep 20, 2010
973c54d
Merged r4052 from trunk.
edavis10 Sep 20, 2010
5e49df0
Merged r4053 from trunk.
edavis10 Sep 20, 2010
1f278a0
Merged r4054 from trunk.
edavis10 Sep 20, 2010
32b2e84
Merged r4055 from trunk.
edavis10 Sep 20, 2010
67867d9
Merged r4056 from trunk.
edavis10 Sep 20, 2010
8972582
Merged r4057 from trunk.
edavis10 Sep 20, 2010
47e12f1
Merged r4058 from trunk.
edavis10 Sep 20, 2010
c48e40a
Merged r4059 from trunk.
edavis10 Sep 20, 2010
9342213
Merged r4060 from trunk.
edavis10 Sep 20, 2010
e32fc44
Merged r4061 from trunk.
edavis10 Sep 20, 2010
823fd16
Merged r4062 from trunk.
edavis10 Sep 20, 2010
5a63917
Merged r4063 from trunk.
edavis10 Sep 20, 2010
0042330
Merged r4064 from trunk.
edavis10 Sep 20, 2010
d2f9a72
Merged r4065 from trunk.
edavis10 Sep 20, 2010
1e370f2
Merged r4066 from trunk.
edavis10 Sep 20, 2010
9321ffd
Merged r4067 from trunk.
edavis10 Sep 20, 2010
f8e46cf
Merged r4068 from trunk.
edavis10 Sep 20, 2010
f219a92
Merged r4069 from trunk.
edavis10 Sep 20, 2010
f74d980
Merged r4070 from trunk.
edavis10 Sep 20, 2010
4a5dce4
Merged r4076 from trunk.
edavis10 Sep 20, 2010
d1952ae
Merged r4080 from trunk.
edavis10 Sep 20, 2010
46fc878
Merged r4082 from trunk.
edavis10 Sep 20, 2010
066f648
Merged r4083 from trunk.
edavis10 Sep 20, 2010
7ad17f9
Merged r4086 from trunk.
edavis10 Sep 20, 2010
b5bbc93
Merged r4087 from trunk.
edavis10 Sep 20, 2010
2149add
Merged r4088 from trunk.
edavis10 Sep 20, 2010
5003152
Merged r4089 from trunk.
edavis10 Sep 20, 2010
60caea0
Merged r4090 from trunk.
edavis10 Sep 20, 2010
1c62645
Merged r4091 from trunk.
edavis10 Sep 20, 2010
d99d2ef
Merged r4092 from trunk.
edavis10 Sep 20, 2010
4593d97
Merged r4093 from trunk.
edavis10 Sep 20, 2010
b35bc6d
Merged r4094 from trunk.
edavis10 Sep 20, 2010
e1a557f
Merged r4095 from trunk.
edavis10 Sep 20, 2010
e450c12
Merged r4096 from trunk.
edavis10 Sep 20, 2010
0a62a91
Merged r4099 from trunk.
edavis10 Sep 20, 2010
019ea4a
Merged r4100 from trunk.
edavis10 Sep 20, 2010
7dbc8b4
Merged r4102 from trunk.
edavis10 Sep 20, 2010
8bd0ff0
Merged r4103 from trunk.
edavis10 Sep 20, 2010
b0b321b
Merged r4104 from trunk.
edavis10 Sep 20, 2010
1c63c44
Merged r4105 from trunk.
edavis10 Sep 20, 2010
d44a900
Merged r4107 from trunk.
edavis10 Sep 20, 2010
65b6b7f
Merged r4164 from trunk.
edavis10 Sep 26, 2010
c51f9b8
Merged r4165 from trunk.
edavis10 Sep 26, 2010
47b969d
Merged r4166 from trunk.
edavis10 Sep 26, 2010
945cd39
Merged r4167 from trunk.
edavis10 Sep 26, 2010
7d55572
Merged r4169 from trunk.
edavis10 Sep 26, 2010
5e7e114
Merged r4171 from trunk.
edavis10 Sep 26, 2010
3909d2c
Merged r4173 from trunk.
edavis10 Sep 26, 2010
ef90132
Merged r4175 from trunk.
edavis10 Sep 26, 2010
22bcce6
Merged r4177 from trunk.
edavis10 Sep 26, 2010
324baf6
Merged r4180 from trunk.
edavis10 Sep 26, 2010
c4e123b
Merged r4181 from trunk.
edavis10 Sep 26, 2010
25b2ffb
Merged r4182 from trunk.
edavis10 Sep 26, 2010
eb05880
Merged r4183 from trunk.
edavis10 Sep 26, 2010
98eaff4
Merged r4185 from trunk.
edavis10 Sep 26, 2010
dd91dc4
Merged r4186 from trunk.
edavis10 Sep 26, 2010
2c91d15
Merged r4187 from trunk.
edavis10 Sep 26, 2010
924bb8d
Merged r4188 from trunk.
edavis10 Sep 26, 2010
babcd39
Merged r4189 from trunk.
edavis10 Sep 26, 2010
7bbf4af
Locales update
edavis10 Sep 26, 2010
77ba8bb
Merged r4209 from trunk.
edavis10 Sep 26, 2010
38a2beb
Merged r4210 from trunk.
edavis10 Sep 26, 2010
a8eef83
Merged r4237 from trunk.
edavis10 Oct 31, 2010
c18d96b
Merged r4238 from trunk.
edavis10 Oct 31, 2010
e29696e
Merged r4240 from trunk.
edavis10 Oct 31, 2010
05432cf
Merged r4241 from trunk.
edavis10 Oct 31, 2010
a63c923
Merged r4245 from trunk.
edavis10 Oct 31, 2010
0078d40
Merged r4249 from trunk.
edavis10 Oct 31, 2010
95ecc56
Merged r4254 from trunk.
edavis10 Oct 31, 2010
0093e08
Merged r4256 from trunk.
edavis10 Oct 31, 2010
79a0d92
Merged r4257 from trunk.
edavis10 Oct 31, 2010
50cb1be
Merged r4258 from trunk.
edavis10 Oct 31, 2010
2b69a96
Merged r4263 from trunk.
edavis10 Oct 31, 2010
a8e4e70
Merged r4273 from trunk.
edavis10 Oct 31, 2010
1b40123
Merged r4275 from trunk.
edavis10 Oct 31, 2010
494c149
Merged r4284 from trunk.
edavis10 Oct 31, 2010
a04bbfb
Merged r4287 from trunk.
edavis10 Oct 31, 2010
e2266a9
Merged r4288 from trunk.
edavis10 Oct 31, 2010
527cd57
Merged r4291 from trunk.
edavis10 Oct 31, 2010
1ee7954
Merged r4292 from trunk.
edavis10 Oct 31, 2010
cbacc0c
Merged r4293 from trunk.
edavis10 Oct 31, 2010
7c485cd
Merged r4297 from trunk.
edavis10 Oct 31, 2010
3a401f7
Merged r4298 from trunk.
edavis10 Oct 31, 2010
01728ea
Merged r4299 from trunk.
edavis10 Oct 31, 2010
004f9ea
Merged r4300 from trunk.
edavis10 Oct 31, 2010
aba28ff
Merged r4301 from trunk.
edavis10 Oct 31, 2010
93fae41
Merged r4302 from trunk.
edavis10 Oct 31, 2010
17ccc33
Merged r4304 from trunk.
edavis10 Oct 31, 2010
0ceea88
Merged r4305 from trunk.
edavis10 Oct 31, 2010
86ee823
Merged r4306 from trunk.
edavis10 Oct 31, 2010
39cc127
Merged r4307 from trunk.
edavis10 Oct 31, 2010
2cf5656
Merged r4308 from trunk.
edavis10 Oct 31, 2010
60af097
Merged r4309 from trunk.
edavis10 Oct 31, 2010
a472f86
Merged r4310 from trunk.
edavis10 Oct 31, 2010
2873a70
Merged r4311 from trunk.
edavis10 Oct 31, 2010
e2877d9
Merged r4312 from trunk.
edavis10 Oct 31, 2010
e9e7463
Locales update for the stable branch
edavis10 Nov 1, 2010
8cc20c6
Merged r4348 from trunk.
edavis10 Nov 1, 2010
4bf0c59
Merged r4349 from trunk.
edavis10 Nov 1, 2010
f1f0704
Merged r4354 from trunk.
jplang Nov 1, 2010
9b1eda1
Fixed a test broken by r4355 (#6786).
jplang Nov 1, 2010
d3b536e
Merged r4389 from trunk.
jplang Nov 9, 2010
2b9a5bf
Merged r4378 from trunk.
jplang Nov 14, 2010
e174c10
Merged r4385 from trunk.
jplang Nov 14, 2010
c70ae6c
Merged r4380 from trunk.
jplang Nov 14, 2010
2a7a95d
Backported r4397 from trunk.
jplang Nov 14, 2010
dbb26b0
Merged r4414 from trunk.
jplang Nov 20, 2010
6c362a5
Merged r4417 from trunk.
jplang Nov 20, 2010
b5a4097
Merged r4419 from trunk.
jplang Nov 20, 2010
faa461c
Merged r4422 from trunk.
jplang Nov 21, 2010
92b37c0
Merged r4426 from trunk.
jplang Nov 27, 2010
db64675
Merged r4431 from trunk.
jplang Nov 27, 2010
eb590ce
Merged r4428 from trunk.
jplang Nov 27, 2010
f5f5535
Translations updates.
jplang Nov 27, 2010
bdb8884
Merged r4437 from trunk.
jplang Nov 27, 2010
541a371
Backported r4357, r4358, r4360 and r4363 to r4367 from trunk.
jplang Nov 27, 2010
b58382e
Merged r4386 from trunk.
jplang Nov 27, 2010
bac64c9
Backported r4441 to r4444 from trunk.
jplang Nov 27, 2010
ed52753
Updates for 1.0.4 release.
jplang Nov 28, 2010
a67f069
Merged r4449 from trunk.
jplang Nov 29, 2010
bd8e8bc
Fixed: error when sending notification on wiki edit for bg, es, zh-TW…
jplang Dec 7, 2010
142b837
Backported r4530 from trunk.
jplang Dec 18, 2010
fdaf587
Merged r4516 from trunk (i18n 0.4.2 gem is now required: 'gem install…
jplang Dec 18, 2010
f4ada31
Merged r4535 from trunk.
jplang Dec 18, 2010
cb30fa4
Merged r4468 from trunk.
jplang Dec 18, 2010
c02ecdd
Merged r4539 from trunk.
jplang Dec 18, 2010
63c4fb5
Merged r4541 from trunk.
jplang Dec 18, 2010
ba99936
Restores non english field_start_date translations (#6629, #7016).
jplang Dec 22, 2010
f9bd713
Removed 1.1 specific translations that were unsafely merged in 1.0 (#…
jplang Dec 22, 2010
40ca445
Merged r4561 from trunk.
jplang Dec 23, 2010
0bff40c
Merged r4467 from trunk
jplang Dec 23, 2010
c6852b7
Merged r4469 from trunk
jplang Dec 23, 2010
902d765
Merged r4553 from trunk.
jplang Dec 23, 2010
aba0dc0
Updates for 1.0.5 release.
jplang Dec 23, 2010
2e4b125
Merge remote branch 'origin/1.0-stable' into 1.1-stable
mattconnolly Jan 30, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.