Commit graph

3551 commits

Author SHA1 Message Date
Andreas Fischer
e9347ec839 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12996] Fix reliability issue in flock test.
2014-08-19 12:20:07 +02:00
Fred Emmott
0ef7a9d455 [ticket/12996] Fix reliability issue in flock test.
$delta was always an int - so, this test would sometimes fail if you
happened to call time() /very/ close to a 1s boundary.

Found by HHVM's continuous testing.

PHPBB3-12996
2014-08-19 11:53:34 +02:00
Tristan Darricau
b18fe1203a [ticket/12990] Fix unit tests
PHPBB3-12990
2014-08-17 16:19:23 +02:00
Nils Adermann
24dc0a66eb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12822] Correctly call \phpbb\user in avatar manager test
2014-08-11 18:13:57 +02:00
Marc Alexander
07576dc169 [ticket/12822] Correctly call \phpbb\user in avatar manager test
PHPBB3-12822
2014-08-11 18:04:20 +02:00
Nils Adermann
837ed8b6e1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12822] Fix test runs of avatar manager_test
  [ticket/12822] Add method for deleting avatars and use confirm_box
  [ticket/12822] Remove "None" option from avatar select boxes

Conflicts:
	phpBB/styles/subsilver2/template/ucp_groups_manage.html
	phpBB/styles/subsilver2/template/ucp_profile_avatar.html
2014-08-11 17:38:29 +02:00
Nils Adermann
bad90dafbf Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascraeus
* github-marc1706/ticket/12822:
  [ticket/12822] Fix test runs of avatar manager_test
  [ticket/12822] Add method for deleting avatars and use confirm_box
  [ticket/12822] Remove "None" option from avatar select boxes
2014-08-11 17:37:56 +02:00
Marc Alexander
f09db1a7b4 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/config/services.yml
2014-08-11 12:23:21 +02:00
Tristan Darricau
4683864b4b [ticket/11854] Update tests
PHPBB3-11854
2014-08-11 01:17:01 +02:00
Tristan Darricau
b91abf1a0b [ticket/11854] Rename captchas.factory service to captcha.factory
PHPBB3-11854
2014-08-11 01:16:22 +02:00
Tristan Darricau
28cf0ef832 [ticket/11854] Update unit tests
PHPBB3-11854
2014-08-11 01:16:07 +02:00
Joas Schilling
d998efcf54 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12932] Remove set_datetime_class method from user class
  [ticket/12932] Fix tests and calls to create_datetime
  [ticket/12932] Add method for getting the datetime class and allow overriding

Conflicts:
	phpBB/config/services.yml
2014-08-10 15:24:43 +02:00
Joas Schilling
54b0ebc410 Merge pull request #2862 from marc1706/ticket/12932
[ticket/12932] Add method for allowing override of \phpbb\datetime class

* marc1706/ticket/12932:
  [ticket/12932] Remove set_datetime_class method from user class
  [ticket/12932] Fix tests and calls to create_datetime
  [ticket/12932] Add method for getting the datetime class and allow overriding
2014-08-10 15:23:15 +02:00
Nils Adermann
f067aa92eb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12950] Force the installer to use language=en
2014-08-10 14:00:09 +02:00
Nils Adermann
252ddd71d0 Merge remote-tracking branch 'github-dhruvgoel92/ticket/12950' into develop-ascraeus
* github-dhruvgoel92/ticket/12950:
  [ticket/12950] Force the installer to use language=en
2014-08-10 13:59:59 +02:00
Dhruv
0244a9b6a4 [ticket/12950] Force the installer to use language=en
PHPBB3-12950
2014-08-10 13:49:42 +02:00
Marc Alexander
8d99b4afe1 [ticket/12932] Fix tests and calls to create_datetime
PHPBB3-12932
2014-08-10 13:43:04 +02:00
Joas Schilling
bf25e31735 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12794] Properly validate google+ field against valid character set
2014-08-10 13:39:04 +02:00
Joas Schilling
7cc9f216e7 Merge pull request #2836 from marc1706/ticket/12794
[ticket/12794] Properly validate google+ field against valid character set

* marc1706/ticket/12794:
  [ticket/12794] Properly validate google+ field against valid character set
2014-08-10 13:38:48 +02:00
Joas Schilling
489aba31c7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
2014-08-10 13:35:37 +02:00
Joas Schilling
b3ca955fb5 Merge pull request #2837 from Geolim4/ticket/12671
Ticket/12671 Possibility to use NOT LIKE expression

