github.com/phpbb/phpbb-core commits | Ecosyste.ms: OpenCollective

Merge pull request #3024 from marc1706/ticket/13124

[ticket/13124] Also trim spaces in front of comments except for first line

4deb7cdcb3719422eeac718bdbe16dbdec657660 authored about 10 years ago by Joas Schilling <[email protected]>

[ticket/13126] Improve the feedback when running the migrations

PHPBB3-13126

be9c9acaafd884483e8db821ef8e080a8b905f91 authored about 10 years ago by Tristan Darricau <[email protected]>

[ticket/13133] Allow @vendor_name for includecss

PHPBB3-13133

39359e218961a235d3970ff9f8adae7b288dc69d authored over 10 years ago by Tristan Darricau <[email protected]>

Merge branch 'develop-ascraeus' into develop

Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql...

9e32b25e6bd9ae83630a4aae2c2187428b7ced42 authored over 10 years ago by Joas Schilling <[email protected]>

[prep-release-3.1.0-RC5] Add migration for 3.1.0-RC5

479dcd672e6871c1ae449ed87323e1861c762f8f authored over 10 years ago by Joas Schilling <[email protected]>

Merge branch 'develop-ascraeus' into develop

51bd2e5875d1d541f5336411c25b92dcb4777275 authored over 10 years ago by Joas Schilling <[email protected]>

Merge pull request #3016 from Nicofuma/ticket/11224-ascraeus

[ticket/11224][ascraeus] SQL cache destroy does not destroy queries to tables joined

a27b42ea91bfc29080eea7266c778f71501cdc6e authored over 10 years ago by Joas Schilling <[email protected]>

[ticket/13124] Also trim spaces in front of comments except for first line

PHPBB3-13124

94481a1acaad9625fe5018fcc440eddf8932137f authored over 10 years ago by Marc Alexander <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'"

bc1374f031980f3ad17bca81fb99d819ad1a1179 authored over 10 years ago by Nils Adermann <[email protected]>

Merge pull request #3017 from nickvergessen/ticket/13033

[ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'"

86399ef14b363f607e0253547c2ba454105e82e6 authored over 10 years ago by Nils Adermann <[email protected]>

Merge branch 'develop-ascraeus' into develop

9275b53a75f4927c79244cdb5a1e73f224cf6f1e authored over 10 years ago by Marc Alexander <[email protected]>

[ticket/12368] Always clean the cache prior to run the migrations

PHPBB3-12368

51b296afa306bad110d2e4fac6d94117f0bd1e51 authored over 10 years ago by Tristan Darricau <[email protected]>

[ticket/11224] Revert Revert "Merge pull request #2460 from ticket/11224"

This reverts commit 40cd7570e6f4da7cc60d83a3e99c72a2fb99e3f7.

60758df595cd7e46251efa6de65b0ae5a7867659 authored over 10 years ago by Tristan Darricau <[email protected]>

[ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'"

Caused by the solution of PHPBB3-12990

PHPBB3-13033

13794455e2b60d1d62cc596cf971f98062bcf660 authored over 10 years ago by Joas Schilling <[email protected]>

Merge branch 'develop-ascraeus' into develop

0989e41d67414d947ff2c1cdabc889d24b0973de authored over 10 years ago by Joas Schilling <[email protected]>

Merge pull request #2947 from rxu/ticket/13059

[ticket/13059] Add core event to generate_page_link()

fe2d38aff329d824a4c5b1b98b36c1a8353e79cb authored over 10 years ago by Joas Schilling <[email protected]>

[ticket/13059] Add core event to generate_page_link()

Add core event to generate_page_link() to allow
overriding/modifying pagination URLs.
Event requ...

24d6a5cd9fda9160a53549879bedf99a38df7763 authored over 10 years ago by rxu <[email protected]>

Merge branch 'develop-ascraeus' into develop

1d8e760e6d04faa55007df56e5e34ac126bd175b authored over 10 years ago by Joas Schilling <[email protected]>

[ticket/11224] Revert "Merge pull request #2460 from Nicofuma/ticket/11224"

This reverts commit d26436944173d1fa28a1abd96bca861381246860, reversing
changes made to 75fcfb1c...

2b8bc372ac761a912a734b2d71389bb1edb55c3d authored over 10 years ago by Joas Schilling <[email protected]>

Merge branch 'develop-ascraeus' into develop

f0c52e450e6f2adacd599fe39e39e8eb72b15cd7 authored over 10 years ago by Joas Schilling <[email protected]>

Merge pull request #3013 from VSEphpbb/ticket/13121

[ticket/13121] Remove cache mode from style management module

f793554e6e9e976fb807829be0f0b81d6f80267f authored over 10 years ago by Joas Schilling <[email protected]>

Merge branch 'develop-ascraeus' into develop

e424e91ce0c8e016075ac94acce1cc14455e9d71 authored over 10 years ago by Joas Schilling <[email protected]>

Merge pull request #2460 from Nicofuma/ticket/11224

[ticket/11224] SQL cache destroy does not destroy queries to tables joined

a7cdb064c87c6074a99bab74d4eced878278dcc0 authored over 10 years ago by Joas Schilling <[email protected]>

Merge branch 'develop-ascraeus' into develop

78330e4cb3a284270fecfa71e5bc28c1dbbd7f66 authored over 10 years ago by Joas Schilling <[email protected]>

Merge pull request #2545 from ptitlazy/ticket/12657

[ticket/12657] Add a test file for base case of command cache:purge

b30d782d92ad2e9deabaf9b6a6889693035ca3ae authored over 10 years ago by Joas Schilling <[email protected]>

Merge branch 'develop-ascraeus' into develop

f2663315ed594026a309f03259eada9975cc2486 authored over 10 years ago by Joas Schilling <[email protected]>

Merge pull request #2888 from Nicofuma/ticket/12993

[ticket/12993] Improve get_user_ranks

8e6dd89df9b92f22c73e413956cb11f9c8d84fa7 authored over 10 years ago by Joas Schilling <[email protected]>

[ticket/13121] Fix migration file

PHPBB3-13121

a7e77ab5dd0e5a4ba2426fb59367317624b98300 authored over 10 years ago by Matt Friedman <[email protected]>

[ticket/13121] Remove cache mode from style management module

https://tracker.phpbb.com/browse/PHPBB3-13121

PHPBB3-13121

d453796011fd4c8c7123e3d70d1257c5d52b2fa5 authored over 10 years ago by Matt Friedman <[email protected]>

Merge pull request #3008 from nickvergessen/ticket/13111

[ticket/13111] Dropdown options are already an array in the field data

* nickvergessen/ticket/1...

93a54f515d8c112f01b13dda2e9fc31f0e38c7c1 authored over 10 years ago by Andreas Fischer <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[ticket/13111] Dropdown options are already an array in the field data

68cd7fedecf804a05c5eca9a06121d6ca90c08ca authored over 10 years ago by Andreas Fischer <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[ticket/13118] Correctly use the provided datetime class

264417187a6963321e29813d4801c9e06036be62 authored over 10 years ago by Andreas Fischer <[email protected]>

Merge pull request #3007 from nickvergessen/ticket/13118

[ticket/13118] Correctly use the provided datetime class

* nickvergessen/ticket/13118:
[ticke...

c78a6334eb38cc2d7ad08895a48ac3d18898f8f9 authored over 10 years ago by Andreas Fischer <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql

ac675f3085651ab81f3628dc72eafbf43d86f033 authored over 10 years ago by Nils Adermann <[email protected]>

Merge pull request #3003 from nickvergessen/ticket/13117

[ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql

878ba9e2372085cdbb36d8bc9b01e7a1a28fa6c7 authored over 10 years ago by Nils Adermann <[email protected]>

[ticket/13111] Dropdown options are already an array in the field data

PHPBB3-13111

a52ed3dce6c8377659c44fdfcdfbe0cc091bb948 authored over 10 years ago by Joas Schilling <[email protected]>

[ticket/13118] Correctly use the provided datetime class

PHPBB3-13118

b04006dd18995679e12515e179f56c174c79148f authored over 10 years ago by Joas Schilling <[email protected]>

[ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql

Unintended change from 95ab4b3e931521ce3c56068478311f0c04f713cc

PHPBB3-13117

b94aa927a99d5265fea08bdca3d3ef7d16897ade authored over 10 years ago by Joas Schilling <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[ticket/13113] Updates the base url only when the front-end isn't app.php

3c1810313c2ed26f08c5b63dd7f5810f9eb2d6f7 authored over 10 years ago by Nils Adermann <[email protected]>

[ticket/13113] Updates the base url only when the front-end isn't app.php

PHPBB3-13113

1dfc20b7771950cfa1cb9f85cc0d3f22dc46a9fe authored over 10 years ago by Tristan Darricau <[email protected]>

Merge pull request #2995 from nickvergessen/ticket/13105

[ticket/13105] Future relative dates are always displayed as "Tomorrow"

* nickvergessen/ticket/...

270ae4230ba75419ff907cad5eab997d2eed03ce authored over 10 years ago by Andreas Fischer <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"
[...

7ec2e4e6de9828ff98e42ff562631f90fa189be4 authored over 10 years ago by Andreas Fischer <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[ticket/13106] Remove \phpbb\di\pass\kernel_pass.php

b9dbb0064114d612af9d86e60ea3b33fa8e178f0 authored over 10 years ago by Andreas Fischer <[email protected]>

[ticket/13106] Remove \phpbb\di\pass\kernel_pass.php

PHPBB3-13106

bb75b8ce68bfbe09107b63a0acdf46f6016b02dc authored over 10 years ago by Jakub Senko <[email protected]>

[ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"

PHPBB3-13105

7ff3821baa260c1647c793003a10e16c60d3e99e authored over 10 years ago by Joas Schilling <[email protected]>

Merge branch 'develop-ascraeus' into develop

c966e77a0caafab945abf6f547006d68a92f1f6a authored over 10 years ago by Joas Schilling <[email protected]>

Merge pull request #2954 from rxu/ticket/13055

[ticket/13055] Fix string profile fields validation to support unicode

bb35ba2291e9b4237becb68cd0b7a6877d70cdf5 authored over 10 years ago by Joas Schilling <[email protected]>

Merge pull request #2985 from nickvergessen/ticket/13048

[ticket/13048] Only do not update the session page for ajax requests

* nickvergessen/ticket/130...

3f7744435dc79f9032e173f483d7c6142c6fac38 authored over 10 years ago by Andreas Fischer <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[ticket/13048] Only do not update the session page for ajax requests

8e1a7c51102074fc325fe492fc769ba74ca691d0 authored over 10 years ago by Andreas Fischer <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[ticket/13070] Use old 'template' class for template class hook

50031062447d370e8eee2ceeb757f32b1f399765 authored over 10 years ago by Andreas Fischer <[email protected]>

[ticket/13048] Only do not update the session page for ajax requests

The session time still needs to be updated, so e.g. long upload times
with PLupload stop the ses...

26daeeae309533899a848c373b09c85fb19012cf authored over 10 years ago by Joas Schilling <[email protected]>

[ticket/13070] Use old 'template' class for template class hook

PHPBB3-13070

3adf53188773e0cbfd55d3518f245b8fdeac70b7 authored over 10 years ago by Marc Alexander <[email protected]>

Merge branch 'develop-ascraeus' into develop

# By n-aleha
# Via Dhruv Goel (1) and n-aleha (1)
* develop-ascraeus:
[ticket/13085] Fix typo ...

39072960fcd17496aadbdb68d4fa218dc8c5c120 authored over 10 years ago by Dhruv <[email protected]>

[ticket/13085] Fix typo in oauth.php

PHPBB3-13085

85e394597efcb1e23e2a19f1756ef06e35ed1ac2 authored over 10 years ago by n-aleha <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[prep-release-3.1.0-RC4] Update phpBB Version for RC4 development
[prep-...

53cb404f351a71c7f9091044b5af2f6cb891db86 authored over 10 years ago by Joas Schilling <[email protected]>

[prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4

190aedea430a166847b7b6756687b38eb208b5be authored over 10 years ago by Joas Schilling <[email protected]>

Merge branch 'ticket/13073' into ticket/13073-develop

Conflicts:
tests/controller/common_helper_route.php

267a292e1e8a4d81b77b966b4b17b08d8562267b authored over 10 years ago by Marc Alexander <[email protected]>

[ticket/13073] Add path regex to get_preg_expression() and add unit tests

We're now calling get_preg_expression() instead of hardcoding the regex into
the helper route me...

003cc77b0aae7203efde4401d79da84b6d9026c8 authored over 10 years ago by Marc Alexander <[email protected]>

[ticket/13073] Use just one regex in helper route()

PHPBB3-13073

f4d97e3f4fb43d5a63369b2edaa5307b86dff7cc authored over 10 years ago by Marc Alexander <[email protected]>

[ticket/13073] Properly place comments in helper

PHPBB3-13073

610c28fd131bea84e1bd8b17bb70067334cb3a6b authored over 10 years ago by Marc Alexander <[email protected]>

[ticket/12657] Add a test file for base case

PHPBB3-12657

a67cd4ac03199b094c73faf0f864ef9309c52abc authored over 10 years ago by LEZY Thomas <[email protected]>

[ticket/13073] Add phpbb root path with mod rewrite enabled for proper routes

PHPBB3-13073

4e4f604204cdc7bc78a324db6584d173f8c234c9 authored over 10 years ago by Marc Alexander <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[ticket/12963] Always use core_path and core_directory()
[ticket/12963] ...

9b8f2d02fcc7821b43ce637096b9f97e2ab5e09a authored over 10 years ago by Tristan Darricau <[email protected]>

[ticket/12963] Revert back to "migrations" folder name for extensions

The issues that can be created with the name change are just too much

PHPBB3-12963

c138dea19f3282a96e6529b09f677ce4fba035e4 authored over 10 years ago by Joas Schilling <[email protected]>

[ticket/13055] Add string profile fields validation options to support unicode

PHPBB3-13055

7c26223ab0f4c1ba37c4ffaa3bc4821541023772 authored over 10 years ago by rxu <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ...

cb3c912eb40eaa3efcdd685fc392a1b8feeb8556 authored over 10 years ago by Joas Schilling <[email protected]>

[ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."

This reverts commit 46a9fe93d797bf7d56fd9b1e204f3c0459270122.

PHPBB3-13064

a1f99e9a0616356164b2be14bbabcabe8307e2bb authored over 10 years ago by Joas Schilling <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[ticket/13061] Replace the service event.subscriber_loader by a compiler pass

225871135894d1df2c77886fbf3da25eb451bde7 authored over 10 years ago by Joas Schilling <[email protected]>

Merge pull request #2948 from Nicofuma/ticket/13061

[ticket/13061] Replace the service event.subscriber_loader by a compiler pass

* Nicofuma/ticket...

c94793ba461499a9ee86bbd233bef52c7dad0b9c authored over 10 years ago by Joas Schilling <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[ticket/13064] Validate the migrations provided to migrator::set_migrations()

b3320af92602b5e6752c32b13627d05827011230 authored over 10 years ago by Joas Schilling <[email protected]>

Merge pull request #2951 from Nicofuma/ticket/13064

[ticket/13064] Validate the migrations provided to migrator::set_migrations()

* Nicofuma/ticket...

acaf9bddaadd429a5a85320d750d036299d150d1 authored over 10 years ago by Joas Schilling <[email protected]>

Merge branch 'develop-ascraeus' into develop

52e0dd8fbd5aac1d0caa3851a94f648db497b3e9 authored over 10 years ago by Marc Alexander <[email protected]>

Merge pull request #2922 from Nicofuma/ticket/13036

[ticket/13036] Make the reference type configurable when generating a route

a0d722959d9658fd5f8ed0ded7a9fad0d2290fd1 authored over 10 years ago by Marc Alexander <[email protected]>

Merge branch 'develop-ascraeus' into develop

3c70611265c7b8cae48dabe72d7d9da620f2e09a authored over 10 years ago by Marc Alexander <[email protected]>

Merge pull request #2932 from Nicofuma/ticket/12963

[ticket/12963] Load extensions migrations from /migration

73d8a189dae2a3cdae90fef4cf59a897a367a994 authored over 10 years ago by Marc Alexander <[email protected]>

[ticket/12963] Edit deprecation message

PHPBB3-12963

9ddd3c876369dca364963145aeb02effaab1b9e7 authored over 10 years ago by Tristan Darricau <[email protected]>

[ticket/13036] Add unit tests

PHPBB3-13036

72cfc451248ae7a8ab5dbd06a625b1b37904dbb2 authored over 10 years ago by Tristan Darricau <[email protected]>

[ticket/13036] Make the reference type configurable when generating a route

PHPBB3-13036

f177ba32fbfae5aff92e6b231902dd2000708a65 authored over 10 years ago by Tristan Darricau <[email protected]>

Merge branch 'develop-ascraeus' into develop

ecf914cf94300c5f8be6528731176ae7718441c5 authored over 10 years ago by Marc Alexander <[email protected]>

Merge pull request #2921 from Nicofuma/ticket/13034

[ticket/13034] Fix the route generated for the frontend not in the phpbb root path

0a36868be1ceffa0d3f3d607cf97acf6f773d979 authored over 10 years ago by Marc Alexander <[email protected]>

[ticket/13034] Update the base url to move to the root dir

PHPBB3-13034

cf443f0dbb06dc76a6c2ba9f00cd165f0bea880d authored over 10 years ago by Tristan Darricau <[email protected]>

[ticket/13034] Add comment

PHPBB3-13034

4ff0d57ea00e797f67da7cd83f453dbb63bd7393 authored over 10 years ago by Tristan Darricau <[email protected]>

[ticket/13034] Use utf8_basename

PHPBB3-13034

f4fef068557321ef7a5f775113db01fc1cc9d73b authored over 10 years ago by Tristan Darricau <[email protected]>

[ticket/13064] Validate the migrations provided to migrator::set_migrations()

PHPBB3-13064

04f4e13a2784ded1542eb1f1e77c6c104cf154cd authored over 10 years ago by Tristan Darricau <[email protected]>

[ticket/13061] Replace the service event.subscriber_loader by a compiler pass

PHPBB3-13061

80d189523007240f81ece5a474dfd4ce98360a8e authored over 10 years ago by Tristan Darricau <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[ticket/12734] Remove unnecessary error supressing

142e191cd29855ee4cc7ab91e1240f2de734029b authored over 10 years ago by Andreas Fischer <[email protected]>

[ticket/12963] Load extensions migrations from /migration

PHPBB3-12963

4d052fe697cc50afda16faa1a550d1d6aa59c329 authored over 10 years ago by Tristan Darricau <[email protected]>

[ticket/12963] Don't use static var in \extension\base\get_migration_file_list

The static var was global to all instance of \phpbb\base and so if two
different instances (for ...

6b43d864ea8ae1b8256d0fd0b755f03c1d0dbdbb authored over 10 years ago by Tristan Darricau <[email protected]>

[ticket/12734] Remove unnecessary error supressing

PHPBB3-12734

2fa4191e83be2bba118d97f2f6a6f2c1d629d804 authored over 10 years ago by Jakub Senko <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[ticket/13048] Only update session_page if request is not ajax

034e7c1c778650521f490392ca9667d2c897fdb0 authored over 10 years ago by Joas Schilling <[email protected]>

[ticket/13048] Only update session_page if request is not ajax

PHPBB3-13048

5e983a8c846dc777022237fc380f40d577aed700 authored over 10 years ago by Jakub Senko <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[ticket/12852] Add unit tests
[ticket/12852] Add space after if
[ticke...

ef11c80628cf7814d7162979f975ac4de107373c authored over 10 years ago by Tristan Darricau <[email protected]>

Merge pull request #2919 from Senky/ticket/12852

[ticket/12852] Make get_url_parts handle get variable with no value

* Senky/ticket/12852:
[ti...

eb5904cc1552e343201ede1d7cd3d8e83699112c authored over 10 years ago by Tristan Darricau <[email protected]>

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
[ticket/13031] Slightly change behavior of choose_mime_type and add unit t...

b16f97395f43285767ebaa62dc314b3f83b3c133 authored over 10 years ago by Tristan Darricau <[email protected]>

[ticket/13031] Slightly change behavior of choose_mime_type and add unit tests

The mime type 'application/octet-stream' will still always be overwritten by
proper guesses. How...

14366b9c8033b092401f1811b693a188561d82c8 authored over 10 years ago by Marc Alexander <[email protected]>

[ticket/13031] Guess with all mimetype guessers and pick best guess

PHPBB3-13031

5d36649f9095f7c0023c00b49a13b087aa4894bb authored over 10 years ago by Marc Alexander <[email protected]>

[ticket/13034] Fix the route generated for the frontend not in the phpbb root

PHPBB3-13034

68d7f2f058df3819fc91b33c9823d345cb9bc306 authored over 10 years ago by Tristan Darricau <[email protected]>

[ticket/12852] Add space after if

PHPBB3-12852

d12bb9c669d357d155e72670692306e771f3a922 authored over 10 years ago by Jakub Senko <[email protected]>

[ticket/12852] Remove whitespace

PHPBB3-12852

0674dc61625a1c8eceba1a40a1b7a9883bdf3bf1 authored over 10 years ago by Jakub Senko <[email protected]>

[ticket/12852] Make get_url_parts handle get variable with no value

PHPBB3-12852

8caa0ce8406f7f32902f4f59d75a2ce9791b472c authored over 10 years ago by Jakub Senko <[email protected]>