Commit graph

22294 commits

Author SHA1 Message Date
PayBas
c5b4d0afb7 [ticket/12804] Hide Jabber from UCP & member search when disabled
PHPBB3-12804
2014-07-07 09:05:57 +02:00
Andreas Fischer
0bec9897d7 Merge pull request #2697 from n-aleha/ticket/12816
[ticket/12816] Fix comment about logs in user_ban function

* n-aleha/ticket/12816:
  [ticket/12816] Fix comment about logs in user_ban function
2014-07-07 00:20:27 +02:00
Andreas Fischer
bd0f692bf3 Merge pull request #2679 from dhruvgoel92/ticket/12788
[ticket/12788] Update symfony components

* dhruvgoel92/ticket/12788:
  [ticket/12788] Force 2.3.* on symfony dependencies
  [ticket/12788] Update symfony components
2014-07-07 00:02:11 +02:00
Andreas Fischer
730991e785 Merge pull request #2704 from hanakin/ticket/12823
[ticket/12823] Remove all trailing whitespace

* hanakin/ticket/12823:
  [ticket/12823] Remove all trailing whitespace
2014-07-06 23:46:24 +02:00
Tristan Darricau
f8eca98b3f Merge pull request #2654 from nickvergessen/ticket/12515
[ticket/12515] Remove check for PostgreSQL 8.3+ in search

* nickvergessen/ticket/12515:
  [ticket/12515] Remove check for PostgreSQL 8.3+
2014-07-06 20:05:38 +02:00
Joas Schilling
e3e0c79b7a [ticket/12515] Remove check for PostgreSQL 8.3+
PHPBB3-12515
2014-07-06 19:31:46 +02:00
Tristan Darricau
5dd19c726e Merge pull request #2699 from marc1706/ticket/12810
[ticket/12810] Use correct template vars for shadow pruning settings

* marc1706/ticket/12810:
  [ticket/12810] Use correct template vars for shadow pruning settings
2014-07-06 18:16:42 +02:00
Marc Alexander
18054332e4 [ticket/12810] Use correct template vars for shadow pruning settings
PHPBB3-12810
2014-07-06 18:03:09 +02:00
Marc Alexander
57567d5611 Merge remote-tracking branch 'Crizzo/ticket/12807' into develop-ascraeus 2014-07-06 17:59:05 +02:00
hanakin
5136be4225 [ticket/12823] Remove all trailing whitespace
PHPBB3-12823
2014-07-06 17:09:21 +02:00
Cesar G
b412339cad Merge remote-tracking branch 'PayBas/ticket/12808' into develop-ascraeus
* PayBas/ticket/12808:
  [ticket/12808] Fix small gap between username and drop-down arrow
2014-07-06 06:14:56 -07:00
Cesar G
1504ec4ba3 Merge remote-tracking branch 'PayBas/ticket/12815' into develop-ascraeus
* PayBas/ticket/12815:
  [ticket/12815] Remove S_REGISTERED_USER for team link
  [ticket/12815] Show memberlist link for guests (if permitted)
