Brion Vibber
|
59119482ca
|
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
|
2010-10-04 12:54:36 -07:00 |
|
Siebrand Mazeland
|
5cc08ccd07
|
Superfluous whitespace removed.
|
2010-09-20 21:11:05 +02:00 |
|
Siebrand Mazeland
|
ca3d803f1d
|
Update i18n/L10n.
|
2010-09-18 10:25:13 +02:00 |
|
Evan Prodromou
|
a319b40c97
|
common_cache_key() -> Cache::key()
|
2010-09-06 10:07:43 -04:00 |
|
Evan Prodromou
|
8f81762d68
|
common_memcache() => Cache::instance()
|
2010-09-06 09:56:45 -04:00 |
|
Craig Andrews
|
6317f7d92b
|
Assigning my copyrights to the Free Software Foundation
|
2010-05-27 18:27:33 -04:00 |
|
Craig Andrews
|
46e9aa13aa
|
htmloutputter->script() special cases src's that begin with plugin/ or local/ so that plugins don't need to include common_path() in every call to $action->script()
Adjust plugins to not call common_path() when it's not necessary
Fix minify plugin
|
2010-02-17 12:03:14 -05:00 |
|
Craig Andrews
|
c19300272f
|
parse_url returns an associative array - not an object
|
2010-02-17 12:02:59 -05:00 |
|
Craig Andrews
|
c758b1b1d4
|
Add version information to a bunch of plugins
|
2010-01-09 19:04:53 -05:00 |
|
Craig Andrews
|
20144285ca
|
The structure return by parse_url is an associative array, not an object.
|
2010-01-06 17:13:09 -05:00 |
|
Craig Andrews
|
c08d7f1aa4
|
Minify inline JS and CSS (can be disable in configuration)
|
2009-12-05 00:41:22 -05:00 |
|
Craig Andrews
|
88e50003ae
|
If a theme server is being used, do not minify theme CSS (as doing so could cause 404s)
|
2009-12-04 23:17:46 -05:00 |
|
Craig Andrews
|
01b089d9be
|
Added minify plugin
|
2009-12-04 12:36:00 -05:00 |
|