1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-23 11:35:24 +02:00
Commit Graph

22123 Commits

Author SHA1 Message Date
a54d74bf09 [ticket/12773] Fix language variable name in cli extension enable command
PHPBB3-12773
2014-06-26 21:05:32 +03:00
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
69b9aa2859 Merge remote-tracking branch 'nickvergessen/ticket/12462' into develop-ascraeus 2014-06-25 23:23:18 +02:00
29ec455a45 [ticket/12462] Do not use string "None" for different options
... it limits translations.

PHPBB3-12462
2014-06-25 22:14:33 +02:00
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
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
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
1b0b4cd5e2 [ticket/12766] Event exporter does not like RCx as version
PHPBB3-12766
2014-06-25 13:35:57 +02:00
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
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
19b4391eef [prep-release-3.1.0-RC1] Update phpBB Version for RC2 development 2014-06-25 00:06:08 +02:00
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
cf92032ebb [prep-release-3.1.0-RC1] Prepare Changelog 2014-06-24 23:21:54 +02:00
6a9baaab0b [prep-release-3.1.0-RC1] Add migration for 3.1.0-RC1 2014-06-24 23:21:48 +02:00
894dcaaaad [prep-release-3.1.0-RC1] Update version to 3.1.0-RC1 2014-06-24 23:21:43 +02:00
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
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
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
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
8b3cc9a6c4 [ticket/12755] Apply de morgan to conditional
PHPBB3-12755
2014-06-24 19:53:52 +02:00
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
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
5ee1e07e17 [ticket/12755] Change upload in remote_upload() method to fit get_remote_file
PHPBB3-12755
2014-06-24 11:53:32 +02:00
e427d203b6 [ticket/12750] Center installation page copyright text.
PHPBB3-12750
2014-06-24 01:48:31 -07:00
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
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
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
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
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
7517cc0e05 [ticket/12648] RTL fix & ACP border fix
PHPBB3-12648
2014-06-24 00:02:26 +02:00
919fee6b1b [ticket/12648] Slightly clear ACP active tab border
PHPBB3-12648
2014-06-24 00:02:26 +02:00
8547fd4c2e [ticket/12648] Fix poll tab and revert unrelated color change
PHPBB3-12648
2014-06-24 00:02:25 +02:00
1189fc9e51 [ticket/12648] Fix poll tab display error
PHPBB3-12648
2014-06-24 00:02:25 +02:00
1cf6a0e124 [ticket/12648] Added ARIA functionality
PHPBB3-12648
2014-06-24 00:02:24 +02:00
b83b72b271 [ticket/12648] Fix and modernize ACP header tabs
PHPBB3-12648
2014-06-24 00:02:24 +02:00
6f9674228c [ticket/12648] More style fixes and also cleaned up CP left navigation
PHPBB3-12648
2014-06-24 00:02:23 +02:00
f888b31645 [ticket/12648] IE8 & IE9 color fix
PHPBB3-12648
2014-06-24 00:02:23 +02:00
eda3c36b1c [ticket/12648] Improve UCP/MCP/Posting tabs
PHPBB3-12648
2014-06-24 00:02:22 +02:00
952b4de231 [ticket/12612] Prefix check_ids() with phpbb_
PHPBB3-12612
2014-06-23 23:01:52 +02:00
4ac43856f7 [ticket/12612] Prefix mcp_sorting() with phpbb_
PHPBB3-12612
2014-06-23 23:00:13 +02:00
c315fc6c89 [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global
PHPBB3-12612
2014-06-23 22:58:41 +02:00
bba23f61b3 [ticket/12612] Prefix module url functions with phpbb_
PHPBB3-12612
2014-06-23 22:54:15 +02:00
e4437e19e8 [ticket/12612] Prefix upload_popup() with phpbb_
PHPBB3-12612
2014-06-23 22:49:00 +02:00
5403b48788 [ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global
PHPBB3-12612
2014-06-23 22:48:08 +02:00
0abc1f0f97 [ticket/12612] Prefix custom UCP module function with phpbb_
PHPBB3-12612
2014-06-23 22:46:20 +02:00
b72fdd9acf [ticket/12612] Prefix _sort_last_active() with phpbb_
PHPBB3-12612
2014-06-23 22:38:58 +02:00
7575c478c7 [ticket/12612] Prefix show_profile() with phpbb and delete unused global
PHPBB3-12612
2014-06-23 22:34:17 +02:00
307c9bc15f [ticket/12763] Remove invalid comment from oracle and postgres *_schema.sql
PHPBB3-12763
2014-06-23 21:41:59 +02:00
3fd7fd435d [ticket/12763] Remove empty schema files
PHPBB3-12763
2014-06-23 21:41:04 +02:00
e45cd32de7 [ticket/12763] Do not regenerate the *_schema.sql files
PHPBB3-12763
2014-06-23 21:39:34 +02:00