Commit graph

21115 commits

Author SHA1 Message Date
Joas Schilling
59015cfaff Merge remote-tracking branch 'paybas/ticket/12377' into develop-ascraeus
* paybas/ticket/12377:
  [ticket/12377] Forgot to change the INCLUDEs
  [ticket/12377] Renamed template files to navbar_xxx
  [ticket/12377] Moved notifications to new template
  [ticket/12377] Forgot empty line at the end
  [ticket/12377] Move navbar(s) to new template file
2014-04-11 10:35:35 +02:00
Joas Schilling
dcd35c11ce Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12380] Explicity state the order of sorting for login keys
  [ticket/12380] Sort Remember Me keys by last login time in UCP
2014-04-11 10:33:12 +02:00
Joas Schilling
b832ebe718 Merge remote-tracking branch 'vsephpbb/ticket/12380' into develop-ascraeus
* vsephpbb/ticket/12380:
  [ticket/12380] Explicity state the order of sorting for login keys
  [ticket/12380] Sort Remember Me keys by last login time in UCP
2014-04-11 10:32:53 +02:00
Joas Schilling
72bd6f227a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12355] Topic Tools not fully updated when subscribing/bookmarking
2014-04-11 09:16:21 +02:00
Joas Schilling
6664dbb586 Merge remote-tracking branch 'varunagw/ticket/12355' into develop-ascraeus
* varunagw/ticket/12355:
  [ticket/12355] Topic Tools not fully updated when subscribing/bookmarking
2014-04-11 09:13:45 +02:00
Joas Schilling
d3f378d1d6 [ticket/12388] Fix translation of log entries without additional log data
PHPBB3-12388
2014-04-11 09:08:46 +02:00
Varun Agrawal
285b7a1f4c [ticket/12355] Topic Tools not fully updated when subscribing/bookmarking
The Topic Tools menu appears at the top of a topic page and again at the
bottom of a topic page.
When you use the Topic Tools menu to Bookmark or Subscribe to a Topic, the
menu item you chose is updated to reflect that, by switching to say
Unsubscribe topic or Remove from Bookmarks.
However, this change is not mirrored in the other Topic Tools menu at the
other location on the page.
Both Topic Tools menus should be updated during the AJAX event, so that
they always show the same options to the user.
It is solved by creating a data-update-all attribute which contains all
the class/ID that will update when topic tool is clicked

PHPBB3-12355
2014-04-11 10:12:35 +05:30
Cesar G
6b1f0f58c8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10687] Improve error message if unable to get image dimensions
2014-04-10 17:43:34 -07:00
Cesar G
251b2ba28f Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/10687] Improve error message if unable to get image dimensions
2014-04-10 17:42:59 -07:00
Cesar G
e64c2326bd Merge remote-tracking branch 'marc1706/ticket/10687' into develop-olympus
* marc1706/ticket/10687:
  [ticket/10687] Improve error message if unable to get image dimensions
2014-04-10 17:42:14 -07:00
Nils Adermann
7328ab30e8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12370] Add unit tests for topic notifications
  [ticket/12370] Fix functional notification test and remove unneeded requests
  [ticket/12370] Do not delete topic notifications when the topic is visible
2014-04-10 14:26:50 -07:00
Nils Adermann
3f74e5b88b Merge remote-tracking branch 'github-nickvergessen/ticket/12370' into develop-ascraeus
* github-nickvergessen/ticket/12370:
  [ticket/12370] Add unit tests for topic notifications
  [ticket/12370] Fix functional notification test and remove unneeded requests
  [ticket/12370] Do not delete topic notifications when the topic is visible
2014-04-10 14:26:41 -07:00
Nils Adermann
dea2cf508c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12367] Change phpbb_wrapper_gmgetdate_test to use data providers
2014-04-10 14:25:08 -07:00
Nils Adermann
62fad6ae9b Merge remote-tracking branch 'github-nickvergessen/ticket/12367' into develop-ascraeus
* github-nickvergessen/ticket/12367:
  [ticket/12367] Change phpbb_wrapper_gmgetdate_test to use data providers
2014-04-10 14:25:01 -07:00
Nils Adermann
ca56801c35 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12113] Fix view_log() tests
  [ticket/12113] Correctly use plurals when deleting user warnings
  [ticket/12113] Allow log entries to use plurals
2014-04-10 14:22:43 -07:00
Nils Adermann
497d81af68 Merge remote-tracking branch 'github-nickvergessen/ticket/12113' into develop-ascraeus
* github-nickvergessen/ticket/12113:
  [ticket/12113] Fix view_log() tests
  [ticket/12113] Correctly use plurals when deleting user warnings
  [ticket/12113] Allow log entries to use plurals
