Commit Graph

83841 Commits

Author SHA1 Message Date
Marc Delisle
df299b852e Merge commit 'b05adab' 2013-06-02 06:19:12 -04:00
Aputsiaq Niels Janussen
c42eb83b94 Translated using Weblate (Danish)
Currently translated at 100.0% (2665 of 2665)
2013-06-02 09:53:13 +02:00
Weblate
3ba56ebf8c Merge remote-tracking branch 'origin/master' 2013-05-31 18:31:12 +02:00
Yuri German
267d80d475 Translated using Weblate (Hebrew)
Currently translated at 22.6% (602 of 2665)
2013-05-31 18:31:07 +02:00
Marc Delisle
dc65f0c529 Fix merge conflict 2013-05-31 12:30:53 -04:00
Weblate
b05adabc45 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-05-31 18:30:29 +02:00
Marc Delisle
9d945e8a03 Merge branch 'QA_4_0' 2013-05-31 12:30:28 -04:00
Yuri German
357feda357 Translated using Weblate (Hebrew)
Currently translated at 23.2% (604 of 2602)
2013-05-31 18:30:24 +02:00
Marc Delisle
961515d50b 4.0.4-dev 2013-05-31 12:30:06 -04:00
Marc Delisle
4781c3e105 Merge branch 'MAINT_4_0_3' into QA_4_0 2013-05-31 12:28:51 -04:00
Marc Delisle
cfa87b6835 4.0.3-rc1 release 2013-05-31 12:28:20 -04:00
Marc Delisle
24fc4f5d53 Merge branch 'QA_4_0' 2013-05-31 11:59:59 -04:00
Marc Delisle
7de49938b0 Function forgot to return its result 2013-05-31 11:56:11 -04:00
Marc Delisle
af46efa5ed If a TIMESTAMP contains a NULL value, show it when inserting or editing 2013-05-31 11:24:00 -04:00
Weblate
adddd0c126 Merge remote-tracking branch 'origin/master' 2013-05-31 16:02:10 +02:00
Robert Readman
a0ee99ba06 Translated using Weblate (English (United Kingdom))
Currently translated at 96.2% (2565 of 2665)
2013-05-31 16:01:26 +02:00
Dieter Adriaenssens
90cd927424 Merge remote branch 'origin/QA_4_0' 2013-05-31 15:59:53 +02:00
Dieter Adriaenssens
e30a399398 Merge commit '3311c6f'
Conflicts:
	view_create.php
2013-05-31 15:58:45 +02:00
Weblate
c4e3c9a183 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-05-31 15:35:16 +02:00
Yungu Kim
db0201b679 Translated using Weblate (Korean)
Currently translated at 65.9% (1716 of 2602)
2013-05-31 15:35:12 +02:00
Michal Čihař
fe1fe990ac Translated using Weblate (German)
Currently translated at 99.8% (2597 of 2602)
2013-05-31 15:35:09 +02:00
Robert Readman
bd088b1f13 Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (2602 of 2602)
2013-05-31 15:35:07 +02:00
Michal Čihař
c2d9a2f0c4 Translated using Weblate (Bengali)
Currently translated at 20.3% (529 of 2602)
2013-05-31 15:35:04 +02:00
J.M
3311c6f161 Changelog entry for Javascript execution vulnerability PMASA-2013-6 2013-05-31 15:34:02 +02:00
J.M
b3388dd0c6 Merge branch 'MAINT_4_0_2-security' into QA_4_0 2013-05-31 15:31:18 +02:00
Weblate
1a72ca2bc0 Merge remote-tracking branch 'origin/master' 2013-05-31 10:12:29 +02:00
Yungu Kim
9c9ca40b8b Translated using Weblate (Korean)
Currently translated at 63.8% (1700 of 2665)
2013-05-31 10:12:23 +02:00
Michal Čihař
bda40357ed Exclude phpseclib from coverage reports 2013-05-31 10:11:52 +02:00
Weblate
25816ff3ad Merge remote-tracking branch 'origin/master' 2013-05-30 13:54:45 +02:00
Michal Čihař
e207553453 Translated using Weblate (Slovak)
Currently translated at 71.8% (1913 of 2665)
2013-05-30 13:54:42 +02:00
Michal Čihař
5d94772a04 Translated using Weblate (Polish)
Currently translated at 95.2% (2536 of 2665)
2013-05-30 13:54:39 +02:00
Giovanni Sora
f0caa0a90a Translated using Weblate (Interlingua)
Currently translated at 12.7% (338 of 2665)
2013-05-30 13:54:36 +02:00
Michal Čihař
8f38a8bbfd Translated using Weblate (German)
Currently translated at 95.5% (2545 of 2665)
2013-05-30 13:54:33 +02:00
Michal Čihař
0794cd9124 Translated using Weblate (Catalan)
Currently translated at 95.5% (2544 of 2665)
2013-05-30 13:54:31 +02:00
Michal Čihař
e3024f93b0 Translated using Weblate (Bengali)
Currently translated at 19.2% (512 of 2665)
2013-05-30 13:54:26 +02:00
Marc Delisle
5fffdca3aa Parser: remove the color (html) mode 2013-05-30 07:54:05 -04:00
Marc Delisle
a215809922 Merge branch 'QA_4_0' 2013-05-29 17:25:38 -04:00
Marc Delisle
d448add28e bug #3579 NOW() function incorrectly selected (partial regression) 2013-05-29 17:23:35 -04:00
Dieter Adriaenssens
9b3551601c escape query in error message 2013-05-29 21:13:32 +02:00
Dieter Adriaenssens
400232f8c0 rename file : remove space 2013-05-29 20:02:06 +02:00
Marc Delisle
3e10572805 Fix typo 2013-05-29 09:57:34 -04:00
Marc Delisle
edf4b0ade8 Merge commit '36ad937' 2013-05-29 09:53:40 -04:00
Marc Delisle
cec2f43648 Merge commit '34e12cf' 2013-05-29 09:51:31 -04:00
Marc Delisle
ccf266a489 Merge commit '0defb51' 2013-05-29 09:51:17 -04:00
Weblate
36ad9371ee Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-05-29 15:48:42 +02:00
Burak Yavuz
c6309b904f Translated using Weblate (Turkish)
Currently translated at 100.0% (2602 of 2602)
2013-05-29 15:48:39 +02:00
Chung-Lun Chiang
5bb6eacc05 Translated using Weblate (Traditional Chinese)
Currently translated at 80.6% (2098 of 2602)
2013-05-29 15:48:36 +02:00
Michal Čihař
2c5fef5f62 Translated using Weblate (Thai)
Currently translated at 46.0% (1197 of 2602)
2013-05-29 15:48:34 +02:00
Matías Bellone
5210283709 Translated using Weblate (Spanish)
Currently translated at 100.0% (2602 of 2602)
2013-05-29 15:48:31 +02:00
Michal Čihař
790be4bf2e Translated using Weblate (Slovenian)
Currently translated at 100.0% (2602 of 2602)
2013-05-29 15:48:28 +02:00