1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

22150 Commits

Author SHA1 Message Date
Shitiz Garg
98262a5a17 [ticket/12759] Remove lang_helper from profilefields_manager
No longer required

PHPBB3-12759
2014-06-27 17:48:37 +05:30
Shitiz Garg
2cf4a4f6fe [ticket/12759] Cache all lang_options in lang_helper instead
PHPBB3-12759
2014-06-27 17:48:37 +05:30
Shitiz Garg
c1df2ce62a [ticket/12759] Extra line in profilefields_manager
PHPBB3-12759
2014-06-27 17:48:37 +05:30
Shitiz Garg
f776ac7d58 [ticket/12759] Cache lang_options for pm_viewmessage
PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
7484859c71 [ticket/12759] Cache lang_options on memberlist
PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
c82a0b74cf [ticket/12759] Add phpDoc comments to explain get_option_lang
PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
51bc31da20 [ticket/12759] Little code cleanup
PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
6251d68be4 [ticket/12759] Make sure $field_id has unique elements
Otherwise it would cause a bunch of repetitive IDs passed to the IN clause

PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
aebe03f88c [ticket/12759] Cache the lang options earlier
Previously it would re-run on every post

PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
6cf6ec3354 [ticket/12759] Cache lang options for all fields while displaying
Previously these would be fetched one field at one time, causing a large
number of queries in case there were large number of custom profile fields
and/or unique number of users in areas such as viewing topics. Resolve this
by caching them at once when generating data for displaying them in templates.

PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
6d23cc3a0e [ticket/12759] Allow multiple fields to be loaded via get_option_lang
PHPBB3-12759
2014-06-27 17:48:36 +05:30
Joas Schilling
18763d7286 Merge pull request #2493 from Nicofuma/ticket/12325
[ticket/12325] Automatic update should notify about outdated files

* Nicofuma/ticket/12325:
  [ticket/12325] Fix the language var name
  [ticket/12325] Update coding style in template
  [ticket/12325] Fix: add a missing colon
  [ticket/12325] Don't use L_COLON
  [ticket/12325] Fix: it's not stuck in an inifinite loop anymore
  [ticket/12325] Automatic update should notify about outdated files
2014-06-27 14:01:31 +02:00
Andreas Fischer
cc4f1e401e Merge pull request #2665 from nickvergessen/ticket/12196-ascraeus
[ticket/12196] Fix typo in "referrer"

* nickvergessen/ticket/12196-ascraeus:
  [ticket/12196] Fix typo in "referrer"
2014-06-26 23:46:40 +02:00
Andreas Fischer
e8d7204580 Merge pull request #2661 from n-aleha/ticket/12773
[ticket/12773] Fix language variable name in cli extension enable command

* n-aleha/ticket/12773:
  [ticket/12773] Fix language variable name in cli extension enable command
2014-06-26 23:44:41 +02:00
Joas Schilling
7e769083bf [ticket/12196] Fix typo in "referrer"
Referer is a typo in the HTTP RFC and should not be used in the UI

PHPBB3-12196
2014-06-26 23:44:21 +02:00
Andreas Fischer
ffa1f9baf5 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12196] Revert Fix typo "referer" in acp/attachments
2014-06-26 23:33:47 +02:00
Andreas Fischer
66efb1889d Merge pull request #2662 from dhruvgoel92/ticket/12196
[ticket/12196] Revert Fix typo "referer" in acp/attachments

* dhruvgoel92/ticket/12196:
  [ticket/12196] Revert Fix typo "referer" in acp/attachments
2014-06-26 23:33:46 +02:00
Dhruv
a730c0291f [ticket/12196] Revert Fix typo "referer" in acp/attachments
This reverts commit 9bc1f7924d5ef00fb988b81347d4c5c730b25eb2.
https://tracker.phpbb.com/browse/PHPBB3-12196

PHPBB3-12196
2014-06-27 00:07:15 +05:30
n-aleha
a54d74bf09 [ticket/12773] Fix language variable name in cli extension enable command
PHPBB3-12773
2014-06-26 21:05:32 +03:00
Dhruv
eb3e1b35d6 Merge branch 'develop-olympus' into develop-ascraeus
# By Joas Schilling
# Via Dhruv (1) and Joas Schilling (1)
* develop-olympus:
  [ticket/12196] Fix typo "referer" in acp/attachments
2014-06-26 23:30:06 +05:30
Dhruv
fbbf210747 Merge remote-tracking branch 'nickvergessen/ticket/12196' into develop-olympus
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12196:
  [ticket/12196] Fix typo "referer" in acp/attachments
