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

3266 commits

Author SHA1 Message Date
Tristan Darricau
1507c5af64 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13019] Do not hide reason field when deleting permanently.
  [ticket/13019] Rename deletion reason label.
  [ticket/13019] Always accept a reason for deleting a post/topic.
 2014-09-14 22:07:52 +02:00
Cesar G
ffe24d5b8f [ticket/13019] Do not hide reason field when deleting permanently. 
PHPBB3-13019
 2014-09-14 10:41:57 -07:00
Cesar G
4250c75de1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13040] Fix W3C validator warning in overall_footer.html
 2014-09-14 07:40:52 -07:00
Cesar G
a45df1d840 Merge remote-tracking branch 'prototech/ticket/13040' into develop-ascraeus 
* prototech/ticket/13040:
  [ticket/13040] Fix W3C validator warning in overall_footer.html
 2014-09-14 07:40:30 -07:00
John
e4401b2534 [ticket/13040] Fix W3C validator warning in overall_footer.html 
Added a non-breaking space to remove the following warning:
**Empty heading.**

```html
<h3 class="alert_title"></h3><p class="alert_text"></p>
```

PHPBB3-13040
 2014-09-14 06:30:03 -07:00
Cesar G
2566cf1499 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13058] Add min value to jump to page input
  [ticket/13009] Remove legacy browser hacks
 2014-09-14 06:26:32 -07:00
Cesar G
ca7168ee4a Merge remote-tracking branch 'hanakin/ticket/13009' into develop-ascraeus 
* hanakin/ticket/13009:
  [ticket/13009] Remove legacy browser hacks
 2014-09-14 06:23:00 -07:00
Cesar G
7f86b6e71e Merge remote-tracking branch 'Nicofuma/ticket/13058' into develop-ascraeus 
* Nicofuma/ticket/13058:
  [ticket/13058] Add min value to jump to page input
 2014-09-14 06:21:25 -07:00
Louis7777
2cf5b848db [ticket/13058] Add min value to jump to page input 
PHPBB3-13058
 2014-09-13 22:44:37 +02:00
Marc Alexander
08d16cf7c9 Merge branch 'develop-ascraeus' into develop 2014-09-12 19:54:34 +02:00
Marc Alexander
48dbef391b Merge pull request #2879 from callumacrae/ticket/12982 
[ticket/12982] JS refactoring
 2014-09-12 19:54:03 +02:00
hanakin
7618e0387c [ticket/13009] Remove legacy browser hacks 
PHPBB3-13009
 2014-09-11 17:33:30 +02:00
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
Callum Macrae
cb7e1540c6 [ticket/12982] Refactoring: Killed undescriptive variables 
PHPBB3-12982
 2014-09-10 09:58:46 +01: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
Jakub Senko
4b4a673d98 [ticket/13022] Language adjustments 
PHPBB3-13022
 2014-09-08 23:14:33 +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
Jakub Senko
1094de49c2 [ticket/13022] Condition Return to advanced search link 
PHPBB3-13022
 2014-09-06 14:53:14 +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
Callum Macrae
9c87972385 [ticket/12982] Refactoring: Cleaned up crazy insert users stuff 
PHPBB3-12982
 2014-08-14 00:19:34 +01:00
Callum Macrae
9e3db526d5 [ticket/12982] Refactoring: Cleaned up forum_fn.js 
PHPBB3-12982
 2014-08-14 00:04:16 +01:00
Callum Macrae
9578fdf7d7 [ticket/12982] Refactoring: Cleaned up phpbb.search 
PHPBB3-12982
 2014-08-13 23:18:50 +01: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
Callum Macrae
340f48fdeb [ticket/12982] Refactoring: made most JS nice. 
PHPBB3-12982
 2014-08-13 22:44:21 +01:00
PayBas
9db2ff7186 [ticket/12856] Copy plupload images to prosilver dir 
PHPBB3-12856
 2014-08-13 16:37:44 +02:00