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

3097 commits

Author SHA1 Message Date
Joas Schilling
77ed437b79 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/timezone_option.html
 2014-09-24 14:49:50 +02:00
Joas Schilling
85bc9b69ae Merge pull request #2844 from marc1706/ticket/12858 
[ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC
 2014-09-24 13:47:59 +02:00
Joas Schilling
9717d860da Merge branch 'develop-ascraeus' into develop 2014-09-24 10:34:08 +02:00
Joas Schilling
43279ee010 Merge pull request #2983 from Senky/ticket/13094 
[ticket/13094] Remove the search box if there are no new posts to search for
 2014-09-24 10:33:58 +02:00
Cesar G
b57f050d8e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12889] Fix multiple select lists
  [ticket/13082] Repair fix
  [ticket/13082] Join classes
  [ticket/13082] move style to css file
  [ticket/13082] Replace float by text-align
 2014-09-23 12:49:28 -07:00
Cesar G
f2a98339e2 Merge remote-tracking branch 'hanakin/ticket/12889' into develop-ascraeus 
* hanakin/ticket/12889:
  [ticket/12889] Fix multiple select lists
 2014-09-23 12:49:04 -07:00
Cesar G
ead5276106 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13097] Add missing unit type
 2014-09-23 10:06:33 -07:00
hanakin
fb610f99df [ticket/12889] Fix multiple select lists 
PHPBB3-12889
 2014-09-23 17:24:26 +02:00
hanakin
aa1ffc9319 [ticket/13097] Add missing unit type 
PHPBB3-13097
 2014-09-23 17:11:51 +02:00
Joas Schilling
d5691431ef Merge branch 'develop-ascraeus' into develop 2014-09-23 14:43:17 +02:00
Jakub Senko
9a8a0af7ba [ticket/13094] Condition search properly 
PHPBB3-13094
 2014-09-22 21:12:18 +02:00
hanakin
8b8e065441 [ticket/13080] Fix mediaqueries formating 
open { are should not to be on new lines for
media queries per spec, causes code highlight
issues in reputible code editors

PHPBB3-13080
 2014-09-20 16:55:20 +02:00
hanakin
e3eff2a976 [ticket/13080] Remove nowrap from dd in responsive 
PHPBB3-13080
 2014-09-20 16:51:01 +02:00
Joas Schilling
301694e922 [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4 2014-09-19 19:02:31 +02:00
Cesar G
c3778dde64 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12598] Fix sir typo
  [ticket/12598] Fix rtl positon in header
  [ticket/12598] Remove right border
  [ticket/12598] Remove border from .search-header
  [ticket/12598] Replace #search-box with class
  [ticket/12598] Remove hover border-color and use hover icon
  [ticket/12598] Add some responsive margin to give breathing room
  [ticket/12598] Clean up unused link colors
  [ticket/12598] Remove unused link colors
  [ticket/12598] Add lt IE9 fixes
  [ticket/12598] Improve search box styling
 2014-09-18 15:07:51 -07:00
hanakin
1914a08088 [ticket/12598] Fix sir typo 
PHPBB3-12598
 2014-09-18 23:13:42 +02:00
hanakin
88f645eeda [ticket/12598] Fix rtl positon in header 
PHPBB3-12598
 2014-09-18 22:45:24 +02:00
hanakin
2ca001edcf [ticket/12598] Remove right border 
PHPBB3-12598
 2014-09-18 22:34:55 +02:00
hanakin
6eb2b876f1 [ticket/12598] Remove border from .search-header 
PHPBB3-12598
 2014-09-18 21:47:24 +02:00
hanakin
0dc181a529 [ticket/12598] Replace #search-box with class 
PHPBB3-12598
 2014-09-18 21:47:23 +02:00
PayBas
d27e9c7c76 [ticket/12598] Remove hover border-color and use hover icon 
PHPBB3-12598
 2014-09-18 21:47:23 +02:00
PayBas
93d50db2d6 [ticket/12598] Add some responsive margin to give breathing room 
PHPBB3-12598
 2014-09-18 21:47:22 +02:00
PayBas
b5800d1124 [ticket/12598] Clean up unused link colors 
PHPBB3-12598
 2014-09-18 21:47:22 +02:00
PayBas
3f71d7dba1 [ticket/12598] Remove unused link colors 
PHPBB3-12598
 2014-09-18 21:47:21 +02:00
PayBas
514bf6e39a [ticket/12598] Add lt IE9 fixes 
In case this one gets merged before hanakin's gradient PR.

PHPBB3-12598
 2014-09-18 21:47:21 +02:00
PayBas
470e6d5edf [ticket/12598] Improve search box styling 
PHPBB3-12598
 2014-09-18 21:47:20 +02:00
Joas Schilling
374aa94be9 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13022] Language adjustments
  [ticket/13022] Remove ternary condition
  [ticket/13022] Condition Return to advanced search link
 2014-09-18 12:44:21 +02:00