2014-06-26 23:23:33 +05:30
Marc Alexander
9b27d00d5f Merge remote-tracking branch 'nickvergessen/ticket/12099' into develop-ascraeus
* nickvergessen/ticket/12099:
  [ticket/12099] Fix correction in path_helper test
  [ticket/12099] Prepend ./ to path to fix assets
  [ticket/12099] Deduplicate path generation
  [ticket/12099] Fix clean_path() ".." stripping when previous directory was "."
  [ticket/12099] Break clean_path tests with a simple test
  [ticket/12099] Clean paths in tests
  [ticket/12099] Correctly fix go back to root before prepending the root path
  [ticket/12099] Clean some paths before using them
  [ticket/12099] Fix several issues in path_helper test
2014-06-26 15:07:05 +02:00
Marc Alexander
69b9aa2859 Merge remote-tracking branch 'nickvergessen/ticket/12462' into develop-ascraeus 2014-06-25 23:23:18 +02:00
Joas Schilling
9bc1f7924d [ticket/12196] Fix typo "referer" in acp/attachments
PHPBB3-12196
2014-06-25 23:17:02 +02:00
Joas Schilling
29ec455a45 [ticket/12462] Do not use string "None" for different options
... it limits translations.

PHPBB3-12462
2014-06-25 22:14:33 +02:00
Joas Schilling
8b00be6fce Merge pull request #2567 from Crizz0/ticket/12680
[Ticket/12680] - Adds alternative text to contact icon in viewtopic.php

* Crizz0/ticket/12680:
  [ticket/12680] Adds variable for guest user
  [ticket/12680] Brings back get_username_string()
  [ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname
  [ticket/12680] Still some problems with displaying the nickname in ucp
  [ticket/12680] Little changes, but some issues are still there
  [ticket/12680] Removes unnessesary $user->lang from CONTACT_USER
  [ticket/12680] Adds alternativ text with new variable to contact:
  [ticket/12680] Adds second alternativ text and font-size: 0 to remove text
  [ticket/12680] Adds alternative text to contact icon in viewtopic.php
2014-06-25 19:36:18 +02:00
Joas Schilling
5265091c83 Merge pull request #2649 from VSEphpbb/ticket/12760
[ticket/12760] Fix wording for unapproved posts icon...

* VSEphpbb/ticket/12760:
  [ticket/12760] Fix wording for unapproved posts icon...
2014-06-25 14:16:53 +02:00
Joas Schilling
d083f29244 Merge pull request #2650 from PayBas/ticket/12766
[ticket/12766] Event exporter does not like RCx as version

* PayBas/ticket/12766:
  [ticket/12766] Event exporter does not like RCx as version
2014-06-25 14:06:39 +02:00
PayBas
1b0b4cd5e2 [ticket/12766] Event exporter does not like RCx as version
PHPBB3-12766
2014-06-25 13:35:57 +02:00
Matt Friedman
e42b316d87 [ticket/12760] Fix wording for unapproved posts icon...
in last post column of forum lists.
https://tracker.phpbb.com/browse/PHPBB3-12760

PHPBB3-12760
2014-06-24 20:47:51 -07:00
Joas Schilling
3e9d62b9b0 Merge branch 'prep-release-3.1.0-RC1' into develop-ascraeus
* prep-release-3.1.0-RC1:
  [prep-release-3.1.0-RC1] Update phpBB Version for RC2 development
  [prep-release-3.1.0-RC1] Add changelog for 3.1.0-RC1
  [prep-release-3.1.0-RC1] Prepare Changelog
  [prep-release-3.1.0-RC1] Add migration for 3.1.0-RC1
  [prep-release-3.1.0-RC1] Update version to 3.1.0-RC1
2014-06-25 00:07:18 +02:00
Joas Schilling
19b4391eef [prep-release-3.1.0-RC1] Update phpBB Version for RC2 development 2014-06-25 00:06:08 +02:00
Joas Schilling
60cb10e62b [prep-release-3.1.0-RC1] Add changelog for 3.1.0-RC1 release-3.1.0-RC1 2014-06-24 23:21:58 +02:00
Joas Schilling
cf92032ebb [prep-release-3.1.0-RC1] Prepare Changelog 2014-06-24 23:21:54 +02:00
Joas Schilling
6a9baaab0b [prep-release-3.1.0-RC1] Add migration for 3.1.0-RC1 2014-06-24 23:21:48 +02:00
Joas Schilling
894dcaaaad [prep-release-3.1.0-RC1] Update version to 3.1.0-RC1 2014-06-24 23:21:43 +02:00
Andreas Fischer
70a98e6f63 Merge pull request #2648 from dhruvgoel92/ticket/12562
Revert "[ticket/12562] Add max-width to proSilver"

* dhruvgoel92/ticket/12562:
  [ticket/12562] Revert "Add max-width to proSilver"
2014-06-24 21:10:44 +02:00
Andreas Fischer
b5b0175d59 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12755] Apply de morgan to conditional
  [ticket/12755] Terminate upload loop if upload reaches filesize
  [ticket/12755] Change upload in remote_upload() method to fit get_remote_file
  [ticket/12755] Add language string for timed out remote upload
  [ticket/12755] Add timeout to remote upload to prevent infinite loop