2014-07-06 06:04:08 -07:00
PayBas
21320820ce [ticket/12815] Remove S_REGISTERED_USER for team link
PHPBB3-12815
2014-07-06 14:53:23 +02:00
PayBas
c190ee315e [ticket/12815] Show memberlist link for guests (if permitted)
PHPBB3-12815
2014-07-06 13:40:36 +02:00
Crizzo
addcbb1585 [ticket/12807] New variables for _EXPLAIN
PHPBB3-12807
2014-07-06 00:28:25 +02:00
Crizzo
dbefb74abe [ticket/12807] Adds missing language variables language/en/acp/forums.php
PHPBB3-12807
2014-07-05 23:57:57 +02:00
Crizzo
b6816c4237 [ticket/12807] Changes PRUNE_FREQ to PRUNE_SHADOW_FREQ/_DAYS
PHPBB3-12807
2014-07-05 22:18:01 +02:00
n-aleha
182d22567d [ticket/12816] Fix comment about logs in user_ban function
PHPBB3-12816
2014-07-05 23:00:13 +03:00
Nils Adermann
53ff23671c Merge remote-tracking branch 'github-nicofuma/ticket/12446' into develop-ascraeus
* github-nicofuma/ticket/12446:
  [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
2014-07-04 21:08:20 +02:00
PayBas
e01e7b1529 [ticket/12808] Fix small gap between username and drop-down arrow
PHPBB3-12808
2014-07-04 15:45:11 +02:00
Joas Schilling
86e21a9b26 Merge pull request #1864 from prototech/ticket/12013
[ticket/12013] Use new dropdown for quickmod tools and jumpbox.

* prototech/ticket/12013:
  [ticket/12013] Fix functional tests and sniffer issue.
  [ticket/12013] Clear the jumpbox.
  [ticket/12013] Add moderator tools icon.
  [ticket/12013] Remove obsolete jumpbox and quickmod CSS.
  [ticket/12013] Prevent the dropdown scrollbar from overlapping the content.
  [ticket/12013] Update to use the new .button class.
  [ticket/12013] Add missing class to place the buttons on the rightside.
  [ticket/12013] Use the correct variable for the forum id.
  [ticket/12013] Use DEFINE instead of Twig's set.
  [ticket/12013] Use path helper.
  [ticket/12013] Use new dropdown for quickmod tools and jumpbox.
2014-07-04 13:32:03 +02:00
Cesar G
d95c97c3b4 [ticket/12013] Fix functional tests and sniffer issue.
PHPBB3-12013
2014-07-04 01:22:32 -07:00
Cesar G
ddf3ab323b [ticket/12013] Clear the jumpbox.
PHPBB3-12013
2014-07-04 00:56:28 -07:00
Cesar G
e7b9013dba [ticket/12013] Add moderator tools icon.
PHPBB3-12013
2014-07-04 00:56:28 -07:00
Cesar G
76cd9ec953 [ticket/12013] Remove obsolete jumpbox and quickmod CSS.
PHPBB3-12013
2014-07-04 00:56:27 -07:00
Cesar G
45458b240b [ticket/12013] Prevent the dropdown scrollbar from overlapping the content.
PHPBB3-12013
2014-07-04 00:56:27 -07:00
Cesar G
3bfc9ccbc7 [ticket/12013] Update to use the new .button class.
PHPBB3-12013
2014-07-04 00:56:04 -07:00
Cesar G
bf5d3030b4 [ticket/12013] Add missing class to place the buttons on the rightside.
PHPBB3-12013
2014-07-04 00:56:04 -07:00
Cesar G
e1513a985b [ticket/12013] Use the correct variable for the forum id.
PHPBB3-12013
2014-07-04 00:56:04 -07:00
Cesar G
35fab0fc72 [ticket/12013] Use DEFINE instead of Twig's set.
PHPBB3-12013
2014-07-04 00:56:03 -07:00
Cesar G
2ff8302c51 [ticket/12013] Use path helper.
PHPBB3-12013
2014-07-04 00:56:03 -07:00
Cesar G
90a8c7e29a [ticket/12013] Use new dropdown for quickmod tools and jumpbox.
PHPBB3-12013
2014-07-04 00:56:03 -07:00
Cesar G
c1627ef52e Merge remote-tracking branch 'hanakin/ticket/12735' into develop-ascraeus
* hanakin/ticket/12735:
  [ticket/12735] Remove unnecessary span
  [ticket/12735] Fix line breaks
  [ticket/12732] Undo search-box change
  [ticket/12735] Fix some color incosistencies
  [ticket/12735] Remove underlines by default
  [ticket/12735] Undo selector rename
  [ticket/12735] Remove all :link, :visited, :active states
2014-07-03 23:03:39 -07:00
Cesar G
5878314671 Merge remote-tracking branch 'PayBas/ticket/12662' into develop-ascraeus
* PayBas/ticket/12662: (29 commits)
  [ticket/12662] Hide quick-links when empty
  [ticket/12662] Fix white-space issue to make dropdowns uniform
  [ticket/12662] Remove last remaining linklist outside navbars
  [ticket/12662] Use data-last-responsive attr instead of hardcoded list
  [ticket/12662] Remove <li> container from logged_out_content event
  [ticket/12662] Username <span> fix for list columns
  [ticket/12662] Fix notifications dropdown positioning for RTL
  [ticket/12662] Update tests that utilize get_username_string
  [ticket/12662] Update subsilver2 index template event names
  [ticket/12662] Update events docs from b5 to rc1/rc2
  [ticket/12662] Move dropdown container from <li> to new inner div
  [ticket/12662] Remove linklist container and update template events
  [ticket/12662] Add span containers to all usernames for consistency
  [ticket/12662] IE8 fixes
  [ticket/12662] Fix responsive positioning of notifications dropdown
  [ticket/12662] Remove inherited props from ddown-extendended
  [ticket/12662] Change CSS selectors to direct descendants for linklist
  [ticket/12662] Reorder icon CSS rules alphabetically
  [ticket/12662] Use slack variable to determine line-break sensitivity
  [ticket/12662] Change new event names and fix events.md
  ...
2014-07-03 23:02:11 -07:00
Dhruv
b4e8e9e29f [ticket/12788] Force 2.3.* on symfony dependencies
PHPBB3-12788
2014-07-03 20:50:06 +05:30
Nils Adermann
0deacb8438 Merge branch 'ticket/12562' of https://github.com/PayBas/phpbb into develop-ascraeus
* 'ticket/12562' of https://github.com/PayBas/phpbb:
  [ticket/12562] Use border for all sizes except responsive
  [ticket/12562] Use Hanakin's version
  [ticket/12562] Increase mq trigger screen size to hide border
  [ticket/12562] Add max-width to proSilver
2014-07-03 15:58:15 +02:00
PayBas
d8d6e3e943 [ticket/12662] Hide quick-links when empty
Also some noJS fixes

PHPBB3-12662
2014-07-03 15:53:39 +02:00
PayBas
8222eeaaff [ticket/12562] Use border for all sizes except responsive
PHPBB3-12562
2014-07-03 15:35:30 +02:00
Tristan Darricau
0232fcc22a Merge pull request #2673 from nickvergessen/ticket/12783
Ticket/12783 Move require:phpbb/phpbb to extra:phpbb/phpbb in Extensions composer.json files

* nickvergessen/ticket/12783:
  [ticket/12783] Move phpbb requirement to extra->soft-require
  [ticket/12783] Correctly use dataProviders and mark tests as incomplete
  [ticket/12783] Move phpbb/phpbb require version to extra
2014-07-03 14:23:49 +02:00
PayBas
c23c56f31c [ticket/12562] Use Hanakin's version
PHPBB3-12562
2014-07-03 13:42:12 +02:00
Joas Schilling
a0e00889d1 Merge pull request #2670 from Nicofuma/ticket/12781
[ticket/12781] Template regex for IF catch too many things

* Nicofuma/ticket/12781:
  [ticket/12781] Add tests
  [ticket/12781] Template regex for IF catch too many things
2014-07-03 12:44:33 +02:00
Joas Schilling
b0a3f2dc8f Merge pull request #2578 from marc1706/ticket/9801
[ticket/9801] Allow display of page outside board directory on viewonline

* marc1706/ticket/9801:
  [ticket/9801] Use empty instead of sizeof
  [ticket/9801] Remove spaces before * in docblock
  [ticket/9801] Add viewonline_helper service to allow proper testing
  [ticket/9801] Allow display of page outside board directory on viewonline
2014-07-03 12:02:48 +02:00
Joas Schilling
380e9c2ef4 Merge pull request #2674 from Nicofuma/ticket/12784
[ticket/12784] Allow the extensions to add a custom auto loader

* Nicofuma/ticket/12784:
  [ticket/12784] Shearch the "vendor" folders and then the autoload.php files
  [ticket/12784] Allow the extensions to add a custom auto loader
2014-07-03 11:58:04 +02:00
Tristan Darricau
520f3b3bd6 [ticket/12784] Shearch the "vendor" folders and then the autoload.php files
PHPBB3-12784
2014-07-03 11:26:07 +02:00
Joas Schilling
107693ff58 Merge pull request #2647 from Dragooon/ticket/12334
[ticket/12334] Add PROFILE_FIELD_VALUE_RAW template var

* Dragooon/ticket/12334:
  [ticket/12334] Remove profile fields test group
  [ticket/12334] Add additional test for type_string
  [ticket/12334] Add string test for type_int
  [ticket/12334] Improve type_dropdown's test description
  [ticket/12334] Group profile fields test
  [ticket/12334] Change get_profile_value_raw_data to profile_value_raw_data
  [ticket/12334] Add get_profile_value_raw unit test for type_bool
  [ticket/12334] Add get_profile_value_raw unit test for type_date
  [ticket/12334] Add get_profile_value_raw unit tests for type_dropdown
  [ticket/12334] Add get_profile_value_raw unit test for type_string
  [ticket/12334] Add get_profile_value_raw unit test for type_url
  [ticket/12334] Add get_profile_value_raw unit tests for type_int
  [ticket/12334] Removed tests
  [ticket/12334] Dropdowns cannot be tested this way
  [ticket/12334] Added test get_profile_value_raw
  [ticket/12334] Changed from valueid to value_raw
  [ticket/12334] Implemented get_profile_valueid method
  [ticket/12334] Added field_novalue fall-back as requested
  [ticket/12334] Add PROFILE_FIELD_VALUEID template var
2014-07-03 11:21:16 +02:00
Cesar G
ad967b1122 Merge remote-tracking branch 'nickvergessen/ticket/12645' into develop-ascraeus
* nickvergessen/ticket/12645:
  [ticket/12645] Replace support links in SUPPORT_BODY with 3.1 links
2014-07-02 16:46:36 -07:00
Tristan Darricau
868179c295 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12120] Add nicofuma to the developers

Conflicts:
	phpBB/docs/AUTHORS
2014-07-02 22:55:00 +02:00
Tristan Darricau
a6d66b2ab0 Merge pull request #2685 from nickvergessen/ticket/12120
[ticket/12120] Add nicofuma to the developers

* nickvergessen/ticket/12120:
  [ticket/12120] Add nicofuma to the developers
2014-07-02 22:43:12 +02:00
Joas Schilling
eff07032c0 [ticket/12120] Add nicofuma to the developers
PHPBB3-12120
2014-07-02 22:26:32 +02:00
PayBas
e99b25e273 [ticket/12562] Increase mq trigger screen size to hide border
PHPBB3-12562
2014-07-02 17:47:16 +02:00