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

2984 commits

Author SHA1 Message Date
Tristan Darricau
d465e7e438 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12976] Correctly use plurals for attachment count in UCP navigation

Conflicts:
	phpBB/styles/subsilver2/template/ucp_attachments.html
 2014-09-10 20:02:20 +02:00
Tristan Darricau
c842583bbf Merge pull request #2936 from nickvergessen/ticket/12976 
[ticket/12976] Correctly use plurals for attachment count in UCP navigation

* nickvergessen/ticket/12976:
  [ticket/12976] Correctly use plurals for attachment count in UCP navigation
 2014-09-10 20:00:52 +02:00
Joas Schilling
d9f36ae7e1 [ticket/12976] Correctly use plurals for attachment count in UCP navigation 
PHPBB3-12976
 2014-09-09 21:31:34 +02:00
Andreas Fischer
33762db175 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13038] Add link to number of posts of user in viewtopic
 2014-09-08 22:12:44 +02:00
Andreas Fischer
e00697f3a1 Merge pull request #2926 from Senky/ticket/13038 
[ticket/13038] Link user post tally to their posts

* Senky/ticket/13038:
  [ticket/13038] Add link to number of posts of user in viewtopic
 2014-09-08 22:12:44 +02:00
Jakub Senko
aefd96e604 [ticket/13038] Add link to number of posts of user in viewtopic 
PHPBB3-13038
 2014-09-08 17:36:08 +02:00
Andreas Fischer
04c073e138 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13035] Remove empty meta tags

Conflicts:
	phpBB/styles/subsilver2/template/overall_header.html
	phpBB/styles/subsilver2/template/simple_header.html
 2014-09-08 13:46:16 +02:00
Andreas Fischer
33e5e426d4 Merge pull request #2933 from bantu/ticket/13035 
[ticket/13035] Remove empty meta tags

* bantu/ticket/13035:
  [ticket/13035] Remove empty meta tags
 2014-09-08 13:45:34 +02:00
dcz
85468ce2ec [ticket/13035] Remove empty meta tags 
PHPBB3-13035
 2014-09-08 13:09:38 +02:00
Marc Alexander
f7d41c8465 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/ucp_header.html
 2014-09-05 21:07:02 +02:00
Marc Alexander
b854882470 Merge pull request #2868 from rxu/ticket/12969 
[ticket/12969] Add template events around username link on composing pm
 2014-09-05 21:05:33 +02:00
Marc Alexander
da9888d04f Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_warn_post.html
	phpBB/styles/subsilver2/template/mcp_warn_user.html
 2014-09-01 22:46:08 +02:00
Marc Alexander
d86817ef07 Merge pull request #2887 from Pico/ticket/12991 
[ticket/12991] Have events after/before "add warning" field - user and post
 2014-09-01 22:43:54 +02:00
rxu
1d4c040d4f [ticket/12969] Add template events around username link on composing pm 
Add template event before/after find username link on composing pm
to allow extensions perform additional actions on user finding.

PHPBB3-12969
 2014-09-02 01:02:17 +08:00
Marc Alexander
34d8caf773 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
 2014-08-31 19:31:13 +02:00
Tristan Darricau
76053b3cd4 [ticket/13024] Add template event viewtopic_body_postrow_post_content_footer 
PHPBB3-13024
 2014-08-30 23:52:14 +02:00
Cesar G
7048387620 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12506] Fix search result h3 margin
  [ticket/12506] Fix responsive profile min-height (no avatar)
  [ticket/12506] Reposition buttons to make room for "online" banner
  [ticket/12506] Reposition post-buttons for compact layout
 2014-08-25 13:13:46 -07:00
Cesar G
7cd6dbe898 Merge remote-tracking branch 'PayBas/ticket/12506' into develop-ascraeus 
* PayBas/ticket/12506:
  [ticket/12506] Fix search result h3 margin
  [ticket/12506] Fix responsive profile min-height (no avatar)
  [ticket/12506] Reposition buttons to make room for "online" banner
  [ticket/12506] Reposition post-buttons for compact layout
 2014-08-25 13:13:25 -07:00
Andreas Fischer
10b525fd9f Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12862] Remove remaining simple-wrap id
  [ticket/12862] Resize popups consistently
  [ticket/12862] Add Border
 2014-08-23 11:40:38 +02:00
Andreas Fischer
a79da361ee Merge pull request #2783 from hanakin/ticket/12862 
[ticket/12862] Fix pop-up box wraps

* hanakin/ticket/12862:
  [ticket/12862] Remove remaining simple-wrap id
  [ticket/12862] Resize popups consistently
  [ticket/12862] Add Border
 2014-08-23 11:40:37 +02:00
Andreas Fischer
3dd5712504 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13004] Remove obsolete S_HAS_ATTACHMENTS check from topic tools.
 2014-08-21 22:48:16 +02:00
