makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
28934 commits 18 branches 192 tags 207 MiB
Commit graph

28934 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tristan Darricau
bd71c3d8e2
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14789] Remove obsolete check_form_key() and add missing hashes
  [ticket/14789] Move form key checks to where they actually do something
 2016-10-02 17:18:35 +02:00
Tristan Darricau
5075090d4f
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14789] Remove obsolete check_form_key() and add missing hashes
  [ticket/14789] Move form key checks to where they actually do something
 2016-10-02 17:18:32 +02:00
Tristan Darricau
6b798d02fb
Merge branch 'prep-release-3.1.10' into 3.1.x 
* prep-release-3.1.10:
  [ticket/14789] Remove obsolete check_form_key() and add missing hashes
  [ticket/14789] Move form key checks to where they actually do something
 2016-10-02 17:18:22 +02:00
Tristan Darricau
cd4190a72d
Merge pull request #4474 from marc1706/ticket/14789 
[ticket/14789] Move form key checks to where they actually do something

* marc1706/ticket/14789:
  [ticket/14789] Remove obsolete check_form_key() and add missing hashes
  [ticket/14789] Move form key checks to where they actually do something
 2016-10-02 17:18:22 +02:00
Tristan Darricau
a0c508b926
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14805] Ignore platform requirements while building packages
 2016-10-02 17:14:58 +02:00
Tristan Darricau
78333e300c
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14805] Ignore platform requirements while building packages
 2016-10-02 17:14:52 +02:00
Tristan Darricau
165e0edb2a
Merge branch 'prep-release-3.1.10' into 3.1.x 
* prep-release-3.1.10:
  [ticket/14805] Ignore platform requirements while building packages
 2016-10-02 17:14:49 +02:00
Tristan Darricau
cdaed8dabf
Merge pull request #4475 from marc1706/ticket/14805 
[ticket/14805] Ignore platform requirements while building packages

* marc1706/ticket/14805:
  [ticket/14805] Ignore platform requirements while building packages
  [ticket/8301] Add log_time index
 2016-10-02 17:14:49 +02:00
Marc Alexander
c30a2b27a5
Merge branch '3.2.x' 2016-10-01 16:58:15 +01:00
Marc Alexander
328a7afcc3
Merge branch '3.1.x' into 3.2.x 2016-10-01 16:58:07 +01:00
Marc Alexander
5a6933fee7
Merge pull request #4466 from Senky/ticket/14795 
[ticket/14795] Merge topic views when merging topics
 2016-10-01 16:58:02 +01:00
Marc Alexander
047c7375a5
[ticket/14805] Ignore platform requirements while building packages 
PHPBB3-14805
 2016-10-01 16:46:48 +01:00
Marc Alexander
89f3e5d29e
Merge branch '3.2.x' 2016-10-01 11:07:46 +01:00
Marc Alexander
57fc321c4d
Merge branch '3.1.x' into 3.2.x 2016-10-01 11:07:43 +01:00
Marc Alexander
f1eda6868f
Merge pull request #4465 from Senky/ticket/8301 
[ticket/8301] Add log_time index
 2016-10-01 11:07:40 +01:00
Marc Alexander
4e5f29a21b
[ticket/14789] Remove obsolete check_form_key() and add missing hashes 
PHPBB3-14789
 2016-09-30 23:26:04 +01:00
Marc Alexander
88d7c4fe57
[ticket/14789] Move form key checks to where they actually do something 
PHPBB3-14789
 2016-09-30 22:32:54 +01:00
Marc Alexander
0b1d7cc53f
Merge branch '3.2.x' 2016-09-30 21:49:41 +01:00
Marc Alexander
e362ff1f3c
Merge pull request #4473 from rxu/ticket/14799-1 
[ticket/14799] Remove accidentally added whitespaces into 3.2.x and master
 2016-09-30 21:49:22 +01:00
rxu
5b32019ad6 [ticket/14799] Remove accidentally added whitespaces into 3.2.x and master 
PHPBB3-14799
 2016-10-01 02:59:17 +07:00
Tristan Darricau
ab84605991
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14799] purge_notifications() should not leave open transactions.
 2016-09-28 20:58:39 +02:00
Tristan Darricau
737ef92a1e
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14799] purge_notifications() should not leave open transactions.
 2016-09-28 20:56:51 +02:00
Tristan Darricau
6972d06f59
Merge branch 'prep-release-3.1.10' into 3.1.x 
* prep-release-3.1.10:
  [ticket/14799] purge_notifications() should not leave open transactions.
 2016-09-28 20:53:10 +02:00
Tristan Darricau
2fd2fb94cf
Merge pull request #4468 from markshawtoronto/ticket/14799 
[ticket/14799] purge_notifications() should not leave open transactions.

* markshawtoronto/ticket/14799:
  [ticket/14799] purge_notifications() should not leave open transactions.
  [3.1.x] Increase version for 3.1.11 development
 2016-09-28 20:50:06 +02:00
markshawtoronto
06c980f1ec [ticket/14799] purge_notifications() should not leave open transactions. 
When running purge_notifications(), if a notification type does not exist
then a db transaction is started but never completed.

On an error in get_notification_type_id(), end the transaction.