2014-04-10 14:22:36 -07:00
Nils Adermann
f948482129 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12373] Add to and from forum_id to LOG_MOVE log entries
2014-04-10 14:19:21 -07:00
Nils Adermann
90ebd49a2b Merge remote-tracking branch 'github-nickvergessen/ticket/12373' into develop-ascraeus
* github-nickvergessen/ticket/12373:
  [ticket/12373] Add to and from forum_id to LOG_MOVE log entries
2014-04-10 14:19:13 -07:00
Nils Adermann
fa3b9c0611 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12348] Allow to run create_schema_files when phpBB is not installed
2014-04-10 14:16:49 -07:00
Nils Adermann
5de4d181ee Merge remote-tracking branch 'github-nickvergessen/ticket/12348' into develop-ascraeus
* github-nickvergessen/ticket/12348:
  [ticket/12348] Allow to run create_schema_files when phpBB is not installed
2014-04-10 14:16:38 -07:00
Nils Adermann
beb71177a8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12331] Add functional test for saving custom profile fields
  [ticket/12331] Fix SQL error when inserting a new entry to profile field data
2014-04-10 14:14:38 -07:00
Nils Adermann
0ad9833668 Merge remote-tracking branch 'github-nickvergessen/ticket/12331' into develop-ascraeus
* github-nickvergessen/ticket/12331:
  [ticket/12331] Add functional test for saving custom profile fields
  [ticket/12331] Fix SQL error when inserting a new entry to profile field data
2014-04-10 14:14:30 -07:00
Nils Adermann
35075ceca6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12286] Reword section about plurals
  [ticket/12286] Fix spelling of elephant(s) in the sample
  [ticket/12286] Correctly capitalize PHP
  [ticket/12286] Fix nesting of ul inside li element
  [ticket/12286] Add note that goto should not be used
  [ticket/12286] Add section about plurals to the coding guidelines
  [ticket/12286] Classes must use the name space
  [ticket/12286] Remove section about utf8_normalize_nfc()
  [ticket/12286] Use $request->variable() instead of request_var()
  [ticket/12286] Function names should be prefixed with phpbb_
  [ticket/12286] Add "Since" to template event docs
  [ticket/12286] style.php and imagesets dont exist anymore
  [ticket/12286] Styles have a phpbb_version and a style_version in 3.1
  [ticket/12286] Use UTF8 (c) in style.cfg samples
2014-04-10 14:06:06 -07:00
Nils Adermann
e2654b34c8 Merge remote-tracking branch 'github-nickvergessen/ticket/12286' into develop-ascraeus
* github-nickvergessen/ticket/12286:
  [ticket/12286] Reword section about plurals
  [ticket/12286] Fix spelling of elephant(s) in the sample
  [ticket/12286] Correctly capitalize PHP
  [ticket/12286] Fix nesting of ul inside li element
  [ticket/12286] Add note that goto should not be used
  [ticket/12286] Add section about plurals to the coding guidelines
  [ticket/12286] Classes must use the name space
  [ticket/12286] Remove section about utf8_normalize_nfc()
  [ticket/12286] Use $request->variable() instead of request_var()
  [ticket/12286] Function names should be prefixed with phpbb_
  [ticket/12286] Add "Since" to template event docs
  [ticket/12286] style.php and imagesets dont exist anymore
  [ticket/12286] Styles have a phpbb_version and a style_version in 3.1
  [ticket/12286] Use UTF8 (c) in style.cfg samples
2014-04-10 14:05:56 -07:00
Nils Adermann
8de52bd278 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12282] Update new references
  [ticket/12282] Update container db mock
  [ticket/12282] Add new line at EOF of the interface
  [ticket/12282] Use interface for type hinting
  [ticket/12282] Use {@inheritDoc} for inherited methods
  [ticket/12282] Add Interface for DBAL drivers
2014-04-10 14:04:51 -07:00
Nils Adermann
7a947b247d Merge remote-tracking branch 'github-nickvergessen/ticket/12282' into develop-ascraeus
* github-nickvergessen/ticket/12282:
  [ticket/12282] Update new references
  [ticket/12282] Update container db mock
  [ticket/12282] Add new line at EOF of the interface
  [ticket/12282] Use interface for type hinting
  [ticket/12282] Use {@inheritDoc} for inherited methods
  [ticket/12282] Add Interface for DBAL drivers
2014-04-10 14:04:43 -07:00
Nils Adermann
f0f32ac1df Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11352] Add functional tests for disapproving a post/topic
  [ticket/11352] Redirect the user back to view*.php after disapproving
2014-04-10 13:56:53 -07:00
Nils Adermann
79fe781629 Merge remote-tracking branch 'github-nickvergessen/ticket/11352' into develop-ascraeus
* github-nickvergessen/ticket/11352:
  [ticket/11352] Add functional tests for disapproving a post/topic
  [ticket/11352] Redirect the user back to view*.php after disapproving
