makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-17 08:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
22865 commits 18 branches 192 tags 207 MiB
Commit graph

22865 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Alexander
0cd1876239 Merge branch 'develop-ascraeus' into develop 2014-06-25 23:24:25 +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
993afd9140 [ticket/12197] Fix several misleading FAQ entries 
PHPBB3-12197
 2014-06-25 22:26:15 +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
c0f041b69f Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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:38:58 +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
PayBas
367c6aafca [ticket/12662] Fix notifications dropdown positioning for RTL 
PHPBB3-12662
 2014-06-25 14:19:09 +02:00
PayBas
665742945f [ticket/12662] Update tests that utilize get_username_string 
PHPBB3-12662
 2014-06-25 14:19:09 +02:00
PayBas
419de00a9c [ticket/12662] Update subsilver2 index template event names 
PHPBB3-12662
 2014-06-25 14:19:08 +02:00
PayBas
6d641ad590 [ticket/12662] Update events docs from b5 to rc1/rc2 
PHPBB3-12662
 2014-06-25 14:19:07 +02:00
PayBas
9c2ef168c1 [ticket/12662] Move dropdown container from <li> to new inner div 
PHPBB3-12662
 2014-06-25 14:19:07 +02:00
PayBas
020218fcea [ticket/12662] Remove linklist container and update template events 
PHPBB3-12662
 2014-06-25 14:19:06 +02:00
PayBas
23caeb7712 [ticket/12662] Add span containers to all usernames for consistency 
PHPBB3-12662
 2014-06-25 14:19:06 +02:00
PayBas
775dc316b0 [ticket/12662] IE8 fixes 
PHPBB3-12662
 2014-06-25 14:19:05 +02:00
PayBas
dd18085ba6 [ticket/12662] Fix responsive positioning of notifications dropdown 
PHPBB3-12662
 2014-06-25 14:19:05 +02:00
PayBas
faa47cd176 [ticket/12662] Remove inherited props from ddown-extendended 
PHPBB3-12662
 2014-06-25 14:19:04 +02:00
PayBas
8c7127f573 [ticket/12662] Change CSS selectors to direct descendants for linklist 
PHPBB3-12662
 2014-06-25 14:19:03 +02:00
PayBas
e528a57c2f [ticket/12662] Reorder icon CSS rules alphabetically 
Was getting a bit disorganized

PHPBB3-12662
 2014-06-25 14:19:03 +02:00
PayBas
99065e18ca [ticket/12662] Use slack variable to determine line-break sensitivity 
PHPBB3-12662
 2014-06-25 14:19:02 +02:00
PayBas
5c90b82fde [ticket/12662] Change new event names and fix events.md 
Previously merged PR said b4 instead of b5, also not alphabetical.

PHPBB3-12662
 2014-06-25 14:19:01 +02:00
PayBas
bd0110ae79 [ticket/12662] Fix recently merged PR changes lost in rebase 
PHPBB3-12662
 2014-06-25 14:19:01 +02:00
PayBas
b8f8b884e7 [ticket/12662] Update PR after ticket/12553 merge 
Rebasing was a nightmare with all the code moving around between
commits. Hopefully this will merge without a rebase.

PHPBB3-12662
 2014-06-25 14:19:00 +02:00
PayBas
5a00054f52 [ticket/12662] Improve template checks 
And changed _CLEAN to _SIMPLE, and move teamlink events

PHPBB3-12662
 2014-06-25 14:19:00 +02:00
PayBas
ac89c84808 [ticket/12662] Added ARIA functionality 
PHPBB3-12662
 2014-06-25 14:18:59 +02:00
PayBas
329b1826af [ticket/12662] Improve icons and footer links 
PHPBB3-12662
 2014-06-25 14:18:59 +02:00
PayBas
f41947f726 [ticket/12662] Fix rounding problems when detecting relative height 
Firefox and IE round subpixels up, while webkit rounds down. So we have
to account for that.

PHPBB3-12662
 2014-06-25 14:18:58 +02:00
PayBas
4a98d7e46d [ticket/12662] RTL (bidi.css) fixes 
PHPBB3-12662
 2014-06-25 14:18:57 +02:00
PayBas
cf1b56af8d [ticket/12662] Enable responsive linkslist for IE8 
Also fixed arrow color

PHPBB3-12662
 2014-06-25 14:18:57 +02:00
PayBas
a540cdc3b2 [ticket/12662] Initial setup 
PHPBB3-12662
 2014-06-25 14:18:56 +02:00
Joas Schilling
22a834e9e0 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12760] Fix wording for unapproved posts icon...
 2014-06-25 14:16:58 +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
68b5edceab Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12766] Event exporter does not like RCx as version
 2014-06-25 14:07:01 +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
49af2177a9 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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:27 +02: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 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
7172c1a78b Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12562] Revert "Add max-width to proSilver"
 2014-06-24 21:10:44 +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
f4c5e8f12d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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
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