Skip to content

Commit 423d96d

Browse files
xiaogaozixiaogaozi
committed
Merge remote-tracking branch 'upstream/master'
Conflicts: resources/celerity/map.php src/__phutil_library_map__.php webroot/rsrc/css/core/core.css
2 parents 2685db8 + ca6b821 commit 423d96d

File tree

579 files changed

+19100
-7240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

579 files changed

+19100
-7240
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ tags
3636
# User-accessible hook for adhoc debugging scripts
3737
/support/debug.php
3838

39+
# User-accessible hook for adhoc startup code
40+
/support/preamble.php
41+
3942
# Users can link binaries here
4043
/support/bin/*
4144

‎bin/remove

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../scripts/setup/manage_remove.php

‎conf/default.conf.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -638,13 +638,6 @@
638638
'https' => true,
639639
),
640640

641-
// By default, Phabricator includes some silly nonsense in the UI, such as
642-
// a submit button called "Clowncopterize" in Differential and a call to
643-
// "Leap Into Action". If you'd prefer more traditional UI strings like
644-
// "Submit", you can set this flag to disable most of the jokes and easter
645-
// eggs.
646-
'phabricator.serious-business' => false,
647-
648641
// Should Phabricator show beta applications on the homepage
649642
'phabricator.show-beta-applications' => false,
650643

@@ -980,7 +973,7 @@
980973

981974
// Minify static resources by removing whitespace and comments. You should
982975
// enable this in production, but disable it in development.
983-
'celerity.minify' => false,
976+
'celerity.minify' => true,
984977

985978
// You can respond to various application events by installing listeners,
986979
// which will receive callbacks when interesting things occur. Specify a list

‎conf/development.conf.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44

55
'phabricator.developer-mode' => true,
66
'darkconsole.enabled' => true,
7+
'celerity.minify' => false,
78

89
) + phabricator_read_config_file('default');

‎externals/phpmailer/class.phpmailer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ class PHPMailer {
221221
* This function will not work with the win32 version.
222222
* @var int
223223
*/
224-
public $Timeout = 10;
224+
public $Timeout = 60;
225225

