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
21209 commits 18 branches 192 tags 207 MiB
Commit graph

21209 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Alexander
01030bb3a9 Merge branch 'develop-ascraeus' of https://github.com/phpbb/phpbb into ticket/12407 
Conflicts:
	phpBB/posting.php
 2014-04-16 11:08:31 +02:00
Marc Alexander
0679a403d5 Merge branch 'ticket/8960-olympus' into ticket/8960 
Conflicts:
	phpBB/includes/acp/acp_board.php
 2014-04-16 10:11:09 +02:00
Cesar G
3d1a07f8f0 [ticket/12121] Preserve link redirect counts when updating from 3.0.x. 
PHPBB3-12121
 2014-04-15 21:15:54 -07:00
n-aleha
1f44b4da18 [ticket/12345] Improve search flood interval message for ascraeus 
Show to guests and users the remaining seconds until their next allowed
search, if a search flood limit is enabled for them.

PHPBB3-12345
 2014-04-16 02:14:36 +03:00
Joas Schilling
b305364b27 Merge pull request #2305 from n-aleha/ticket/12391 
[ticket/12391] Assign variables to core.posting_modify_template_vars

* n-aleha/ticket/12391:
  [ticket/12391] Assign variables to core.posting_modify_template_vars
 2014-04-16 00:57:07 +02:00
Joas Schilling
e50b6b5889 Merge pull request #2304 from n-aleha/ticket/12191 
[ticket/12191] Move notification options to bottom while installing

* n-aleha/ticket/12191:
  [ticket/12191] Move notification options to bottom while installing
 2014-04-16 00:49:59 +02:00
Joas Schilling
c4e3cc0850 Merge pull request #2301 from rxu/ticket/12401 
[ticket/12401] Add $topic_data array to core.viewtopic_modify_post_row event

* rxu/ticket/12401:
  [ticket/12401] Pass more data to core.viewtopic_modify_post_row event
 2014-04-16 00:17:31 +02:00
Cesar G
a9fbc34cf4 [ticket/12201] Decreased pagination font size. 
PHPBB3-12201
 2014-04-15 15:14:47 -07:00
Cesar G
e174e29b41 [ticket/12201] Update select element to follow same design as prosilver. 
PHPBB3-12201
 2014-04-15 15:10:15 -07:00
Joas Schilling
07442211b9 Merge pull request #2300 from rxu/ticket/12400 
[ticket/12400] Add viewforum event to modify topics data

* rxu/ticket/12400:
  [ticket/12400] Add viewforum event to modify topics data
 2014-04-16 00:03:20 +02:00
Cesar G
ccadda530d [ticket/12201] Increase sort font size just slightly. 
PHPBB3-12201
 2014-04-15 15:00:34 -07:00
Andreas Fischer
41db97ad3a Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12397] Fix sql_unique_index_exists doc block
 2014-04-15 23:59:56 +02:00
Andreas Fischer
e9807e1741 Merge pull request #2310 from n-aleha/ticket/12397 
[ticket/12397] Fix sql_unique_index_exists doc block

* n-aleha/ticket/12397:
  [ticket/12397] Fix sql_unique_index_exists doc block
 2014-04-15 23:59:39 +02:00
n-aleha
bff63be512 [ticket/12397] Fix sql_unique_index_exists doc block 
db_tools::sql_unique_index_exists() searches for unique indexes but not
primary key indexes.

PHPBB3-12397
 2014-04-16 00:55:05 +03:00
Joas Schilling
d1f96aa036 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/10423] Replace foreach with function in viewtopic.php
  [ticket/10423] Remove unnecessary include in test
  [ticket/10423] Match multiple wildcards
  [ticket/10423] Move code into a function and add tests for it
  [ticket/10423] Remove * from search or highlight string
 2014-04-15 23:23:44 +02:00
Joas Schilling
675cef9c2e Merge pull request #2195 from Elsensee/ticket/10423 
[ticket/10423] Remove * from search or highlight string

* Elsensee/ticket/10423:
  [ticket/10423] Replace foreach with function in viewtopic.php
  [ticket/10423] Remove unnecessary include in test
  [ticket/10423] Match multiple wildcards
  [ticket/10423] Move code into a function and add tests for it
  [ticket/10423] Remove * from search or highlight string
 2014-04-15 23:23:26 +02:00
Cesar G
b73e22ae71 [ticket/12201] Add link to resync file stats after error. 
PHPBB3-12201
 2014-04-15 14:19:47 -07:00
Oliver Schramm
7824535839 [ticket/11978] Fix width of topic search text field 
PHPBB3-11978
 2014-04-15 23:18:41 +02:00
Cesar G
52251acefa [ticket/12201] Fix typos in language pack. 
PHPBB3-12201
 2014-04-15 13:57:45 -07:00
Cesar G
38775fc063 [ticket/12201] Display error and sorting options when there are no attachments 
PHPBB3-12201
 2014-04-15 13:57:45 -07:00
Cesar G
01464e2451 [ticket/12201] Only the top pagination should be floated to the right. 
PHPBB3-12201
 2014-04-15 13:57:45 -07:00
Cesar G
f78d4196ea [ticket/12201] Rearrange pagination, sorting, and submit elements. 
PHPBB3-12201
 2014-04-15 13:57:45 -07:00
Cesar G
609c4efff6 [ticket/12201] Center the file size and mark columns. 
PHPBB3-12201
 2014-04-15 13:57:45 -07:00
Cesar G
efe667130d [ticket/12201] Separate pagination from table. 
PHPBB3-12201
 2014-04-15 13:57:45 -07:00