Joas Schilling
b82a3cddd8 Merge pull request #2927 from Senky/ticket/13022 
[ticket/13022] "Return to advanced search" wrong assumption

* Senky/ticket/13022:
  [ticket/13022] Language adjustments
  [ticket/13022] Remove ternary condition
  [ticket/13022] Condition Return to advanced search link
 2014-09-18 12:44:12 +02:00
Marc Alexander
9c310f789f [ticket/12858] Rename tz_ prefixed block variables to timezone_ prefix 
PHPBB3-12858
 2014-09-17 17:56:09 +02:00
Marc Alexander
9a3aeb8a99 [ticket/12858] Remove hardcoded language entries from timezone selects 
PHPBB3-12858
 2014-09-17 17:56:04 +02:00
Marc Alexander
9ebee7de32 [ticket/12858] Generate timezone selects with template loop 
PHPBB3-12858
 2014-09-17 14:22:08 +02:00
Tristan Darricau
1507c5af64 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13019] Do not hide reason field when deleting permanently.
  [ticket/13019] Rename deletion reason label.
  [ticket/13019] Always accept a reason for deleting a post/topic.
 2014-09-14 22:07:52 +02:00
Cesar G
ffe24d5b8f [ticket/13019] Do not hide reason field when deleting permanently. 
PHPBB3-13019
 2014-09-14 10:41:57 -07:00
Cesar G
4250c75de1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13040] Fix W3C validator warning in overall_footer.html
 2014-09-14 07:40:52 -07:00
Cesar G
a45df1d840 Merge remote-tracking branch 'prototech/ticket/13040' into develop-ascraeus 
* prototech/ticket/13040:
  [ticket/13040] Fix W3C validator warning in overall_footer.html
 2014-09-14 07:40:30 -07:00
John
e4401b2534 [ticket/13040] Fix W3C validator warning in overall_footer.html 
Added a non-breaking space to remove the following warning:
**Empty heading.**

```html
<h3 class="alert_title"></h3><p class="alert_text"></p>
```

PHPBB3-13040
 2014-09-14 06:30:03 -07:00
Cesar G
2566cf1499 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13058] Add min value to jump to page input
  [ticket/13009] Remove legacy browser hacks
 2014-09-14 06:26:32 -07:00
Cesar G
ca7168ee4a Merge remote-tracking branch 'hanakin/ticket/13009' into develop-ascraeus 
* hanakin/ticket/13009:
  [ticket/13009] Remove legacy browser hacks
 2014-09-14 06:23:00 -07:00
Cesar G
7f86b6e71e Merge remote-tracking branch 'Nicofuma/ticket/13058' into develop-ascraeus 
* Nicofuma/ticket/13058:
  [ticket/13058] Add min value to jump to page input
 2014-09-14 06:21:25 -07:00
Louis7777
2cf5b848db [ticket/13058] Add min value to jump to page input 
PHPBB3-13058
 2014-09-13 22:44:37 +02:00
Marc Alexander
08d16cf7c9 Merge branch 'develop-ascraeus' into develop 2014-09-12 19:54:34 +02:00
Marc Alexander
48dbef391b Merge pull request #2879 from callumacrae/ticket/12982 
[ticket/12982] JS refactoring
 2014-09-12 19:54:03 +02:00
hanakin
7618e0387c [ticket/13009] Remove legacy browser hacks 
PHPBB3-13009
 2014-09-11 17:33:30 +02:00
Tristan Darricau
d465e7e438 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12976] Correctly use plurals for attachment count in UCP navigation

Conflicts:
	phpBB/styles/subsilver2/template/ucp_attachments.html
 2014-09-10 20:02:20 +02:00
Tristan Darricau
c842583bbf Merge pull request #2936 from nickvergessen/ticket/12976 
[ticket/12976] Correctly use plurals for attachment count in UCP navigation

* nickvergessen/ticket/12976:
  [ticket/12976] Correctly use plurals for attachment count in UCP navigation
 2014-09-10 20:00:52 +02:00
Callum Macrae
cb7e1540c6 [ticket/12982] Refactoring: Killed undescriptive variables 
PHPBB3-12982
 2014-09-10 09:58:46 +01:00
Joas Schilling
d9f36ae7e1 [ticket/12976] Correctly use plurals for attachment count in UCP navigation 
PHPBB3-12976
 2014-09-09 21:31:34 +02:00
Jakub Senko
4b4a673d98 [ticket/13022] Language adjustments 
PHPBB3-13022
 2014-09-08 23:14:33 +02:00
Andreas Fischer
33762db175 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13038] Add link to number of posts of user in viewtopic
 2014-09-08 22:12:44 +02:00
Andreas Fischer
e00697f3a1 Merge pull request #2926 from Senky/ticket/13038 
[ticket/13038] Link user post tally to their posts

* Senky/ticket/13038:
  [ticket/13038] Add link to number of posts of user in viewtopic
 2014-09-08 22:12:44 +02:00