PHPBB3-14799
 2016-09-27 11:45:23 -04:00
Jakub Senko
ec24f739e8 [ticket/8301] Add log_time index 
PHPBB3-8301
 2016-09-25 19:51:37 +02:00
Jakub Senko
c588332aa5 [ticket/14795] Merge topic views when merging topics 
PHPBB3-14795
 2016-09-25 19:49:01 +02:00
Tristan Darricau
c4812a2d83
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14797] Support PHP 7.1 and clearly state support for latest versions
 2016-09-25 17:26:32 +02:00
Tristan Darricau
ef755ffd38
Merge pull request #4463 from marc1706/ticket/14797 
[ticket/14797] Support PHP 7.1 and clearly state support for latest versions

* marc1706/ticket/14797:
  [ticket/14797] Support PHP 7.1 and clearly state support for latest versions
 2016-09-25 17:22:26 +02:00
Tristan Darricau
a713f5159a
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/10809] Reflect MSSQL removal in docs files
  [ticket/10809] Remove MSSQL support
 2016-09-25 17:19:18 +02:00
Tristan Darricau
de2c70127f
Merge pull request #4265 from Senky/ticket/10809 
[ticket/10809] Remove MSSQL support

* Senky/ticket/10809:
  [ticket/10809] Reflect MSSQL removal in docs files
  [ticket/10809] Remove MSSQL support
 2016-09-25 17:19:13 +02:00
Marc Alexander
9e52ed9af1
[ticket/14797] Support PHP 7.1 and clearly state support for latest versions 
PHPBB3-14797
 2016-09-25 12:54:01 +02:00
Marc Alexander
e2431502d1
Merge branch '3.2.x' 2016-09-24 21:45:36 +02:00
Marc Alexander
164f0e031d
Merge branch '3.1.x' into 3.2.x 2016-09-24 21:45:17 +02:00
Marc Alexander
51d830a6d3
[3.1.x] Increase version for 3.1.11 development 2016-09-24 21:39:47 +02:00
Marc Alexander
32d9efff47
Merge branch 'prep-release-3.1.10' into 3.1.x 2016-09-24 21:35:42 +02:00
Marc Alexander
7d73d1ff83
[prep-release-3.1.10] Add changelog for 3.1.10-RC1 2016-09-24 14:57:23 +02:00
Marc Alexander
c958ba13e8
[prep-release-3.1.10] Add migration for 3.1.10-RC1 2016-09-24 14:50:46 +02:00
Marc Alexander
2f17757f4e
[prep-release-3.1.10] Update version to 3.1.10-RC1 2016-09-24 14:50:46 +02:00
Marc Alexander
531d23935a
Merge branch '3.2.x' 2016-09-24 13:04:27 +02:00
Marc Alexander
187c6df18a
Merge branch '3.1.x' into 3.2.x 2016-09-24 13:04:24 +02:00
Marc Alexander
b8bbf9db03
Merge pull request #4461 from marc1706/ticket/14785 
[ticket/14785] Add template event overall_header_headerbar_after/before
 2016-09-24 13:04:21 +02:00
Marc Alexander
62e288bc90
Merge branch '3.2.x' 2016-09-24 11:50:20 +02:00
Marc Alexander
713f25e552
Merge branch '3.1.x' into 3.2.x 2016-09-24 11:50:17 +02:00
Marc Alexander
4267cc3a43
Merge pull request #4462 from marc1706/ticket/14796 
[ticket/14796] Use log_table class member instead of table constant
 2016-09-24 11:50:15 +02:00
GerB
90e9d5c462
[ticket/14785] Add template event overall_header_headerbar_after/before 
PHPBB3-14785
 2016-09-24 11:04:23 +02:00
Tristan Darricau
f9b7bbafac
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14484] Remove duplicate methods and no longer needed calls
  [ticket/14484] Remove invalid code caused by merge conflict
  [ticket/14484] Properly enable extensions in UI tests
  [ticket/14484] Move facebook/webdriver back to tests dir composer.json
  [ticket/14484] Move facebook webdriver to main composer.json
 2016-09-24 10:31:48 +02:00
Tristan Darricau
b59e41d289
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
 2016-09-24 10:31:30 +02:00
Tristan Darricau
fdd4f68aea
Merge pull request #4455 from marc1706/ticket/14484-rhea 
[ticket/14484] Add possibility to use extensions in UI tests

* marc1706/ticket/14484-rhea:
  [ticket/14484] Remove duplicate methods and no longer needed calls
  [ticket/14484] Remove invalid code caused by merge conflict
  [ticket/14484] Properly enable extensions in UI tests
  [ticket/14484] Move facebook/webdriver back to tests dir composer.json
  [ticket/14484] Move facebook webdriver to main composer.json
 2016-09-24 10:31:27 +02:00
Tristan Darricau
cdd56c0505
Merge pull request #4394 from marc1706/ticket/14484 
[ticket/14484] Add possibility to use extensions in UI tests

* marc1706/ticket/14484:
  [ticket/14484] Properly enable extensions in UI tests
  [ticket/14484] Move facebook/webdriver back to tests dir composer.json
  [ticket/14484] Move facebook webdriver to main composer.json
 2016-09-24 10:31:06 +02:00