mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 13:04:24 +01:00
Code Issues Releases Wiki Activity
16,679 Commits 17 Branches 190 Tags
Commit Graph

16679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dhruv
3931f7f3b9 Merge branch 'develop-olympus' into develop 
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv (1)
* develop-olympus:
  [ticket/11583] Use a new lang key instead of giving the old one a new meaning.
  [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.

Conflicts:
	phpBB/includes/search/fulltext_mysql.php
	phpBB/language/en/acp/search.php
 2013-06-05 01:55:49 +05:30
Dhruv
ad8386a64a Merge remote-tracking branch 'bantu/ticket/11583' into develop-olympus 
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11583:
  [ticket/11583] Use a new lang key instead of giving the old one a new meaning.
  [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
 2013-06-05 01:41:26 +05:30
Andreas Fischer
7b7747cab6 Merge remote-tracking branch 'marc1706/ticket/11538' into develop 
* marc1706/ticket/11538:
  [ticket/11538] Add admin as admins leader and moderator in memberlist_test
 2013-06-04 17:30:22 +02:00
Marc Alexander
71deb4dde7 [ticket/11538] Add admin as admins leader and moderator in memberlist_test 
Removing the admin user from the admin and moderator group in memberlist_test
potentially breaks other tests, i.e. the ucp groups test.

PHPBB3-11538
 2013-06-04 17:16:22 +02:00
Joas Schilling
74da9e32e5 Merge remote-tracking branch 'bantu/ticket/11586' into develop 
* bantu/ticket/11586:
  [ticket/11586] Move $filedata['thumbnail'] to where it might be returned.
  [ticket/11586] Combine $filedata['post_attach'] assign into a single statement.
  [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.
  [ticket/11586] Combine administrator/moderator checks together.
 2013-06-03 20:06:00 +02:00
Andreas Fischer
5fa25880e2 [ticket/11586] Move $filedata['thumbnail'] to where it might be returned. 
PHPBB3-11586
 2013-06-03 16:24:12 +02:00
Andreas Fischer
50e3173e8c [ticket/11586] Combine $filedata['post_attach'] assign into a single statement. 
PHPBB3-11586
 2013-06-03 16:24:12 +02:00
Andreas Fischer
11c80c0402 [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE. 
PHPBB3-11586
 2013-06-03 16:14:22 +02:00
Andreas Fischer
cb54f56c3d [ticket/11586] Combine administrator/moderator checks together. 
PHPBB3-11586
 2013-06-03 16:07:19 +02:00
Andreas Fischer
99d089ce9f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11145] Wrong error thrown when uploading a bigger image.
 2013-06-03 15:58:32 +02:00
Andreas Fischer
a3d1593804 Merge remote-tracking branch 'erangamapa/ticket/11145' into develop-olympus 
* erangamapa/ticket/11145:
  [ticket/11145] Wrong error thrown when uploading a bigger image.
 2013-06-03 15:58:21 +02:00
Andreas Fischer
a20a0e06c2 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10840] Add check_form_key to acp_groups.php
 2013-06-03 15:39:07 +02:00
Andreas Fischer
1cd6bb88a6 Merge remote-tracking branch 'nickvergessen/ticket/10840' into develop-olympus 
* nickvergessen/ticket/10840:
  [ticket/10840] Add check_form_key to acp_groups.php
 2013-06-03 15:36:04 +02:00
Andreas Fischer
d925c8d0da [ticket/11583] Use a new lang key instead of giving the old one a new meaning. 
PHPBB3-11583
 2013-06-03 15:16:57 +02:00
Andreas Fischer
fe4f0ef42c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11122] Add dhruv to active authors
  [ticket/11122] Remove Oleg and igorw from active authors
 2013-06-03 15:05:09 +02:00
Andreas Fischer
6abe225f6c Merge remote-tracking branch 'nickvergessen/ticket/11122-2' into develop-olympus 
* nickvergessen/ticket/11122-2:
  [ticket/11122] Add dhruv to active authors
  [ticket/11122] Remove Oleg and igorw from active authors
 2013-06-03 15:05:02 +02:00
Joas Schilling
323bfbc78f [ticket/11122] Add dhruv to active authors 
PHPBB3-11122
 2013-06-03 11:08:50 +02:00
Joas Schilling
cb62b37bce [ticket/11122] Remove Oleg and igorw from active authors 
PHPBB3-11122
 2013-06-03 11:06:12 +02:00
Joas Schilling
0eae9eb75d [ticket/10840] Add check_form_key to acp_groups.php 
PHPBB3-10840
 2013-06-03 10:54:16 +02:00
David King
4b61178d05 Merge remote-tracking branch 'nickvergessen/ticket/11549' into develop 
* nickvergessen/ticket/11549:
  [ticket/11549] Add functional test for ACP Extension Module with Template
  [ticket/11549] Do not set extension dir path for style in adm/index.php
 2013-05-31 22:39:40 -04:00
Andreas Fischer
d0e45e17dd [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher. 
PHPBB3-11583
 2013-06-01 04:09:33 +02:00
Joas Schilling
69e1b402df Merge remote-tracking branch 'Elsensee/ticket/11409' into develop 
* Elsensee/ticket/11409:
  [ticket/11409] Add success message after updating group position settings
 2013-05-31 18:08:26 +02:00
Joas Schilling
cae1f8bc86 Merge remote-tracking branch 'EXreaction/ticket/11387' into develop 
* EXreaction/ticket/11387:
  [ticket/11387] Log module added only after it has been added
 2013-05-31 17:21:00 +02:00
Oliver Schramm
faf804c70f [ticket/11409] Add success message after updating group position settings 
PHPBB3-11409
 2013-05-31 17:16:15 +02:00
Joas Schilling
48036c6eda [ticket/11549] Add functional test for ACP Extension Module with Template 
PHPBB3-11549
 2013-05-31 14:25:47 +02:00
Joas Schilling
399d9ee5e1 Merge remote-tracking branch 'Elsensee/ticket/11570' into develop 
* Elsensee/ticket/11570:
  [ticket/11570] Fix link and make the notice more conspiciuous
  [ticket/11570] Add link back to update process
 2013-05-31 13:14:50 +02:00
Oliver Schramm
ec2cdbed61 [ticket/11570] Fix link and make the notice more conspiciuous 
PHPBB3-11570
 2013-05-31 12:18:03 +02:00
Joas Schilling
7917e5a589 [ticket/11549] Do not set extension dir path for style in adm/index.php 
As we don't want style files in adm/adm/style/ we should not prepend the adm/
by setting it. Note, we did that correctly in adm/swatch.php.

PHPBB3-11549
 2013-05-31 00:18:39 +02:00
Oliver Schramm
8b0a6fd2cd [ticket/11570] Add link back to update process 
PHPBB3-11570
 2013-05-30 21:30:09 +02:00
Joas Schilling
b3b92b7b18 Merge remote-tracking branch 'Elsensee/ticket/11569' into develop 
* Elsensee/ticket/11569:
  [ticket/11569] Add type parameter and fix language variable
  [ticket/11569] Add parameter to URL and remove comment
  [ticket/11569] Fixing link to continue update
 2013-05-29 13:46:25 +02:00
Oliver Schramm
a79e229c25 [ticket/11569] Add type parameter and fix language variable 
PHPBB3-11569
 2013-05-29 13:27:15 +02:00
Oliver Schramm
c65617479d [ticket/11569] Add parameter to URL and remove comment 
PHPBB3-11569
 2013-05-29 13:20:47 +02:00
Andreas Fischer
fc1c7211ab Merge remote-tracking branch 'nickvergessen/ticket/encryptedmind/11516' into develop 
* nickvergessen/ticket/encryptedmind/11516:
  [ticket/11516] Upgrading the .live jquery function because it is deprecated.
 2013-05-28 12:49:46 +02:00
Jesús Rafael Cova Huerta
7f82a95cb0 [ticket/11516] Upgrading the .live jquery function because it is deprecated. 
I changed the .live function of jQuery for .on function because a user
reported that he had an error because of that, it showed that .live function
was deprecated, so I changed for .on that it's same but it work with new
jQuery versions.

PHPBB3-11516
 2013-05-28 01:48:25 +02:00
Andreas Fischer
147d01f7ee Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11580] Enable prefer-source option (should error way less)
  [ticket/11580] Enable --no-interaction option on composer for travis

Conflicts:
	.travis.yml
 2013-05-28 01:17:32 +02:00
Andreas Fischer
a997768627 Merge remote-tracking branch 'nickvergessen/ticket/11580' into develop-olympus 
* nickvergessen/ticket/11580:
  [ticket/11580] Enable prefer-source option (should error way less)
  [ticket/11580] Enable --no-interaction option on composer for travis
 2013-05-28 01:15:02 +02:00
Joas Schilling
65307f1382 [ticket/11580] Enable prefer-source option (should error way less) 
PHPBB3-11580
 2013-05-27 23:48:04 +02:00
Joas Schilling
2d0fb52eaa [ticket/11580] Enable --no-interaction option on composer for travis 
There is no interaction available on travis ;)

