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

19883 commits

Author SHA1 Message Date
Joas Schilling
a291825685 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12738] Pass $this->config in content_visibility constructor
 2014-08-08 16:06:08 +02:00
Joas Schilling
0465e9d1b9 Merge pull request #2838 from dhruvgoel92/ticket/12738 
[ticket/12738] Pass $this->config in content_visibility constructor

* dhruvgoel92/ticket/12738:
  [ticket/12738] Pass $this->config in content_visibility constructor
 2014-08-08 16:05:55 +02:00
Andreas Fischer
eeb80d2ec5 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/10404] Fix codesniffer complaint about anonymous function
  [ticket/10404] Use anonymous function instead of create_function in acp/auth
 2014-08-08 16:03:25 +02:00
Andreas Fischer
42c26cd781 Merge pull request #2832 from marc1706/ticket/10404 
[ticket/10404] Use anonymous function instead of create_function in acp/auth

* marc1706/ticket/10404:
  [ticket/10404] Fix codesniffer complaint about anonymous function
  [ticket/10404] Use anonymous function instead of create_function in acp/auth
 2014-08-08 16:03:24 +02:00
Andreas Fischer
3c79287c0b Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12778] Rename the file to *.bak instead of deleting
  [ticket/12778] Automatically delete files on update
 2014-08-08 16:01:43 +02:00
Andreas Fischer
50fcd70428 Merge pull request #2815 from dhruvgoel92/ticket/12778 
[ticket/12778] Automatically delete files on update

* dhruvgoel92/ticket/12778:
  [ticket/12778] Rename the file to *.bak instead of deleting
  [ticket/12778] Automatically delete files on update
 2014-08-08 16:01:42 +02:00
Dhruv
fcb57edd06 [ticket/12738] Pass $this->config in content_visibility constructor 
PHPBB3-12738
 2014-08-08 15:54:42 +02:00
Nils Adermann
6bfadd86ed Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12789] Move duplicated functions to the base class
  [ticket/12789] Remove the directories in \phpbb\cache\driver\memory::purge()

Conflicts:
	phpBB/phpbb/cache/driver/file.php
	phpBB/phpbb/cache/driver/memory.php
 2014-08-08 15:06:46 +02:00
Nils Adermann
44a0f43062 Merge remote-tracking branch 'github-nicofuma/ticket/12789' into develop-ascraeus 
* github-nicofuma/ticket/12789:
  [ticket/12789] Move duplicated functions to the base class
  [ticket/12789] Remove the directories in \phpbb\cache\driver\memory::purge()
 2014-08-08 15:04:01 +02:00
Joas Schilling
55c21834ad Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12927] core.mcp_queue_get_posts2_query_before
 2014-08-08 14:52:55 +02:00
Joas Schilling
96e9d728b9 Merge pull request #2824 from brunoais/ticket/12927 
[ticket/12927] core.mcp_queue_get_posts2_query_before

* brunoais/ticket/12927:
  [ticket/12927] core.mcp_queue_get_posts2_query_before
 2014-08-08 14:52:35 +02:00
Tristan Darricau
e07e9f6cee [ticket/12789] Move duplicated functions to the base class 
PHPBB3-12789
 2014-08-08 14:49:12 +02:00
Tristan Darricau
e7251252ce [ticket/12789] Remove the directories in \phpbb\cache\driver\memory::purge() 
PHPBB3-12789
 2014-08-08 14:37:18 +02:00
Joas Schilling
4e66d7bdd9 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12880] core.mcp_queue_!is_topics_query_before
 2014-08-08 14:36:10 +02:00
Joas Schilling
53247573c2 Merge pull request #2764 from brunoais/ticket/12880 
[ticket/12880] core.mcp_queue_!is_topics_query_before

* brunoais/ticket/12880:
  [ticket/12880] core.mcp_queue_!is_topics_query_before
 2014-08-08 14:35:53 +02:00
Joas Schilling
b7f4d98cf2 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
 2014-08-08 14:33:11 +02:00
