1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

17968 Commits

Author SHA1 Message Date
Joas Schilling
37751b51f9 [ticket/12371] Do not add unlimited users as responders
We run into the risc that the data is longer then the character limit
of the table column. However as we trim the users list anyway, we can
also just stop adding them and display "many others" instead of "x others"

PHPBB3-12371
2014-04-25 11:52:20 +02:00
Joas Schilling
418747ed34 [ticket/12371] Do not update the notification entry unneccessarily
When the data did not change, we also don't have to run the query at all.

PHPBB3-12371
2014-04-25 11:52:20 +02:00
Joas Schilling
92db22c882 [ticket/12371] Do not delete post related notifications when a post is deleted
When a post is marked edited and therefor marked as softdeleted/unapproved,
we should not delete the notifications, just like we can't delete the emails.
Links are out there anyway and just keeping the notification is fail save.

If we keep the notification we can just continue to update it when more posts
are added. Also when we delete a post, we don't have to go though the table
and find all related notifications to be able to delete them or even update
them, when they have responders set.

PHPBB3-12371
2014-04-25 11:52:19 +02:00
Joas Schilling
e0fadfb4d6 [ticket/12371] Allow notification types to redirect to a different url
This way we can redirect the post and bookmark notification to the first
unread post in the topic

PHPBB3-12371
2014-04-25 11:52:19 +02:00
Joas Schilling
ed40846590 [ticket/12371] Do not group "quote" notifications
Grouping these notification makes no sense, as the user will not find the
posts he is quoted in, when they are spread over multiple pages