PHPBB3-11580
 2013-05-27 23:35:57 +02:00
Joas Schilling
a3c5809f94 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11578] Add missing underscore after 'validate' function prefix
 2013-05-27 23:07:06 +02:00
Joas Schilling
96b4066368 Merge remote-tracking branch 'marc1706/ticket/11578' into develop-olympus 
* marc1706/ticket/11578:
  [ticket/11578] Add missing underscore after 'validate' function prefix
 2013-05-27 23:07:00 +02:00
marc1706
b75f67231f [ticket/11578] Add missing underscore after 'validate' function prefix 
The underscore after the 'validate' function prefix for the older
functions was dropped by accident in PR #1407. This patch will add it
back.

PHPBB3-11578
 2013-05-27 22:56:49 +02:00
Joas Schilling
8870d0701f Merge remote-tracking branch 'bantu/ticket/11573' into develop 
* bantu/ticket/11573:
  [ticket/11573] Honor MySQL STRICT_TRANS_TABLES in phpbb_user_loader_test.
  [ticket/11573] Honor MySQL STRICT_TRANS_TABLES in test_style_select.
 2013-05-27 18:20:44 +02:00
Joas Schilling
f0d8168e81 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11576] MySQL unit tests: Enable STRICT_TRANS_TABLES and others.
 2013-05-27 18:17:15 +02:00