Cesar G
be0ebbe644 [ticket/13004] Remove obsolete S_HAS_ATTACHMENTS check from topic tools. 
PHPBB3-13004
 2014-08-21 10:47:40 -07:00
Andreas Fischer
6fb9fcd8ec Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12989] Remove unused "created_by.jpg"
 2014-08-19 21:29:18 +02:00
Louis7777
8a5dd101a3 [ticket/12989] Remove unused "created_by.jpg" 
This image is not used anywhere in prosilver.

PHPBB3-12989
 2014-08-19 20:58:47 +02:00
Andreas Fischer
dc87e581c1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12984] Remove blank line when no forum description shown
 2014-08-17 22:31:46 +02:00
Pico88
9d7deba67a [ticket/12991] Have events after/before "add warning" field - user and post 
PHPBB3-12991
 2014-08-17 19:04:35 +02:00
Oyabun1
621f8c922f [ticket/12984] Remove blank line when no forum description shown 
Add a conditional for forum description and move the <br /> within it.
Currently if there is no forum description but there is
1. a displayed forum moderator and/or
2. a displayed sub-forum
a blank line is added in place of the description

PHPBB3-12984
 2014-08-17 20:39:22 +10:00
Marc Alexander
bebcd59694 Merge branch 'develop-ascraeus' into develop 2014-08-14 14:47:50 +02:00
Marc Alexander
ad625c1e6d Merge pull request #2876 from PayBas/ticket/12900 
[ticket/12900] Fix potential avatar size box overflow
 2014-08-14 14:47:20 +02:00
Cesar G
baa9f17f7c Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12856] Remove images from assets/plupload/img/
  [ticket/12856] Copy plupload images to prosilver dir
 2014-08-13 15:01:06 -07:00
PayBas
9db2ff7186 [ticket/12856] Copy plupload images to prosilver dir 
PHPBB3-12856
 2014-08-13 16:37:44 +02:00
PayBas
030d1a683b [ticket/12900] Fix potential avatar size box overflow 
PHPBB3-12900
 2014-08-13 16:23:20 +02:00
Joas Schilling
7faf66c492 [ticket/12974] Update nightly build version to 3.2.0-a1-dev 
PHPBB3-12974
 2014-08-12 10:56:20 +02:00
Joas Schilling
483b40dfa3 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development
  [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Prepare Changelog
  [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3

Conflicts:
	phpBB/styles/subsilver2/style.cfg
 2014-08-12 10:17:47 +02:00
Joas Schilling
b40225c142 [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3 2014-08-11 19:30:55 +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
Michael Miday
ada35dca00 [ticket/12862] Remove remaining simple-wrap id 
PHPBB3-12862
 2014-08-11 00:55:26 +02:00
Marc Alexander
db9bf6da33 Merge branch 'develop-ascraeus' into develop 2014-08-10 17:00:41 +02:00
Marc Alexander
2a5eca0391 Merge pull request #2714 from prototech/ticket/12809 
[ticket/12809] Fix select button and dropdown list items in RTL.
 2014-08-10 17:00:19 +02:00
Joas Schilling
3432257c1c Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12953] Page title not updated when notifications are marked as read
 2014-08-10 13:16:15 +02:00
Joas Schilling
7ae2ceb5cf Merge pull request #2855 from Geolim4/ticket/12953 
[ticket/12953] Page title not updated when notifications are marked as read

* Geolim4/ticket/12953:
  [ticket/12953] Page title not updated when notifications are marked as read
 2014-08-10 13:13:55 +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
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
8c40574049 [ticket/12958] Remove subsilver2 for phpBB 3.2 
PHPBB3-12958
 2014-08-10 12:05:28 +02:00
Geolim4
39defd0b6b [ticket/12953] Page title not updated when notifications are marked as read 
PHPBB3-12953
 2014-08-09 18:56:36 +02:00
Andreas Fischer
12caf2f03d [ticket/12938] Remove the 'Download all attachments' feature. 
PHPBB3-12938
 2014-08-09 16:33:59 +02:00
Nils Adermann
051466106a Merge remote-tracking branch 'github-nicofuma/ticket/12693' into develop-ascraeus 
* github-nicofuma/ticket/12693:
  [ticket/12693] Fix composer.phar path
  [ticket/12693] The files skipped list can not be empty
  [ticket/12693] Force the composer.phar to be executable
  [ticket/12693] All the files in bin/ must be executable
  [ticket/12693] Expand manually the wildcard
  [ticket/12693] Fix the query for bin/*
  [ticket/12693] Extract exceptions, bin/* must be executable
  [ticket/12693] Remove the executable bit on icon_print.gif
  [ticket/12693] Check the persmissions of the owner
  [ticket/12693] Check if the are executable and not if they are 644
  [ticket/12693] Fix the permissions
  [ticket/12693] Check if the files have the right 644
  [ticket/12693] Fix indentation
  [ticket/12693] Add a travis test that checks file permissions
 2014-08-09 15:19:27 +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
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