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

22039 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt Friedman
eb6b877330 [ticket/12380] Explicity state the order of sorting for login keys 
PHPBB3-12380
 2014-04-10 09:10:01 -07:00
Matt Friedman
49885e55e7 [ticket/12380] Sort Remember Me keys by last login time in UCP 
PHPBB3-12380
 2014-04-10 09:04:35 -07:00
Joas Schilling
09804bbae8 [ticket/12382] Add template test for subloops inside events 
PHPBB3-12382
 2014-04-10 16:06:00 +02:00
Andreas Fischer
d5507df27e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12381] Fix broken error message when selecting invalid DB driver
 2014-04-10 15:44:56 +02:00
Andreas Fischer
2284e2897f Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12381] Fix broken error message when selecting invalid DB driver
 2014-04-10 15:44:47 +02:00
Andreas Fischer
7d54fbd31a Merge pull request #2279 from Elsensee/ticket/12381 
[ticket/12381] Fix broken error message when selecting invalid DB driver

* Elsensee/ticket/12381:
  [ticket/12381] Fix broken error message when selecting invalid DB driver
 2014-04-10 15:44:35 +02:00
Oliver Schramm
87cfcda638 [ticket/12381] Fix broken error message when selecting invalid DB driver 
PHPBB3-12381
 2014-04-10 15:05:16 +02:00
Joas Schilling
727880f3f6 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12320] Install a nightly build of HHVM.
  [ticket/12320] No longer allow Travis CI HHVM environment to fail.
 2014-04-10 13:38:39 +02:00
Joas Schilling
0e2079da85 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12320] Install a nightly build of HHVM.
  [ticket/12320] No longer allow Travis CI HHVM environment to fail.
 2014-04-10 13:38:17 +02:00
Joas Schilling
f0f479c517 Merge remote-tracking branch 'bantu/ticket/12320' into develop-olympus 
* bantu/ticket/12320:
  [ticket/12320] Install a nightly build of HHVM.
  [ticket/12320] No longer allow Travis CI HHVM environment to fail.
 2014-04-10 13:38:01 +02:00
PayBas
c8429b8e6a [ticket/12377] Forgot to change the INCLUDEs 
PHPBB3-12377
 2014-04-10 12:52:18 +02:00
PayBas
9dbc9b0cc2 [ticket/12377] Renamed template files to navbar_xxx 
PHPBB3-12377
 2014-04-10 12:52:18 +02:00
PayBas
95212746c7 [ticket/12377] Moved notifications to new template 
And also reset all starting indentation to 0

PHPBB3-12377
 2014-04-10 12:52:17 +02:00
PayBas
16b06c980d [ticket/12377] Forgot empty line at the end 
PHPBB3-12377
 2014-04-10 12:52:17 +02:00
PayBas
00d87e86ec [ticket/12377] Move navbar(s) to new template file 
PHPBB3-12377
 2014-04-10 12:52:16 +02:00
Joas Schilling
7cd0bda813 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/11098] Fix error reporting on the autologin key pages
  [ticket/11098] Update subsilver2 to also include mark/unmark all buttons
  [ticket/11098] HTML Validity fix to Notifications in UCP
  [ticket/11098] Add mark/unmark all options to remember me keys
 2014-04-10 12:17:34 +02:00
Joas Schilling
377fb770fb Merge remote-tracking branch 'vsephpbb/ticket/11098' into develop-ascraeus 
* vsephpbb/ticket/11098:
  [ticket/11098] Fix error reporting on the autologin key pages
  [ticket/11098] Update subsilver2 to also include mark/unmark all buttons
  [ticket/11098] HTML Validity fix to Notifications in UCP
  [ticket/11098] Add mark/unmark all options to remember me keys
 2014-04-10 12:08:01 +02:00
Joas Schilling
52f415cfdc Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12375] Fix broken attachment deletion.
 2014-04-10 12:04:28 +02:00
Joas Schilling
15dfa9bba2 Merge remote-tracking branch 'prototech/ticket/12375' into develop-ascraeus 
* prototech/ticket/12375:
  [ticket/12375] Fix broken attachment deletion.
 2014-04-10 12:03:41 +02:00
Joas Schilling
68ded62568 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12356] Assign vars preventing Plupload from loading in PM editor.
 2014-04-10 12:01:22 +02:00
Joas Schilling
20c6139ad1 Merge remote-tracking branch 'prototech/ticket/12356' into develop-ascraeus 
* prototech/ticket/12356:
  [ticket/12356] Assign vars preventing Plupload from loading in PM editor.
 2014-04-10 11:59:32 +02:00
Joas Schilling
a478adf231 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12379] Remove duplicate labels in attachment uploader when responsive.
 2014-04-10 11:57:05 +02:00
Joas Schilling
b785fff3ed Merge remote-tracking branch 'prototech/ticket/12379' into develop-ascraeus 
* prototech/ticket/12379:
  [ticket/12379] Remove duplicate labels in attachment uploader when responsive.
 2014-04-10 11:56:15 +02:00
Andreas Fischer
4d206e2ced [ticket/12320] Install a nightly build of HHVM. 
PHPBB3-12320
 2014-04-10 11:37:25 +02:00
Andreas Fischer
ff7cc77f9d [ticket/12320] No longer allow Travis CI HHVM environment to fail. 
PHPBB3-12320
 2014-04-10 11:36:48 +02:00
Matt Friedman
80bc30214f [ticket/11098] Fix error reporting on the autologin key pages 
PHPBB3-11098
 2014-04-09 23:17:30 -07:00