Joas Schilling
cc68ea5f6f Merge remote-tracking branch 'bantu/ticket/11576' into develop-olympus 
* bantu/ticket/11576:
  [ticket/11576] MySQL unit tests: Enable STRICT_TRANS_TABLES and others.
 2013-05-27 18:17:07 +02:00
Joas Schilling
caf61700f9 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11575] Correct test_cross_join() to test_order_lower().
 2013-05-27 17:43:46 +02:00
Joas Schilling
49149c0d41 Merge remote-tracking branch 'bantu/ticket/11575' into develop-olympus 
* bantu/ticket/11575:
  [ticket/11575] Correct test_cross_join() to test_order_lower().
 2013-05-27 17:43:40 +02:00
Andreas Fischer
555f0529f2 [ticket/11573] Honor MySQL STRICT_TRANS_TABLES in phpbb_user_loader_test. 
PHPBB3-11573
 2013-05-27 15:47:19 +02:00
Andreas Fischer
c338dfcbf2 [ticket/11573] Honor MySQL STRICT_TRANS_TABLES in test_style_select. 
PHPBB3-11573
 2013-05-27 15:45:01 +02:00
Andreas Fischer
38022a6999 [ticket/11576] MySQL unit tests: Enable STRICT_TRANS_TABLES and others. 
PHPBB3-11576
 2013-05-27 15:34:05 +02:00
Andreas Fischer
8a13fff2aa [ticket/11575] Correct test_cross_join() to test_order_lower(). 
This test does not do any cross joining, it only tests ORDER BY LOWER(...).

PHPBB3-11575
 2013-05-27 13:33:41 +02:00