Joas Schilling
bef9d64179 Merge pull request #2762 from brunoais/ticket/12876 
[ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after

* brunoais/ticket/12876:
  [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
 2014-08-08 14:32:55 +02:00
Marc Alexander
27f769e461 [ticket/10404] Fix codesniffer complaint about anonymous function 
PHPBB3-10404
 2014-08-08 14:01:04 +02:00
Cesar G
254b720070 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12535] Combine inner clearing CSS rules
  [ticket/12535] Update events.md to RC3
  [ticket/12535] Add events to subsilver2
  [ticket/12535] Make <a> adjust to the image width
 2014-08-08 13:47:25 +02:00
Cesar G
ad97ad07f8 Merge remote-tracking branch 'PayBas/ticket/12535' into develop-ascraeus 
* PayBas/ticket/12535:
  [ticket/12535] Combine inner clearing CSS rules
  [ticket/12535] Update events.md to RC3
  [ticket/12535] Add events to subsilver2
  [ticket/12535] Make <a> adjust to the image width
 2014-08-08 13:46:58 +02:00
Cesar G
8a96269004 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12744] Fix additional height of one line in header in rtl languages
 2014-08-08 13:43:51 +02:00
Cesar G
f1b1bd0de9 Merge remote-tracking branch 'marc1706/ticket/12744' into develop-ascraeus 
* marc1706/ticket/12744:
  [ticket/12744] Fix additional height of one line in header in rtl languages
 2014-08-08 13:41:37 +02:00
Marc Alexander
20f8fd4af2 [ticket/12744] Fix additional height of one line in header in rtl languages 
PHPBB3-12744
 2014-08-08 13:26:11 +02:00
Marc Alexander
c5d72c94f1 [ticket/10404] Use anonymous function instead of create_function in acp/auth 
PHPBB3-10404
 2014-08-08 12:19:36 +02:00
brunoais
0679f76287 [ticket/12927] core.mcp_queue_get_posts2_query_before 
Adding the core.mcp_queue_get_posts2_query_before
event to mcp backend.

PHPBB3-12927
 2014-08-08 10:52:08 +01:00
Marc Alexander
3cac5b5052 Merge branch 'develop-ascraeus' into develop 2014-08-07 23:38:03 +02:00
Marc Alexander
e4e7a8f849 Merge pull request #2829 from nickvergessen/ticket/12853 
[ticket/12853] Hide moderator link if it is really necessary
 2014-08-07 23:37:35 +02:00
Joas Schilling
9ed71d523a [ticket/12853] Hide moderator link if it is really necessary 
PHPBB3-12853
 2014-08-07 23:27:56 +02:00
brunoais
1f5f2327e8 [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after 
Adding the core.mcp_mcp_front.mcp_front_view_queue_topicid_list_after
event to mcp backend.

PHPBB3-12876
 2014-08-07 18:37:07 +01:00
brunoais
50cc81afa3 [ticket/12880] core.mcp_queue_!is_topics_query_before 
Adding core.mcp_queue_is_topics_query_before

PHPBB3-12880
 2014-08-07 18:33:37 +01:00
Andreas Fischer
8d8d54aac7 Merge pull request #2816 from n-aleha/ticket/12922 
[ticket/12922] Posts per page in MCP should have a min value of zero

* n-aleha/ticket/12922:
  [ticket/12922] Subsilver2 fix
  [ticket/12922] Posts per page in MCP should have a min value of zero
 2014-08-07 18:23:46 +02:00
Andreas Fischer
f073f39333 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12922] Subsilver2 fix
  [ticket/12922] Posts per page in MCP should have a min value of zero
 2014-08-07 18:23:46 +02:00
PayBas
e6dec0348a [ticket/12535] Combine inner clearing CSS rules 
PHPBB3-12535
 2014-08-07 18:23:01 +02:00
PayBas
dda853b896 [ticket/12535] Update events.md to RC3 
PHPBB3-12535
 2014-08-07 18:08:50 +02:00
PayBas
e28abe0db2 [ticket/12535] Add events to subsilver2 
Forgot subsilver... yet again