* Geolim4/ticket/12671:
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
  [ticket/12671] Possibility to use NOT LIKE expression
2014-08-10 13:35:27 +02:00
Cesar G
4056b84f60 Merge remote-tracking branch 'nickvergessen/ticket/12958' into develop
* nickvergessen/ticket/12958:
  [ticket/12958] Remove more references of subsilver2
  [ticket/12958] Remove subsilver2 for phpBB 3.2
2014-08-10 13:08:15 +02:00
Joas Schilling
9e0c234979 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12938] Remove functional tests for 'Download all attachments'.
  [ticket/12938] Remove the 'Download all attachments' feature.
2014-08-10 12:22:35 +02:00
Joas Schilling
1f6b9628e7 Merge pull request #2852 from bantu/ticket/12938
[ticket/12938] Remove the 'Download all attachments' feature.

* bantu/ticket/12938:
  [ticket/12938] Remove functional tests for 'Download all attachments'.
  [ticket/12938] Remove the 'Download all attachments' feature.
2014-08-10 12:22:22 +02:00
Joas Schilling
59780bbd09 [ticket/12958] Remove more references of subsilver2
PHPBB3-12958
2014-08-10 12:17:03 +02:00
Andreas Fischer
74c3579693 [ticket/12938] Remove functional tests for 'Download all attachments'.
PHPBB3-12938
2014-08-10 01:27:28 +02:00
Tristan Darricau
1c98b46625 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11528] Revert Mink changes
2014-08-10 00:56:30 +02:00
Tristan Darricau
6a8413f064 Merge pull request #2691 from dhruvgoel92/ticket/11528
[ticket/11528] Revert all mink changes in functional tests

* dhruvgoel92/ticket/11528:
  [ticket/11528] Revert Mink changes
2014-08-10 00:28:01 +02:00
Tristan Darricau
04c084ead8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12718] Use a separate variable for sql query
  [ticket/12718] Fix spacing and type casting
  [ticket/12718] Fix docblocks
  [ticket/12718] Add tests to check user_posts on post deletion
  [ticket/12718] Update docblock
  [ticket/12718] Use remove_topic_from_statistic() for delete_topic
2014-08-09 17:50:54 +02:00
Tristan Darricau
86f94f922c Merge pull request #2624 from dhruvgoel92/ticket/12718
[ticket/12718] Use remove_topic_from_statistic() for delete_topic

* dhruvgoel92/ticket/12718:
  [ticket/12718] Use a separate variable for sql query
  [ticket/12718] Fix spacing and type casting
  [ticket/12718] Fix docblocks
  [ticket/12718] Add tests to check user_posts on post deletion
  [ticket/12718] Update docblock
  [ticket/12718] Use remove_topic_from_statistic() for delete_topic
2014-08-09 17:33:44 +02:00
Dhruv
dd8adb5d6e [ticket/11528] Revert Mink changes
PHPBB3-11528
2014-08-09 17:18:33 +02:00
Nils Adermann
f33be87d03 Merge remote-tracking branch 'github-nicofuma/ticket/11649' into develop
* github-nicofuma/ticket/11649:
  [ticket/11649] Fix coding style
  [ticket/11649] Expose Twig through the container
2014-08-09 17:17:57 +02:00
Tristan Darricau
192b8e2568 [ticket/11649] Expose Twig through the container
PHPBB3-11649
2014-08-09 16:13:22 +02:00
Nils Adermann
1f7ada8e3d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12710] Fix missing closing bracket
  [ticket/12710] Prefix column so it does not start with a number
  [ticket/12710] Pass the original column data to the create function
  [ticket/12710] Fix foreach generation
  [ticket/12710] Compare to uppercase version
  [ticket/12710] Do not try to match the uniqueness in the query
  [ticket/12710] Remove table_name from index_name before deleting and recreating them
  [ticket/12710] Can not use upper in oracles where claus
  [ticket/12710] Correctly select index name and compare to column name
  [ticket/12710] Fix "ORA-00972: identifier is too long [972]" on oracle
  [ticket/12710] Fix problems with creating unique indexes on oracle
  [ticket/12710] Correctly fetch unique and normal indexes only in MSSQL
  [ticket/12710] Fix changing the column type on oracle
  [ticket/12710] Prepare get_existing_indexes() for other DBMS