PHPBB3-12371
2014-04-25 11:52:18 +02:00
Nils Adermann
6e85b2acc7 Merge remote-tracking branch 'github-nickvergessen/ticket/11917' into develop-ascraeus
* github-nickvergessen/ticket/11917:
  [ticket/11917] Move OAuth Module to the bottom while installing
  [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend

Conflicts:
	phpBB/install/install_install.php
2014-04-24 11:33:00 +02:00
Joas Schilling
5b6a675399 Merge pull request #2036 from prototech/ticket/12201
[ticket/12201] Clean up ACP attachment management page

* prototech/ticket/12201:
  [ticket/12201] Decreased pagination font size.
  [ticket/12201] Update select element to follow same design as prosilver.
  [ticket/12201] Increase sort font size just slightly.
  [ticket/12201] Add link to resync file stats after error.
  [ticket/12201] Fix typos in language pack.
  [ticket/12201] Display error and sorting options when there are no attachments
  [ticket/12201] Only the top pagination should be floated to the right.
  [ticket/12201] Rearrange pagination, sorting, and submit elements.
  [ticket/12201] Center the file size and mark columns.
  [ticket/12201] Separate pagination from table.
2014-04-22 19:58:15 +02:00
Joas Schilling
121bd90873 Merge pull request #2337 from prototech/ticket/12130
[ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.

* prototech/ticket/12130:
  [ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.
2014-04-22 19:51:16 +02:00
Joas Schilling
36ef90528b Merge pull request #2335 from Elsensee/ticket/12422
[ticket/12422] Fix debug warning in log search

* Elsensee/ticket/12422:
  [ticket/12422] Add tests
  [ticket/12422] Fix debug warning in log search
2014-04-22 19:42:20 +02:00
Joas Schilling
ed07f1b85e Merge pull request #2248 from Elsensee/ticket/12193
[ticket/12193] Fix broken HTML if SQL error occurs during migration

* Elsensee/ticket/12193:
  [ticket/12193] Fix broken HTML if SQL error occurs during migration
2014-04-22 18:25:33 +02:00
Joas Schilling
e360f911f8 Merge pull request #2334 from bantu/ticket/12423
Stable Composer Minimum Stability + Some Composer Dependency Updates

* bantu/ticket/12423:
  [ticket/12424] Update Symfony component from v2.3.4 to v2.3.12.
  [ticket/12423] Move PHP CodeSniffer from non-stable 1.5.0RC4 to latest 1.5.2.
  [ticket/12423] Increase Composer minimum-stability to stable.
2014-04-22 13:42:04 +02:00
Cesar G
227949d10b [ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.
PHPBB3-12130
2014-04-20 19:32:35 -07:00
Cesar G
52ebeb5f82 Merge remote-tracking branch 'PayBas/ticket/12347' into develop-ascraeus
* PayBas/ticket/12347:
  [ticket/12347] Remove unknown/unnecessary hack
  [ticket/12347] IE8 compatible CSS selector
  [ticket/12347] Changed from :after to :before
  [ticket/12347] Changed to the new navbar templates
2014-04-20 19:26:08 -07:00
PayBas
1abd031ad6 [ticket/12347] Remove unknown/unnecessary hack
PHPBB3-12347
2014-04-20 20:53:29 +02:00
Cesar G
889f6673b2 Merge remote-tracking branch 'PayBas/ticket/12363' into develop-ascraeus
* PayBas/ticket/12363:
  [ticket/12363] Fix typo
  [ticket/12363] changed _winner_ to _most-votes_
  [ticket/12363] Mark winning (most votes) results bar
2014-04-20 10:17:08 -07:00
Oliver Schramm
1905a2a7b2 [ticket/12422] Fix debug warning in log search
PHPBB3-12422
2014-04-20 18:36:39 +02:00
Andreas Fischer
92d82e80cb [ticket/12424] Update Symfony component from v2.3.4 to v2.3.12.
PHPBB3-12424
2014-04-20 16:48:26 +02:00
Andreas Fischer
22210d3dc4 [ticket/12423] Move PHP CodeSniffer from non-stable 1.5.0RC4 to latest 1.5.2.
PHPBB3-12423
2014-04-20 16:46:37 +02:00
Andreas Fischer
ca5438d8fe [ticket/12423] Increase Composer minimum-stability to stable.
PHPBB3-12423
2014-04-20 16:45:34 +02:00
Andreas Fischer
c31ea7af66 Merge pull request #2299 from nickvergessen/ticket/12390
[ticket/12390] Remove documentation, tests and other files from vendor/

* nickvergessen/ticket/12390:
  [ticket/12390] Add comment to composer.json to update the build target
  [ticket/12390] Move cleaning of vendor into it's own target
  [ticket/12390] Remove documentation, tests and other files from vendor/
2014-04-20 16:16:42 +02:00
PayBas
f251a8b50d [ticket/12347] IE8 compatible CSS selector
PHPBB3-12347
2014-04-20 14:32:19 +02:00
Joas Schilling
1757fdd4b7 [ticket/12390] Add comment to composer.json to update the build target
PHPBB3-12390
2014-04-20 12:41:19 +02:00
Oliver Schramm
7cccd59cdc [ticket/12193] Fix broken HTML if SQL error occurs during migration
PHPBB3-12193
2014-04-19 16:58:38 +02:00
Cesar G
6f41e7a98b Merge remote-tracking branch 'VSEphpbb/ticket/12419' into develop-ascraeus
* VSEphpbb/ticket/12419:
  [ticket/12419] Also shrink the size of "See All" in footer a little bit
  [ticket/12419] Improve font size in notifications drop-down
2014-04-18 09:23:02 -07:00
Matt Friedman
34533a86da [ticket/12419] Also shrink the size of "See All" in footer a little bit
PHPBB3-12419
2014-04-18 09:17:36 -07:00
Matt Friedman
8b61ba238f [ticket/12419] Improve font size in notifications drop-down
PHPBB3-12419
2014-04-18 08:48:40 -07:00
Joas Schilling
3608abdf8c Merge pull request #2317 from Elsensee/ticket/11978
[ticket/11978] Fix width of topic search text field

* Elsensee/ticket/11978:
  [ticket/11978] Fix width of topic search text field
2014-04-17 23:31:45 +02:00
Joas Schilling
0da5e3bee9 Merge pull request #2318 from prototech/ticket/12121
[ticket/12121] Preserve link redirect counts when updating from 3.0.x.

* prototech/ticket/12121:
  [ticket/12121] Preserve link redirect counts when updating from 3.0.x.
2014-04-16 23:33:03 +02:00
Joas Schilling
659c2e14b8 Merge pull request #2243 from n-aleha/ticket/12345
[ticket/12345] Improve search flood interval message for ascraeus

* n-aleha/ticket/12345:
  [ticket/12345] Improve search flood interval message for ascraeus
2014-04-16 23:26: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