226226
/**
227227
* Sets SMTP class debugging on or off.

‎externals/phpqrcode/LICENSE

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
GNU LESSER GENERAL PUBLIC LICENSE
2+
Version 3, 29 June 2007
3+
4+
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
5+
Everyone is permitted to copy and distribute verbatim copies
6+
of this license document, but changing it is not allowed.
7+
8+
9+
This version of the GNU Lesser General Public License incorporates
10+
the terms and conditions of version 3 of the GNU General Public
11+
License, supplemented by the additional permissions listed below.
12+
13+
0. Additional Definitions.
14+
15+
As used herein, "this License" refers to version 3 of the GNU Lesser
16+
General Public License, and the "GNU GPL" refers to version 3 of the GNU
17+
General Public License.
18+
19+
"The Library" refers to a covered work governed by this License,
20+
other than an Application or a Combined Work as defined below.
21+
22+
An "Application" is any work that makes use of an interface provided
23+
by the Library, but which is not otherwise based on the Library.
24+
Defining a subclass of a class defined by the Library is deemed a mode
25+
of using an interface provided by the Library.
26+
27+
A "Combined Work" is a work produced by combining or linking an
28+
Application with the Library. The particular version of the Library
29+
with which the Combined Work was made is also called the "Linked
30+
Version".
31+
32+
The "Minimal Corresponding Source" for a Combined Work means the
33+
Corresponding Source for the Combined Work, excluding any source code
34+
for portions of the Combined Work that, considered in isolation, are
35+
based on the Application, and not on the Linked Version.
36+
37+
The "Corresponding Application Code" for a Combined Work means the
38+
object code and/or source code for the Application, including any data
39+
and utility programs needed for reproducing the Combined Work from the
40+
Application, but excluding the System Libraries of the Combined Work.
41+
42+
1. Exception to Section 3 of the GNU GPL.
43+
44+
You may convey a covered work under sections 3 and 4 of this License
45+
without being bound by section 3 of the GNU GPL.
46+
47+
2. Conveying Modified Versions.
48+
49+
If you modify a copy of the Library, and, in your modifications, a
50+
facility refers to a function or data to be supplied by an Application
51+
that uses the facility (other than as an argument passed when the
52+
facility is invoked), then you may convey a copy of the modified
53+
version:
54+
55+
a) under this License, provided that you make a good faith effort to
56+
ensure that, in the event an Application does not supply the
57+
function or data, the facility still operates, and performs
58+
whatever part of its purpose remains meaningful, or
59+
60+
b) under the GNU GPL, with none of the additional permissions of
61+
this License applicable to that copy.
62+
63+
3. Object Code Incorporating Material from Library Header Files.
64+
65+
The object code form of an Application may incorporate material from
66+
a header file that is part of the Library. You may convey such object
67+
code under terms of your choice, provided that, if the incorporated
68+
material is not limited to numerical parameters, data structure
69+
layouts and accessors, or small macros, inline functions and templates
70+
(ten or fewer lines in length), you do both of the following:
71+
72+
a) Give prominent notice with each copy of the object code that the
73+
Library is used in it and that the Library and its use are
74+
covered by this License.
75+
76+
b) Accompany the object code with a copy of the GNU GPL and this license
77+
document.
78+
79+
4. Combined Works.
80+
81+
You may convey a Combined Work under terms of your choice that,
82+
taken together, effectively do not restrict modification of the
83+
portions of the Library contained in the Combined Work and reverse
84+
engineering for debugging such modifications, if you also do each of
85+
the following:
86+
87+
a) Give prominent notice with each copy of the Combined Work that
88+
the Library is used in it and that the Library and its use are
89+
covered by this License.
90+
91+
b) Accompany the Combined Work with a copy of the GNU GPL and this license
92+
document.
93+
94+
c) For a Combined Work that displays copyright notices during
95+
execution, include the copyright notice for the Library among
96+
these notices, as well as a reference directing the user to the
97+
copies of the GNU GPL and this license document.
98+
99+
d) Do one of the following:
100+
101+
0) Convey the Minimal Corresponding Source under the terms of this
102+
License, and the Corresponding Application Code in a form
103+
suitable for, and under terms that permit, the user to
104+
recombine or relink the Application with a modified version of
105+
the Linked Version to produce a modified Combined Work, in the
106+
manner specified by section 6 of the GNU GPL for conveying
107+
Corresponding Source.
108+
109+
1) Use a suitable shared library mechanism for linking with the
110+
Library. A suitable mechanism is one that (a) uses at run time
111+
a copy of the Library already present on the user's computer
112+
system, and (b) will operate properly with a modified version
113+
of the Library that is interface-compatible with the Linked
114+
Version.
115+
116+
e) Provide Installation Information, but only if you would otherwise
117+
be required to provide such information under section 6 of the
118+
GNU GPL, and only to the extent that such information is
119+
necessary to install and execute a modified version of the
120+
Combined Work produced by recombining or relinking the
121+
Application with a modified version of the Linked Version. (If
122+
you use option 4d0, the Installation Information must accompany
123+
the Minimal Corresponding Source and Corresponding Application
124+
Code. If you use option 4d1, you must provide the Installation
125+
Information in the manner specified by section 6 of the GNU GPL
126+
for conveying Corresponding Source.)
127+
128+
5. Combined Libraries.
129+
130+
You may place library facilities that are a work based on the
131+
Library side by side in a single library together with other library
132+
facilities that are not Applications and are not covered by this
133+
License, and convey such a combined library under terms of your
134+
choice, if you do both of the following:
135+
136+
a) Accompany the combined library with a copy of the same work based
137+
on the Library, uncombined with any other library facilities,
138+
conveyed under the terms of this License.
139+
140+
b) Give prominent notice with the combined library that part of it
141+
is a work based on the Library, and explaining where to find the
142+
accompanying uncombined form of the same work.
143+
144+
6. Revised Versions of the GNU Lesser General Public License.
145+
146+
The Free Software Foundation may publish revised and/or new versions
147+
of the GNU Lesser General Public License from time to time. Such new
148+
versions will be similar in spirit to the present version, but may
149+
differ in detail to address new problems or concerns.
150+
151+
Each version is given a distinguishing version number. If the
152+
Library as you received it specifies that a certain numbered version
153+
of the GNU Lesser General Public License "or any later version"
154+
applies to it, you have the option of following the terms and
155+
conditions either of that published version or of any later version
156+
published by the Free Software Foundation. If the Library as you
157+
received it does not specify a version number of the GNU Lesser
158+
General Public License, you may choose any version of the GNU Lesser
159+
General Public License ever published by the Free Software Foundation.
160+
161+
If the Library as you received it specifies that a proxy can decide
162+
whether future versions of the GNU Lesser General Public License shall
163+
apply, that proxy's public statement of acceptance of any version is
164+
permanent authorization for you to choose that version for the
165+
Library.

‎externals/phpqrcode/README

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
This is PHP implementation of QR Code 2-D barcode generator. It is pure-php
2+
LGPL-licensed implementation based on C libqrencode by Kentaro Fukuchi.
3+
4+
== LICENSING ==
5+
6+
Copyright (C) 2010 by Dominik Dzienia
7+
8+
This library is free software; you can redistribute it and/or modify it under
9+
the terms of the GNU Lesser General Public License as published by the Free
10+
Software Foundation; either version 3 of the License, or any later version.
11+
12+
This library is distributed in the hope that it will be useful, but WITHOUT ANY
13+
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
14+
PARTICULAR PURPOSE. See the GNU Lesser General Public License (LICENSE file)
15+
for more details.
16+
17+
You should have received a copy of the GNU Lesser General Public License along
18+
with this library; if not, write to the Free Software Foundation, Inc., 51
19+
Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
20+
21+
== INSTALATION AND USAGE ==
22+
23+
* INSTALL file
24+
* http://sourceforge.net/apps/mediawiki/phpqrcode/index.php?title=Main_Page
25+
26+
== CONTACT ==
27+
28+
Fell free to contact me via e-mail (deltalab at poczta dot fm) or using
29+
folowing project pages:
30+
31+
* http://sourceforge.net/projects/phpqrcode/
32+
* http://phpqrcode.sourceforge.net/
33+
34+
== ACKNOWLEDGMENTS ==
35+
36+
Based on C libqrencode library (ver. 3.1.1)
37+
Copyright (C) 2006-2010 by Kentaro Fukuchi
38+
http://megaui.net/fukuchi/works/qrencode/index.en.html
39+
40+
QR Code is registered trademarks of DENSO WAVE INCORPORATED in JAPAN and other
41+
countries.
42+
43+
Reed-Solomon code encoder is written by Phil Karn, KA9Q.
44+
Copyright (C) 2002, 2003, 2004, 2006 Phil Karn, KA9Q
45+

‎externals/phpqrcode/VERSION

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
1.1.4
2+
2010100721

0 commit comments

Comments
 (0)