2014-06-24 20:59:11 +02:00
Andreas Fischer
2596dbc850 Merge pull request #2633 from marc1706/ticket/12755
[ticket/12755] Add timeout to remote upload to prevent infinite loop

* marc1706/ticket/12755:
  [ticket/12755] Apply de morgan to conditional
  [ticket/12755] Terminate upload loop if upload reaches filesize
  [ticket/12755] Change upload in remote_upload() method to fit get_remote_file
  [ticket/12755] Add language string for timed out remote upload
  [ticket/12755] Add timeout to remote upload to prevent infinite loop
2014-06-24 20:59:10 +02:00
Dhruv
c563d96633 [ticket/12562] Revert "Add max-width to proSilver"
https://tracker.phpbb.com/browse/PHPBB3-12562

PHPBB3-12562
2014-06-25 00:28:50 +05:30
Marc Alexander
8b3cc9a6c4 [ticket/12755] Apply de morgan to conditional
PHPBB3-12755
2014-06-24 19:53:52 +02:00
Marc Alexander
309dbb4ef9 [ticket/12755] Terminate upload loop if upload reaches filesize
Terminate the upload loop if the expected filesize has been reached instead
of trying to read more bytes until the timeout has been reached.

PHPBB3-12755
2014-06-24 19:07:49 +02:00
Andreas Fischer
1edcfcb502 Merge pull request #2646 from prototech/ticket/12750
[ticket/12750] Center installation page copyright text.

* prototech/ticket/12750:
  [ticket/12750] Center installation page copyright text.
2014-06-24 13:01:02 +02:00
Marc Alexander
5ee1e07e17 [ticket/12755] Change upload in remote_upload() method to fit get_remote_file
PHPBB3-12755
2014-06-24 11:53:32 +02:00
Cesar G
e427d203b6 [ticket/12750] Center installation page copyright text.
PHPBB3-12750
2014-06-24 01:48:31 -07:00
Nils Adermann
41becd9c92 Merge remote-tracking branch 'github-nickvergessen/ticket/12612' into develop-ascraeus
* github-nickvergessen/ticket/12612:
  [ticket/12612] Prefix check_ids() with phpbb_
  [ticket/12612] Prefix mcp_sorting() with phpbb_
  [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global
  [ticket/12612] Prefix module url functions with phpbb_
  [ticket/12612] Prefix upload_popup() with phpbb_
  [ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global
  [ticket/12612] Prefix custom UCP module function with phpbb_
  [ticket/12612] Prefix _sort_last_active() with phpbb_
  [ticket/12612] Prefix show_profile() with phpbb and delete unused global
2014-06-24 01:24:01 -04:00
Cesar G
0b4abd01c8 Merge remote-tracking branch 'PayBas/ticket/12562' into develop-ascraeus
* PayBas/ticket/12562:
  [ticket/12562] Add max-width to proSilver
2014-06-23 20:57:31 -07:00
Cesar G
8c44b2721c Merge remote-tracking branch 'PayBas/ticket/12648' into develop-ascraeus
* PayBas/ticket/12648:
  [ticket/12648] RTL fix & ACP border fix
  [ticket/12648] Slightly clear ACP active tab border
  [ticket/12648] Fix poll tab and revert unrelated color change
  [ticket/12648] Fix poll tab display error
  [ticket/12648] Added ARIA functionality
  [ticket/12648] Fix and modernize ACP header tabs
  [ticket/12648] More style fixes and also cleaned up CP left navigation
  [ticket/12648] IE8 & IE9 color fix
  [ticket/12648] Improve UCP/MCP/Posting tabs
2014-06-23 20:45:20 -07:00
Andreas Fischer
05bcce3169 Merge pull request #2642 from Nicofuma/ticket/12762
[ticket/12762] Make ext.php optional for extensions

* Nicofuma/ticket/12762:
  [ticket/12762] Make ext.php optional for extensions
2014-06-24 00:39:40 +02:00
Andreas Fischer
ba456bb00e Merge pull request #2643 from nickvergessen/ticket/12763
Ticket/12763 Do not regenerate the *_schema.sql files

* nickvergessen/ticket/12763:
  [ticket/12763] Remove invalid comment from oracle and postgres *_schema.sql
  [ticket/12763] Remove empty schema files
  [ticket/12763] Do not regenerate the *_schema.sql files
2014-06-24 00:19:30 +02:00