PHPBB3-12535
 2014-08-07 18:08:48 +02:00
PayBas
5fedcf0fa8 [ticket/12535] Make <a> adjust to the image width 
PHPBB3-12535
 2014-08-07 18:08:46 +02:00
Dhruv
5402834ccf Merge branch 'develop-ascraeus' into develop 
# By jeroendedauw
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12903] Remove dead phpbb\extension\metadata_manager::_validate_version
 2014-08-07 18:02:20 +02:00
jeroendedauw
f6f6657842 [ticket/12903] Remove dead phpbb\extension\metadata_manager::_validate_version 
PHPBB3-12903
 2014-08-07 17:52:59 +02:00
Marc Alexander
bfae68583a Merge branch 'develop-ascraeus' into develop 2014-08-07 17:36:52 +02:00
Marc Alexander
a8dee3fb65 Merge pull request #2810 from nickvergessen/ticket/12919 
[ticket/12919] Use the modules basename as identifier for extension modules
 2014-08-07 17:36:19 +02:00
Dhruv
5488541640 [ticket/12778] Rename the file to *.bak instead of deleting 
PHPBB3-12778
 2014-08-07 16:52:49 +02:00
Joas Schilling
39a99df080 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12873] Add migration to rename the index
  [ticket/12873] Don not touch the existing migrations
  [ticket/12873] Test the good identifier in \phpbb\db\tools
 2014-08-07 16:51:04 +02:00
Joas Schilling
9b36b5283c Merge pull request #2761 from Nicofuma/ticket/12873 
[ticket/12873] Test the correct identifier in \phpbb\db\tools

* Nicofuma/ticket/12873:
  [ticket/12873] Add migration to rename the index
  [ticket/12873] Don not touch the existing migrations
  [ticket/12873] Test the good identifier in \phpbb\db\tools
 2014-08-07 16:49:37 +02:00
Tristan Darricau
8f1be5e741 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12738] Update constructor docblock
  [ticket/12738] Add $config to constructor in notification test
  [ticket/12738] Fix tests with new config object injection
  [ticket/12738] Inject config object into content_visibility class
  [ticket/11528] Move related code from functions_posting to function
 2014-08-07 16:46:31 +02:00
Tristan Darricau
ab8a197e92 Merge pull request #2623 from dhruvgoel92/ticket/12738 
[ticket/12738] Move related code from functions_posting to function

* dhruvgoel92/ticket/12738:
  [ticket/12738] Update constructor docblock
  [ticket/12738] Add $config to constructor in notification test
  [ticket/12738] Fix tests with new config object injection
  [ticket/12738] Inject config object into content_visibility class
  [ticket/11528] Move related code from functions_posting to function
 2014-08-07 16:44:49 +02:00
Nils Adermann
816042bd8d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12776] Add section about 3.0.x to 3.1.x update to INSTALL.html
 2014-08-07 16:26:01 +02:00
Nils Adermann
778483d070 Merge remote-tracking branch 'github-nickvergessen/ticket/12776' into develop-ascraeus 
* github-nickvergessen/ticket/12776:
  [ticket/12776] Add section about 3.0.x to 3.1.x update to INSTALL.html
 2014-08-07 16:25:53 +02:00
Joas Schilling
9925733350 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12826] Add optional root namespace indicator for consistency.
  [ticket/12826] Add mandatory root namespace indicator to exception catching.
 2014-08-07 16:24:48 +02:00
Joas Schilling
a2b6f4e166 Merge pull request #2812 from bantu/ticket/12826 
[ticket/12826] Add root namespace indicator to exception catching.

* bantu/ticket/12826:
  [ticket/12826] Add optional root namespace indicator for consistency.
  [ticket/12826] Add mandatory root namespace indicator to exception catching.
 2014-08-07 16:24:41 +02:00
Cesar G
9a0451889c Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12832] Remove old .quick-links icon reference
  [ticket/12832] Remove unnecessary attr and classes
  [ticket/12832] Add footer links to quick-links
  [ticket/12832] Make .small-icon styling uniform
 2014-08-07 16:21:02 +02:00