2014-04-10 13:56:30 -07:00
Matt Friedman
eb6b877330 [ticket/12380] Explicity state the order of sorting for login keys
PHPBB3-12380
2014-04-10 09:10:01 -07:00
Matt Friedman
49885e55e7 [ticket/12380] Sort Remember Me keys by last login time in UCP
PHPBB3-12380
2014-04-10 09:04:35 -07:00
Joas Schilling
09804bbae8 [ticket/12382] Add template test for subloops inside events
PHPBB3-12382
2014-04-10 16:06:00 +02:00
Andreas Fischer
d5507df27e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12381] Fix broken error message when selecting invalid DB driver
2014-04-10 15:44:56 +02:00
Andreas Fischer
2284e2897f Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12381] Fix broken error message when selecting invalid DB driver
2014-04-10 15:44:47 +02:00
Andreas Fischer
7d54fbd31a Merge pull request #2279 from Elsensee/ticket/12381
[ticket/12381] Fix broken error message when selecting invalid DB driver

* Elsensee/ticket/12381:
  [ticket/12381] Fix broken error message when selecting invalid DB driver
2014-04-10 15:44:35 +02:00
Oliver Schramm
87cfcda638 [ticket/12381] Fix broken error message when selecting invalid DB driver
PHPBB3-12381
2014-04-10 15:05:16 +02:00
Joas Schilling
727880f3f6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12320] Install a nightly build of HHVM.
  [ticket/12320] No longer allow Travis CI HHVM environment to fail.
2014-04-10 13:38:39 +02:00
Joas Schilling
0e2079da85 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12320] Install a nightly build of HHVM.
  [ticket/12320] No longer allow Travis CI HHVM environment to fail.
2014-04-10 13:38:17 +02:00
Joas Schilling
f0f479c517 Merge remote-tracking branch 'bantu/ticket/12320' into develop-olympus
* bantu/ticket/12320:
  [ticket/12320] Install a nightly build of HHVM.
  [ticket/12320] No longer allow Travis CI HHVM environment to fail.
2014-04-10 13:38:01 +02:00
PayBas
c8429b8e6a [ticket/12377] Forgot to change the INCLUDEs
PHPBB3-12377
2014-04-10 12:52:18 +02:00
PayBas
9dbc9b0cc2 [ticket/12377] Renamed template files to navbar_xxx
PHPBB3-12377
2014-04-10 12:52:18 +02:00
PayBas
95212746c7 [ticket/12377] Moved notifications to new template
And also reset all starting indentation to 0

PHPBB3-12377
2014-04-10 12:52:17 +02:00
PayBas
16b06c980d [ticket/12377] Forgot empty line at the end
PHPBB3-12377
2014-04-10 12:52:17 +02:00
PayBas
00d87e86ec [ticket/12377] Move navbar(s) to new template file
PHPBB3-12377
2014-04-10 12:52:16 +02:00
Joas Schilling
7cd0bda813 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11098] Fix error reporting on the autologin key pages
  [ticket/11098] Update subsilver2 to also include mark/unmark all buttons
  [ticket/11098] HTML Validity fix to Notifications in UCP
  [ticket/11098] Add mark/unmark all options to remember me keys
2014-04-10 12:17:34 +02:00
Joas Schilling
377fb770fb Merge remote-tracking branch 'vsephpbb/ticket/11098' into develop-ascraeus
* vsephpbb/ticket/11098:
  [ticket/11098] Fix error reporting on the autologin key pages
  [ticket/11098] Update subsilver2 to also include mark/unmark all buttons
  [ticket/11098] HTML Validity fix to Notifications in UCP
  [ticket/11098] Add mark/unmark all options to remember me keys
2014-04-10 12:08:01 +02:00
Joas Schilling
52f415cfdc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12375] Fix broken attachment deletion.
2014-04-10 12:04:28 +02:00
Joas Schilling
15dfa9bba2 Merge remote-tracking branch 'prototech/ticket/12375' into develop-ascraeus
* prototech/ticket/12375:
  [ticket/12375] Fix broken attachment deletion.
2014-04-10 12:03:41 +02:00
Joas Schilling
68ded62568 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12356] Assign vars preventing Plupload from loading in PM editor.
2014-04-10 12:01:22 +02:00
Joas Schilling
20c6139ad1 Merge remote-tracking branch 'prototech/ticket/12356' into develop-ascraeus
* prototech/ticket/12356:
  [ticket/12356] Assign vars preventing Plupload from loading in PM editor.
2014-04-10 11:59:32 +02:00
Joas Schilling
a478adf231 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12379] Remove duplicate labels in attachment uploader when responsive.
2014-04-10 11:57:05 +02:00