1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-10 03:36:31 +02:00
Commit Graph

20658 Commits

Author SHA1 Message Date
5c7199f3dd [ticket/12371] Fix language string
PHPBB3-12371
2014-05-02 11:51:40 +02:00
2bb12d0d6f [ticket/12371] Fix typos in comment
PHPBB3-12371
2014-05-02 11:51:20 +02:00
7324cb051f [ticket/12371] Fix redirect link for approve_post and post_in_queue
PHPBB3-12371
2014-04-25 11:52:29 +02:00
40d91a5d6e [ticket/12371] Delete the approve_post notification when editing a post
We need to delete the initial approve notification,
so we can notify the user again, when his post got reapproved.

PHPBB3-12371
2014-04-25 11:52:28 +02:00
465aa9c346 [ticket/12371] Fix language in comment
PHPBB3-12371
2014-04-25 11:52:28 +02:00
16329c7ad9 [ticket/12371] Reapprove the post and topic again in tests
PHPBB3-12371
2014-04-25 11:52:27 +02:00
ddbb521e57 [ticket/12371] Correctly set is_starter when editing first post of the topic
PHPBB3-12371
2014-04-25 11:52:26 +02:00
793680478b [ticket/12371] Add functional tests for reapproving
PHPBB3-12371
2014-04-25 11:52:26 +02:00
70f5686efb [ticket/12371] Fix query in mcp_sorting()
PHPBB3-12371
2014-04-25 11:52:25 +02:00
1d61fcf3c9 [ticket/12371] Rename disapprove and softdelete tests
PHPBB3-12371
2014-04-25 11:52:25 +02:00
84a77d07be [ticket/12371] We do not group quote notifications anymore
PHPBB3-12371
2014-04-25 11:52:23 +02:00
8375c3f789 [ticket/12371] Fix SQL query
PHPBB3-12371
2014-04-25 11:52:23 +02:00
5512e62c3c [ticket/11772] Do not send out new topic/post notifications when reapproving
Only add notifications, if we are not reapproving post
When the topic was already approved, but was edited and
now needs re-approval, we don't want to notify the users again.

PHPBB3-11772
2014-04-25 11:52:22 +02:00
2ec9c08a2b [ticket/12052] Use different visibility when post was edited
... and needs to be reapproved.

PHPBB3-12052
2014-04-25 11:52:22 +02:00
dac01e8ca5 [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method
PHPBB3-12052
2014-04-25 11:52:21 +02:00
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
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
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
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
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
f86bf3c4d3 Merge pull request #2348 from bantu/ticket/12436
[ticket/12436] Data passed to sql_multi_insert is expected to be multi-d...

* bantu/ticket/12436:
  [ticket/12436] Data passed to sql_multi_insert is expected to be multi-dim.
2014-04-24 14:31:07 +02:00
69865852a0 [ticket/12436] Data passed to sql_multi_insert is expected to be multi-dim.
PHPBB3-12436
2014-04-24 13:16:50 +02:00
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
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
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
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
631182524a Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
2014-04-22 19:25:14 +02:00
d50d8a1512 Merge pull request #2342 from nickvergessen/ticket/12413-ascraeus
[ticket/12413-ascraeus] Revert e65a6dd8f4 in olympus

* nickvergessen/ticket/12413-ascraeus:
  [ticket/12413] Revert e65a6dd8f4
2014-04-22 19:25:10 +02:00
c0f3011b53 Merge pull request #2341 from nickvergessen/ticket/12413
[ticket/12413] Revert e65a6dd8f4 in olympus

* nickvergessen/ticket/12413:
  [ticket/12413] Revert e65a6dd8f4
2014-04-22 19:24:43 +02:00
3425eeaf7d [ticket/12413] Revert e65a6dd8f4 in olympus
Merge branch 'ticket/12413' into ticket/12413-ascraeus

* ticket/12413:
  [ticket/12413] Revert e65a6dd8f4

Conflicts:
	phpBB/feed.php

The reverting is not done for develop-ascraeus and above.
We want to fix it properly there instead.

PHPBB3-12413
2014-04-22 19:04:32 +02:00
f9cdec90fc [ticket/12413] Revert e65a6dd8f4
"Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympus"

This reverts commit e65a6dd8f4, reversing
changes made to 214f515e9c.

PHPBB3-12413
2014-04-22 18:55:17 +02:00
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
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
bf3425b0f8 [ticket/12422] Add tests
PHPBB3-12422
2014-04-22 03:20:41 +02:00
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
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
c4bd2d682f Merge pull request #2332 from VSEphpbb/ticket/12405
[ticket/12405] Valid timezone and dateformat for create_user() in tests

* VSEphpbb/ticket/12405:
  [ticket/12405] Valid timezone and dateformat for create_user() in tests
2014-04-20 22:10:21 +02:00
1abd031ad6 [ticket/12347] Remove unknown/unnecessary hack
PHPBB3-12347
2014-04-20 20:53:29 +02:00
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
1905a2a7b2 [ticket/12422] Fix debug warning in log search
PHPBB3-12422
2014-04-20 18:36:39 +02:00
92d82e80cb [ticket/12424] Update Symfony component from v2.3.4 to v2.3.12.
PHPBB3-12424
2014-04-20 16:48:26 +02:00
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
ca5438d8fe [ticket/12423] Increase Composer minimum-stability to stable.
PHPBB3-12423
2014-04-20 16:45:34 +02:00
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
f251a8b50d [ticket/12347] IE8 compatible CSS selector
PHPBB3-12347
2014-04-20 14:32:19 +02:00
1757fdd4b7 [ticket/12390] Add comment to composer.json to update the build target
PHPBB3-12390
2014-04-20 12:41:19 +02:00
067ab9e800 [ticket/12405] Valid timezone and dateformat for create_user() in tests
PHPBB3-12405
2014-04-19 09:42:45 -07:00
7cccd59cdc [ticket/12193] Fix broken HTML if SQL error occurs during migration
PHPBB3-12193
2014-04-19 16:58:38 +02:00
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
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