Matt Friedman
150a45b943 [ticket/11098] Update subsilver2 to also include mark/unmark all buttons 
PHPBB3-11098
 2014-04-09 19:16:45 -07:00
Cesar G
072094cb8d [ticket/12379] Remove duplicate labels in attachment uploader when responsive. 
PHPBB3-12379
 2014-04-09 18:10:38 -07:00
Matt Friedman
9eeb9ed259 [ticket/11098] HTML Validity fix to Notifications in UCP 
PHPBB3-11098
 2014-04-09 17:36:46 -07:00
Matt Friedman
51b152c8ab [ticket/11098] Add mark/unmark all options to remember me keys 
PHPBB3-11098
 2014-04-09 17:35:55 -07:00
Cesar G
9aaa9e994d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/8700] Use L_COLON instead of adding ":" manually
  [ticket/8700] Remove unused language strings
 2014-04-09 17:22:31 -07:00
Cesar G
55a674adcf Merge remote-tracking branch 'nickvergessen/ticket/8700' into develop-ascraeus 
* nickvergessen/ticket/8700:
  [ticket/8700] Use L_COLON instead of adding ":" manually
  [ticket/8700] Remove unused language strings
 2014-04-09 17:22:00 -07:00
Cesar G
aef7143b27 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12365] Do not crop image attachments at 350px
 2014-04-09 12:03:28 -07:00
Cesar G
b7d7f73693 Merge remote-tracking branch 'VSEphpbb/ticket/12365' into develop-ascraeus 
* VSEphpbb/ticket/12365:
  [ticket/12365] Do not crop image attachments at 350px
 2014-04-09 12:02:54 -07:00
Cesar G
a8ec1905e1 [ticket/12356] Assign vars preventing Plupload from loading in PM editor. 
PHPBB3-12356
 2014-04-09 11:38:14 -07:00
Marc Alexander
5c34b9c371 [ticket/10687] Improve error message if unable to get image dimensions 
The error message that is presented if getimagesize() was unable to determine
an image's dimensions now additionally states that this might be caused by an
incorrect URL.

PHPBB3-10687
 2014-04-09 14:55:49 +02:00
Cesar G
934696766a [ticket/12375] Fix broken attachment deletion. 
The response is already parsed and when running it through parseJSON returned
null prior to 1.9. Now there's an actual error thrown, so the function is
returning and thus leaving the attachment row intact.

PHPBB3-12375
 2014-04-08 21:51:56 -07:00
Matt Friedman
401a13b1a8 [ticket/12283] Remove obsolete online class from posting review page 
PHPBB3-12283
 2014-04-08 20:53:48 -07:00
Joas Schilling
88c47c251d [ticket/12373] Add to and from forum_id to LOG_MOVE log entries 
PHPBB3-12373
 2014-04-08 22:29:05 +02:00
Joas Schilling
1c434fd713 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12369] White-space cleanup
  [ticket/12369] Removed template vars initial state
  [ticket/12369] Added ACP vars
  [ticket/12369] Add template var {BODY_CLASS} to HTML body
 2014-04-08 20:57:41 +02:00
Joas Schilling
0e3e715a48 Merge remote-tracking branch 'paybas/ticket/12369' into develop-ascraeus 
* paybas/ticket/12369:
  [ticket/12369] White-space cleanup
  [ticket/12369] Removed template vars initial state
  [ticket/12369] Added ACP vars
  [ticket/12369] Add template var {BODY_CLASS} to HTML body
 2014-04-08 20:57:06 +02:00
Joas Schilling
ef5eb72e8a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12083] Fix Select All in CODE bbcode with only one char
 2014-04-08 07:48:08 +02:00
Joas Schilling
e11d833dcd Merge remote-tracking branch 'vsephpbb/ticket/12083' into develop-ascraeus 
* vsephpbb/ticket/12083:
  [ticket/12083] Fix Select All in CODE bbcode with only one char
 2014-04-08 07:47:27 +02:00
PayBas
f1201a8ec5 [ticket/12363] Fix typo 
PHPBB3-12363
 2014-04-07 23:39:49 +02:00
Dhruv
cd51c5cc3a Merge branch 'develop-ascraeus' into develop 
# By Joas Schilling
# Via Dhruv (1) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12349] Fix Sniffer for @license tag
  [ticket/12349] Update license header in several new files
 2014-04-08 02:29:43 +05:30
Matt Friedman
af6cabc106 [ticket/12254] Persist set_lang after reg only if changed from default 
PHPBB3-12254
 2014-04-07 13:58:47 -07:00
Dhruv
634e5cae0f Merge remote-tracking branch 'nickvergessen/ticket/12349' into develop-ascraeus 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12349:
  [ticket/12349] Fix Sniffer for @license tag
  [ticket/12349] Update license header in several new files
 2014-04-08 02:27:32 +05:30
PayBas
4cd6317d41 [ticket/12369] White-space cleanup 
PHPBB3-12369
 2014-04-07 22:46:22 +02:00
Joas Schilling
b2834a5563 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12362] Do not use database test case as it's not needed
  [ticket/12362] Add tests for schema generator
  [ticket/12362] Throw exception in schema generator on unresolvable dependency
 2014-04-07 22:42:54 +02:00
Joas Schilling
6c6916dc7d Merge remote-tracking branch 'Marc/ticket/12362' into develop-ascraeus 
* Marc/ticket/12362:
  [ticket/12362] Do not use database test case as it's not needed
  [ticket/12362] Add tests for schema generator
  [ticket/12362] Throw exception in schema generator on unresolvable dependency
 2014-04-07 22:42:42 +02:00