2014-08-09 15:41:01 +02:00
Nils Adermann
56ca276dcf Merge remote-tracking branch 'github-nickvergessen/ticket/12710' into develop-ascraeus
* github-nickvergessen/ticket/12710:
  [ticket/12710] Fix missing closing bracket
  [ticket/12710] Prefix column so it does not start with a number
  [ticket/12710] Pass the original column data to the create function
  [ticket/12710] Fix foreach generation
  [ticket/12710] Compare to uppercase version
  [ticket/12710] Do not try to match the uniqueness in the query
  [ticket/12710] Remove table_name from index_name before deleting and recreating them
  [ticket/12710] Can not use upper in oracles where claus
  [ticket/12710] Correctly select index name and compare to column name
  [ticket/12710] Fix "ORA-00972: identifier is too long [972]" on oracle
  [ticket/12710] Fix problems with creating unique indexes on oracle
  [ticket/12710] Correctly fetch unique and normal indexes only in MSSQL
  [ticket/12710] Fix changing the column type on oracle
  [ticket/12710] Prepare get_existing_indexes() for other DBMS
2014-08-09 15:40:46 +02:00
Geolim4
4c06467777 [ticket/12671] Possibility to use NOT LIKE expression
PHPBB3-12671
2014-08-09 13:19:03 +02:00
Joas Schilling
d497104671 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12841] Make config position default to after
  [ticket/12841] Update comments in tests making after default
  [ticket/12841] prefix function name with phpbb_
  [ticket/12841] Add a tests for the new function
  [ticket/12841] Fix white space issues reported by sniffer
  [ticket/12841] Allow extensions to position new config vars
2014-08-09 11:44:18 +02:00
Joas Schilling
7a016572bd Merge pull request #2724 from VSEphpbb/ticket/12841
[ticket/12841] Allow extensions to position new config vars

* VSEphpbb/ticket/12841:
  [ticket/12841] Make config position default to after
  [ticket/12841] Update comments in tests making after default
  [ticket/12841] prefix function name with phpbb_
  [ticket/12841] Add a tests for the new function
  [ticket/12841] Fix white space issues reported by sniffer
  [ticket/12841] Allow extensions to position new config vars
2014-08-09 11:43:56 +02:00
Joas Schilling
4e4ea681be [ticket/12710] Fix "ORA-00972: identifier is too long [972]" on oracle
PHPBB3-12710
2014-08-09 08:33:15 +02:00
Geolim4
01943adbf7 [ticket/12671] Possibility to use NOT LIKE expression
PHPBB3-12671
2014-08-08 18:32:17 +02:00
Nils Adermann
7b8b8d0417 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12937] Do not return false. Return null for get and array() for all.
2014-08-08 17:23:16 +02:00
Marc Alexander
a6b275de5c [ticket/12794] Properly validate google+ field against valid character set
PHPBB3-12794
2014-08-08 17:06:01 +02:00
Geolim4
6b60153ab4 [ticket/12671] Possibility to use NOT LIKE expression
PHPBB3-12671
2014-08-08 16:40:33 +02:00
Andreas Fischer
c5f0c1aa8e [ticket/12937] Do not return false. Return null for get and array() for all.
PHPBB3-12937
2014-08-08 15:29:34 +02:00
Marc Alexander
70978e96d3 [ticket/12822] Fix test runs of avatar manager_test
PHPBB3-12822
2014-08-08 12:01:29 +02:00
Dhruv
15afaafcb6 [ticket/12718] Use a separate variable for sql query
PHPBB3-12718
2014-08-08 00:18:50 +02:00
Dhruv
6d399c7d6a [ticket/12718] Fix spacing and type casting
PHPBB3-12718
2014-08-07 23:47:32 +02:00
Dhruv
4c2b4b4145 [ticket/12718] Add tests to check user_posts on post deletion
PHPBB3-12718
2014-08-07 18:36:50 +02:00
Marc Alexander
e0c2013bb9 [ticket/12822] Add method for deleting avatars and use confirm_box
The method will take care of the actual deletion process in the avatar manager.
Additionally, we'll be using a confirm box while deleting the avatar to prevent
users from accidentally deleting their avatars.

PHPBB3-12822
2014-08-07 17:29:33 +02:00
Marc Alexander
4f23bb711c [ticket/12822] Remove "None" option from avatar select boxes
This option is just used for deleting avatars for which we already have
a checkbox.

PHPBB3-12822
2014-08-07 17:28:21 +02:00