Commit Graph

76892 Commits

Author SHA1 Message Date
Alex Marin
415bd34b1c oop: change include locations for plugins 2012-06-22 19:13:33 +03:00
Alex Marin
c9218f08a6 oop: plugins bugs 2012-06-22 18:35:15 +03:00
Alex Marin
89570a5475 oop: import/upload interface and classes 2012-06-22 18:28:24 +03:00
Alex Marin
c10ee4dc9f Merge branch 'master' into plugins-and-OOP 2012-06-22 15:39:57 +03:00
Alex Marin
65467e9c77 oop: AuthenticationCookie bug 2012-06-22 15:38:54 +03:00
ProUser
9d2a8ca65c Translated using Weblate. 2012-06-22 13:11:37 +02:00
Alex Marin
0565b0e12a oop: integrate authentication plugins 2012-06-22 11:43:54 +03:00
Michal Čihař
f4d1eed004 Merge remote-tracking branch 'origin/QA_3_5' 2012-06-22 10:26:40 +02:00
Hyun-Sung Yun
c779b1ff10 Translated using Weblate. 2012-06-22 10:24:57 +02:00
Hyun-Sung Yun
61bf6575ec Translated using Weblate. 2012-06-22 10:24:44 +02:00
Alex Marin
1df5cc8eae oop: remake PMA_blowfish_test 2012-06-22 11:09:25 +03:00
Alex Marin
29cb9811d3 oop: Auth - phpcs errors; remove php+html mix 2012-06-22 11:00:53 +03:00
Alex Marin
2640b1399f oop: AuthenticationCookie bug 2012-06-22 10:30:23 +03:00
Alex Marin
096a0a224f oop: AuthenticationSignon 2012-06-22 10:23:36 +03:00
Alex Marin
6d1f1132da oop: AuthenticationHTTP 2012-06-22 10:23:36 +03:00
Alex Marin
c91e80b6ca oop: AuthenticationCookie 2012-06-22 10:23:36 +03:00
Alex Marin
aad914f7b8 oop: AuthenticationConfig 2012-06-22 09:22:37 +03:00
Alex Marin
bb77c8ede6 oop: merge master 2012-06-22 08:57:41 +03:00
Michal Čihař
906d025d1f Merge remote-tracking branch 'origin/master' 2012-06-21 13:27:31 +02:00
Michal Čihař
64b19b0181 Wrap some long lines 2012-06-21 13:27:19 +02:00
Michal Čihař
82fc0ff49f Some indenation fixes 2012-06-21 13:27:19 +02:00
Michal Čihař
419edd70c0 Merge remote-tracking branch 'origin/master' 2012-06-21 12:27:11 +02:00
Marc Delisle
10c9132fdf Typos 2012-06-21 06:26:59 -04:00
Michal Čihař
dbc18bb2c9 Merge remote-tracking branch 'origin/master' 2012-06-21 12:18:33 +02:00
Marc Delisle
747d49f2be Typo 2012-06-21 06:18:01 -04:00
Marc Delisle
ba0a51e9f9 This should be a boolean param 2012-06-21 06:17:22 -04:00
Victor Volkov
781f86712a Translated using Weblate. 2012-06-21 12:09:24 +02:00
Michal Čihař
9102d0f1c1 Wrap some long lines 2012-06-21 11:34:11 +02:00
Michal Čihař
8a41de8c24 Fix docblocks 2012-06-21 11:29:50 +02:00
Michal Čihař
cad77715a4 Indenation fix 2012-06-21 10:54:11 +02:00
Michal Čihař
1924460dba Some minor coding style fixes 2012-06-21 10:43:24 +02:00
Michal Čihař
50c01dbd19 Wrap some long lines 2012-06-21 10:07:57 +02:00
Michal Čihař
aa3a1bbb0d Various spacing and indentation improvements 2012-06-21 10:00:52 +02:00
Michal Čihař
7c645a10c6 Various fixes for docblocks 2012-06-21 09:58:35 +02:00
Michal Čihař
bc3ecfbba2 Merge remote-tracking branch 'origin/QA_3_5' 2012-06-21 09:07:26 +02:00
Marc Delisle
2f47c31a66 Translated using Weblate. 2012-06-21 09:06:23 +02:00
Alex Marin
6efd5422f7 oop: transformations phpcs errors 2012-06-20 20:45:41 +03:00
Alex Marin
b0248d0e4d oop: fix transformations bug 2012-06-20 20:44:28 +03:00
Marc Delisle
b035024500 Translated using Weblate. 2012-06-20 18:40:32 +02:00
Marc Delisle
092b24227e Translated using Weblate. 2012-06-20 18:39:04 +02:00
Alex Marin
11596ca702 oop: merge master, fix conflicts 2012-06-20 18:35:00 +03:00
Alex Marin
02dbd14fc7 oop: integrate transformations - no errors, but not working. 2012-06-20 16:28:10 +03:00
Marc Delisle
90770909d0 - Use strict comparison, in case the user put 0 for the ProtectBinary
directive
- Add a space after the ! operator
2012-06-20 06:08:25 -04:00
Michal Čihař
d80cc28087 Forgot to correctly merge changelog 2012-06-20 10:42:48 +02:00
Michal Čihař
75f3174436 Merge remote-tracking branch 'origin/QA_3_5' 2012-06-20 10:31:20 +02:00
Michal Čihař
2e354b7b75 Document backport 2012-06-20 10:29:54 +02:00
Michal Čihař
6fe86fc549 More clever URL rewriting with ForceSSL (bug #3510196) 2012-06-20 10:29:16 +02:00
Michal Čihař
d578bda100 Clarify code for ForceSSL
Conflicts:

	libraries/common.inc.php
2012-06-20 10:29:09 +02:00
Alex Marin
1ad049d823 oop: transformations - fix classes, add interface and use descriptions 2012-06-19 23:59:47 +03:00
J.M
7f6e422952 Fix possibly undefined $return_to_sql_query in insert_edit.lib.php 2012-06-19 19:18:53 +02:00