Joas Schilling
c63b5275d8 Merge branch 'ticket/lucifer4o/12344' into develop-ascraeus 
* ticket/lucifer4o/12344:
  [ticket/12344] Add core.pm_submit_before to function submit_pm
 2014-04-15 22:25:43 +02:00
lucifer4o
84c8c61eb2 [ticket/12344] Add core.pm_submit_before to function submit_pm 
PHPBB3-12344
 2014-04-15 22:19:47 +02:00
Oliver Schramm
f3cd7f73e1 [ticket/10423] Replace foreach with function in viewtopic.php 
PHPBB3-10423
 2014-04-15 20:43:16 +02:00
Oliver Schramm
601ecd3da1 [ticket/10423] Remove unnecessary include in test 
PHPBB3-10423
 2014-04-15 20:43:01 +02:00
Cesar G
ed4b72d1f2 [ticket/12265] Actually use $u_pm. 
PHPBB3-12265
 2014-04-15 09:15:52 -07:00
Cesar G
05dec34917 [ticket/12265] Ensure that dropdown is always at the very left of the container 
PHPBB3-12265
 2014-04-15 09:00:14 -07:00
Cesar G
975c5655f0 [ticket/12265] Define a loop for contact icons. 
PHPBB3-12265
 2014-04-15 08:56:34 -07:00
Cesar G
161b610a94 [ticket/12265] Break the icons that aren't in loop in case extensions add more 
PHPBB3-12265
 2014-04-15 08:56:34 -07:00
Cesar G
ed45981a50 [ticket/12265] Fix modulo logic. 
PHPBB3-12265
 2014-04-15 08:56:34 -07:00
Cesar G
89532ebbbe [ticket/12265] Adjust alignment of AIM and Jabber icons. 
PHPBB3-12265
 2014-04-15 08:56:34 -07:00
Cesar G
b9f9c33199 [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera. 
PHPBB3-12265
 2014-04-15 08:56:34 -07:00
Cesar G
11dd010f84 [ticket/12265] Add contact icon and remove border from last row & cells. 
PHPBB3-12265
 2014-04-15 08:56:34 -07:00
Cesar G
ec145419ed [ticket/12265] Fix issue with dropdown being restricted by the width of parent 
PHPBB3-12265
 2014-04-15 08:56:34 -07:00
Cesar G
df8832455d [ticket/12265] Remove ugly logic. 
PHPBB3-12265
 2014-04-15 08:56:34 -07:00
Cesar G
eae37267a5 [ticket/12265] Simplify contact icon design and move to dropdown. 
PHPBB3-12265
 2014-04-15 08:56:34 -07:00
Andreas Fischer
7d4be1fe19 Merge pull request #2286 from nickvergessen/ticket/12388 
[ticket/12388] Fix translation of log entries without additional log data

* nickvergessen/ticket/12388:
  [ticket/12388] Add tests for lang() use on log actions without data
  [ticket/12388] Fix translation of log entries without additional log data
 2014-04-15 11:38:21 +02:00
Marc Alexander
c6fd2f01eb [ticket/8960] Allow changing avatar path if it's not writable 
This change will allow users to change the avatar path even if it's not
writable. However, this will get rid of the error message that the path is
not writable. Due to this, a minor addition to the explain message in the ACP
settings has been made.

PHPBB3-8960
 2014-04-14 22:44:37 +02:00
PayBas
1c72e97bc8 [ticket/12347] Changed from :after to :before 
PHPBB3-12347
 2014-04-14 20:57:22 +02:00
Joas Schilling
91eaae122f [ticket/12382] Mark broken nested loop with include as incomplete 
PHPBB3-12382
 2014-04-14 18:56:34 +02:00
Marc Alexander
61f4802b5a [ticket/12407] Add message_parser as passed variable to event 
PHPBB3-12407
 2014-04-14 16:00:12 +02:00
Marc Alexander
b2bfcda19c [ticket/12407] Allow changing of post_data, etc. at end of posting.php 
The current event core.posting_modify_template_vars is just ran using dispatch
but it doesn't pass any data from posting.php to the listener. Because of that,
it's not possible to know anything from posting.php and therefore limits the
use cases of this event. This will change it to allow similar actions as with
the event core.modify_posting_parameters.

PHPBB3-12407
 2014-04-14 14:40:50 +02:00
n-aleha
11c4d14a9b [ticket/12391] Assign variables to core.posting_modify_template_vars 
Assign variables to event "core.posting_modify_template_vars".
Also, fix a couple of typos.

PHPBB3-12391
 2014-04-14 14:37:21 +03:00
Joas Schilling
b487da7c05 Merge remote-tracking branch 'marc/ticket/12004' into develop-ascraeus 
* marc/ticket/12004:
  [ticket/12004] Support empty routes to app.php/ in path_helper
 2014-04-14 12:40:47 +02:00
Joas Schilling
aebf2cc5cd Merge remote-tracking branch 'marc/ticket/12372' into develop-ascraeus 
* marc/ticket/12372:
  [ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplay
  [ticket/12372] Use admin.js $(document).ready for hiding questionnaire details
  [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()
  [ticket/12372] Move dE() function core.js
  [ticket/12372] Unify definition of function dE() across all files
  [ticket/12372] Use jQuery in javascript dE() function
 2014-04-14 12:33:33 +02:00
n-aleha
6584f5eba6 [ticket/12191] Move notification options to bottom while installing 
Move "ucp>board preferences>edit notification options" to bottom while
installing.

PHPBB3-12191
 2014-04-14 00:02:28 +03:00
Joas Schilling
3ce479f061 Merge remote-tracking branch 'marc/ticket/12398' into develop-ascraeus 
* marc/ticket/12398:
  [ticket/12398] Select correct post to restore during softdelete tests
 2014-04-13 22:42:45 +02:00