Commit Graph

426 Commits

Author SHA1 Message Date
Siebrand Mazeland
b9177f5e2e * i18n/L10n and translator documentation updates.
* whitespace and indentation updates
2010-09-29 00:39:45 +02:00
Brion Vibber
42dd460d3b Merge branch 'master' into 0.9.x 2010-09-21 12:48:16 -07:00
Evan Prodromou
28fdc733a7 change the location and title of the feeds section 2010-09-21 14:09:46 -04:00
Brion Vibber
64cdbe6c55 Ticket #2750: fixes to HTTP caching behavior across login/logout boundaries
* now ignoring if-modified-since if we failed an etag if-none-match comparison, per spec
* now including a hash of user id/nickname in most etags, so we'll update the view properly after login/logout

For API methods, checking the API-auth'ed user. (Many change results to include things like 'you're subscribed to this user' or 'this is one of your favorites', so user info is again needed)

There'll still be some last-modified stamps that aren't including user info properly, probably.
2010-09-20 13:42:58 -07:00
Siebrand Mazeland
8c94ebf537 * update/add translator documentation
* remove superfluous whitespace
2010-09-13 21:10:54 +02:00
Evan Prodromou
e6c84dec19 Pragma was accidentally triggering some underwear-catapult-connected hardware 2010-09-08 15:41:39 -04:00
Evan Prodromou
6c14235d6c Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2010-09-02 22:56:18 -04:00
Evan Prodromou
388495f6b1 use etag preferably for caching 2010-09-02 22:26:20 -04:00
Evan Prodromou
c8a69f433c add some caching headers 2010-09-02 22:26:19 -04:00
Evan Prodromou
0c5ca46ba3 combine our standard scripts into one big script 2010-09-02 22:21:07 -04:00
Brion Vibber
e365e709c5 Merge branch 'master' into testing 2010-09-02 14:58:11 -07:00
Brion Vibber
c24458a9f0 Ticket #2638: allow themes to specify a base theme to load with 'include' setting in a theme.ini file 2010-09-02 14:11:52 -07:00
Evan Prodromou
c7d81f2d9d hooks for showing <title> and <h1> elements 2010-09-02 17:10:25 -04:00
Matt Lee
05e4e711af remove microblogging messages 2010-08-09 18:54:40 -04:00
Matt Lee
fdd5ec2a14 remove microblogging messages 2010-08-09 18:53:55 -04:00
Matt Lee
988cb46fa3 remove microblogging messages 2010-08-09 18:40:04 -04:00
Brion Vibber
7f3b3620af Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-06-11 12:05:53 -07:00
Brion Vibber
09208f8d65 Basic custom CSS and theme uploading features. 'local' subdir can now be customized to a distinct directory and URL path to make it easier to separate custom themes for a multi-site farm running a common code base.
Currently only one custom theme may be uploaded per site, saved with the name 'custom' and stored into the local/themes subdirectory.
Administrators can upload a .ZIP archive containing a theme through the design admin panel; its contents are validated to ensure that only legit files are saved, and a 5M size quota is enforced.
Theme upload requires the zip extension for PHP; if not present, theme uploading is disabled by default.

Uploading and the custom CSS can be controlled via $config['theme_upload']['enabled'] and $config['custom_css']['enabled'].

Configurable directory/path/server for 'local' subdirectory (currently only as used for themes; local plugins not yet switched over)

Can set $config['local']['dir'] etc; not currently exposed in the admin panels.

Per-site directories on a separate themes server could be set up such as:
  $config['local']['dir'] = '/path/to/themes/local/' . $_nickname;
  $config['local']['server'] = 'themes.example.com';
  $config['local']['path'] = '/local/' . $_nickname;
  $config['local']['ssl'] = 'never';
2010-06-07 18:14:16 -07:00
Brion Vibber
fee6b78e28 Merge branch 'testing' into 0.9.x 2010-04-19 18:47:56 +02:00
Brion Vibber
e547a2f54c Fix ticket #2289: registration links were showing in top nav bar, login page message when site set to invite-only or closed registration, when the 'register' action can't be used. 2010-04-19 18:45:50 +02:00
Siebrand Mazeland
ddc116cffe Add translator documentation for a few files
* added a few XXX (that's StatusNet for FIXME, right?)
** proposing de-duplication of a message appearing ~50 times
** marking bad pagination implementation
* moved the TRANS: comments in action.php down to exactly before the line in which the message appears. Otherwise gettext does not put them in the pot file
* fixed a XXX in action.php removing double spaces
2010-04-10 21:12:14 +02:00
Brion Vibber
41062d387f Fix localization for license notice in page footer (for ticket #2274: i18n cleanup) 2010-04-09 08:58:14 -07:00
Brion Vibber
a5cfc3954f Fix localization for license notice in page footer (for ticket #2274: i18n cleanup) 2010-04-09 08:56:43 -07:00
Sarven Capadisli
41c8048efd Moved print inside base stylesheet using media rules. One less HTTP GET. 2010-03-25 22:19:50 +01:00
Sarven Capadisli
647b3a1f6b Moved print inside base stylesheet using media rules. One less HTTP GET. 2010-03-24 14:50:12 +01:00
Brion Vibber
ddb656fcd2 Merge branch 'testing' into 0.9.x
Conflicts:
	actions/apistatusnetconfig.php
2010-03-10 09:55:14 -08:00
Brion Vibber
8ee8b89dd8 Ticket #2221: fix for missing whitespace between messages in en-gb.
The final whitespace should be dropped from the source messages after we've stabilized; trailing space is pretty unreliable to keep through translation tools and should be avoided. Use separator strings outside the messages!
2010-03-10 09:36:00 -08:00
Brion Vibber
b218aee94e Merge commit 'origin/testing' into 0.9.x
Conflicts:
	lib/action.php
	lib/adminpanelaction.php
2010-03-04 06:07:28 -08:00
Zach Copley
61ada4558d Fix for disappearing 'connect' menu if xmpp and sms are disabled.
All 'connect' menu panels used to be optional, so Action tried to
figure out what the first item on the 'connect' menu should be.
This is no longer necessary because we have the non-optional OAuth
client connections panel now, which is not optional and can't be
turned off.
2010-03-03 10:19:14 -08:00
Brion Vibber
ddf3614c84 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-02 13:38:10 -08:00
Siebrand Mazeland
284b1dc014 * Change translator documentation using _m() as designed together with Brion
* Add more translator documentation

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 16:38:36 +01:00
Zach Copley
871b3aa6c0 Remove un-needed config variable for enabling/disabling Twitter integration 2010-03-01 21:52:31 -08:00
Siebrand Mazeland
bf95fa92b5 Fix forgotten "m" in 8e102da76c
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-01 22:35:27 +01:00
Siebrand Mazeland
8e102da76c Add contextual documentation to allow better localisation. 2010-03-01 22:28:38 +01:00
Craig Andrews
5a14264f0c Change 'Home' to 'Personal' in the header.
csarven indicated he accepted this change.
2010-03-01 14:16:44 -05:00
Evan Prodromou
6781f95c73 Merge branch 'blacklistplus' into testing
Conflicts:
	EVENTS.txt
2010-02-26 12:40:30 -05:00
Evan Prodromou
ea044722e0 'on' is what checkboxes use for boolean true 2010-02-26 12:28:58 -05:00
Sarven Capadisli
8d59f7cc9d Using inlineScript instead for clickjacking check 2010-02-19 13:13:05 +01:00
Sarven Capadisli
b03c7a383f Only load json2.js if native JSON is not supported 2010-02-19 13:03:26 +01:00
Sarven Capadisli
03edbfe24e Added single whitespace to separate inline text words. 2010-02-15 20:41:46 +01:00
Evan Prodromou
c52951cef5 Optionally set a separate Javascript server and path
We have about 10-12 JavaScript pages per Web page. They usually
are based on the same server as the Web pages, but since they're
static files, it makes sense to offload them to a lite server that
handles static files well.

This commit lets you set a separate Javascript server and path for the
default Javascript code in StatusNet.

Squashed commit of the following:

commit 139d1622fdafe5ad00c820224416d9021efc3234
Author: Evan Prodromou <evan@status.net>
Date:   Wed Jan 27 11:30:24 2010 -0500

    modules that call htmloutputter::script() don't prescribe js/ path

commit c6ca3174af73efed55eaed5ff1e2a3bdc77d2d87
Author: Evan Prodromou <evan@status.net>
Date:   Wed Jan 27 11:28:07 2010 -0500

    configurable server and path for javascript files
2010-01-27 11:37:22 -05:00
Evan Prodromou
655573c213 Single-user mode
New configuration options to define a single-user mode. This hides
most of the "community" pages, like the public timeline and groups.
The main user's timeline becomes the main page, and most other URLs
are changed.

Switching back and forth between 1-user and multi-user mode is
probably hazardous.

Squashed commit of the following:

commit d814aa5c92d14a27a12baba7893f3f8bf63f1d08
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jan 26 00:17:27 2010 -0500

    don't show inbox and outbox in single-user mode

commit 47f19b9523a7015d4c6e460b73ea32c839e00aa1
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jan 26 00:15:22 2010 -0500

    show correct URL for logo in single-user mode

commit 552010cffc33eadbc512ec5a67619dbc2015239a
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jan 26 00:15:06 2010 -0500

    make singleuser its own config section

commit 786ab260a3ca172e57b555c75ca10946d8f258a1
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jan 26 00:05:19 2010 -0500

    make single-user mode work

commit 5b21d7309b3a8dd5a4e0f29aea76f7897f1818b1
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jan 25 23:45:55 2010 -0500

    add single-user mode
2010-01-26 00:21:05 -05:00
Sarven Capadisli
fed111f08a Removed mobile stylesheet from core output. If Mobile support is
seeked, MobileProfile plugin should be used.
2010-01-24 00:25:31 +01:00
Sarven Capadisli
51fdba09d4 Event hooks for before and after site_notice 2010-01-24 00:14:19 +01:00
Evan Prodromou
c7f14cd777 allow all rights reserved, private data 2010-01-19 00:04:58 -05:00
Evan Prodromou
71f519f64a add event for showing content license in action 2010-01-18 23:25:45 -05:00
Zach Copley
3a9e24e077 Fix format specifier on page title 2010-01-11 23:21:09 +00:00
Siebrand Mazeland
b0aea3f9c1 * L10n updates: consistent puctuation
* i18n updates: number parameters if more than one are being used
2010-01-10 01:45:58 +01:00
Sarven Capadisli
0fcd91cf1e Using json2.js 2010-01-08 13:26:48 +00:00
Evan Prodromou
4a4ac7a108 add a version action to give credit and list plugins 2010-01-07 17:26:40 -08:00
Craig Andrews
98ce7daf56 Implement user interface for user to preview what location they are sharing with a notice 2009-12-29 16:18:52 -05:00
Evan Prodromou
b42b2e1d05 integer utility for arguments 2009-12-12 15:00:09 -05:00
Craig Andrews
51f0dd5e37 Add configuration option to toggle the indenting of the output HTML. Defaults to indent enabled. 2009-12-05 01:03:04 -05:00
Craig Andrews
8628db5208 Add geometa library, and include it.
Geometa provides a fallback for W3C geolocation so that Google Gears or Google's Client Location service can also be used
2009-11-19 15:17:57 -05:00
Evan Prodromou
bac2d80c91 Merge branch '0.9.x' into adminpanel
Conflicts:
	classes/User.php
2009-11-17 08:04:14 -05:00
Evan Prodromou
968058c68b getting arguments for return-to processing 2009-11-16 17:54:34 +01:00
Sarven Capadisli
1bac324072 Moved class="pagination" to child element and removed element 2009-11-13 12:26:24 +00:00
Evan Prodromou
a4905c03ba add site admin to global primary nav 2009-11-08 22:31:19 -05:00
Brion Vibber
a034fb0b82 Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"
This reverts commit 81b4a381d9.
IMO "user" is a bit impersonal and we shouldn't go changing the tone of the UI willy-nilly when we're updating localisations.
2009-11-08 23:22:13 +01:00
Evan Prodromou
111f6a775d Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-08 17:06:41 -05:00
Evan Prodromou
b7e2e3fd2b Restructure theme.php to define a class Theme
For various reasons, it's nicer to have a class for theme-file paths
and such. So, I've rewritten the code for determining the locations of
theme files to be more OOPy.

I changed all the uses of the two functions in the module (theme_file
and theme_path) to use Theme::file and Theme::path respectively.

I've also removed the code in common.php that require's the module;
using a class means we can autoload it instead.
2009-11-08 17:04:46 -05:00
Siebrand Mazeland
81b4a381d9 * check usage of 'people' in UI and change it to 'users' or something else in most places
* change some contractions to full text in UI messages
2009-11-08 22:26:13 +01:00
Evan Prodromou
31bbdacbf3 add a method to Action to check session token 2009-11-07 18:51:57 -05:00
Evan Prodromou
9c460d591e move scripts to just before </body>, add event for scripts that need to be in <head> 2009-10-04 03:14:39 -04:00
Sarven Capadisli
acc7897238 Added hook for Aside container 2009-10-01 12:27:02 +00:00
Evan Prodromou
93b7e60115 Merge branch '0.8.x' into 0.9.x
Conflicts:
	EVENTS.txt
2009-09-24 17:24:15 -04:00
Craig Andrews
49bce941a9 Merge remote branch 'statusnet/0.8.x' into 0.9.x
Conflicts:
	EVENTS.txt
	actions/requesttoken.php
	classes/File.php
	install.php
	lib/action.php
	lib/noticeform.php
2009-09-24 17:15:54 -04:00
Evan Prodromou
d7e43c732e Revert "move scripts to just before </body>, add event for scripts that need to be in <head>"
This reverts commit a5ed805aea.

It shouldn't have gone on the stable branch.
2009-09-24 17:14:04 -04:00
Evan Prodromou
a5ed805aea move scripts to just before </body>, add event for scripts that need to be in <head> 2009-09-23 23:23:13 -04:00
Evan Prodromou
42ba05de5f revert output buffering (costly) for ETags (low priority) 2009-09-23 09:33:40 -04:00
Craig Andrews
d7e13e847d 304 responses should not have a Content-Length header. 2009-09-15 17:17:36 -04:00
Craig Andrews
b9e4b6dd49 Generate ETags for pages which don't specify themselves. 2009-09-13 17:30:50 -04:00
Craig Andrews
0a1d2635c1 Set a Vary header with accept-encoding and cookies.
Fixes http://status.net/trac/ticket/17
2009-09-13 01:01:31 -04:00
Evan Prodromou
5d09b6b3f0 Merge branch '0.8.x' into 0.9.x
Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php
2009-08-27 11:16:45 -07:00
Evan Prodromou
b04bc29c3a change hidden label for site content license link 2009-08-26 10:51:44 -04:00
Evan Prodromou
df86aa7214 define LACONICA and accept LACONICA for backwards compatibility 2009-08-26 10:41:36 -04:00
Evan Prodromou
379c80e26e add *Laconica* events back in for backwards compatibility 2009-08-26 10:33:04 -04:00
Evan Prodromou
3567b9d708 global search and replace for laconica -> statusnet 2009-08-25 18:53:24 -04:00
Evan Prodromou
865b716f09 change LACONICA to STATUSNET 2009-08-25 18:42:34 -04:00
Evan Prodromou
ae883ceb9b change controlyourself.ca to status.net 2009-08-25 18:19:04 -04:00
Evan Prodromou
d35b2d3f3c change laconi.ca to status.net 2009-08-25 18:16:46 -04:00
Evan Prodromou
c8b8f07af1 change Laconica and Control Yourself to StatusNet in PHP files 2009-08-25 18:12:20 -04:00
Evan Prodromou
59beff6b46 Revert "Added configuration option to only allow OpenID logins."
This reverts commit 14b46e2183.

This functionality will need to be rewritten to work with the new
OpenIDPlugin.

Conflicts:

	index.php
	lib/logingroupnav.php
2009-08-21 16:45:42 -04:00
Evan Prodromou
b2664e1ae2 Merge branch '0.8.x' into 0.9.x
Conflicts:
	actions/updateprofile.php
	actions/userauthorization.php
	classes/User_group.php
	index.php
	install.php
	lib/accountsettingsaction.php
	lib/logingroupnav.php
2009-08-21 15:42:11 -04:00
Jeffery To
4d37e919ec Don't show Search in the primary nav if the user isn't logged in and the site is private 2009-08-11 20:47:41 +08:00
Jeffery To
14b46e2183 Added configuration option to only allow OpenID logins.
If $config['site']['openidonly'] is set to true:
* the Login/Register pages will be removed from the navigation;
* directly accesses to the Login/Register pages will redirect to the
  OpenID login page;
* most links to the Login/Register pages will link to the OpenID login
  page instead.

The user will still need to set a password to access the API and RSS
feeds.
2009-08-10 13:57:39 +08:00
Jeffery To
93f585446e Added configuration options to enable/disable SMS and Twitter integration.
This disables the IM, SMS and Twitter settings pages and queue handlers
depending on the config options.
2009-08-07 01:18:17 +08:00
Craig Andrews
304db1d30b Use script() and cssLink() methods everywhere instead of manually writing out javascript and css each time 2009-08-05 19:45:12 -04:00
Evan Prodromou
9421b36498 add an event for head children 2009-08-04 13:01:06 -04:00
Evan Prodromou
ae81d36137 Site-wide design configuration
I added some code so that the site-wide design can be set, using the
configuration interface.

I also moved the configuration option from
$config['site']['design']['background'] to just
$config['design']['background'], but the old syntax will still work.
2009-07-30 16:24:04 -04:00
Sarven Capadisli
2197d0bacf Added width/height attribute and values for the creative commons image 2009-07-09 19:12:50 +00:00
Sarven Capadisli
79b06ade27 Removed OpenID link from the primary global navigation in order to
keep a single Login idea because we have several ways to login
already: regular login, OpenID and Facebook (and probably LDAP, Open
Social in the future)
2009-07-08 00:42:14 +00:00
Evan Prodromou
dd705ddaf7 Merge branch 'tos' into 0.8.x 2009-07-07 11:34:49 -04:00
Sarven Capadisli
a9c83b064f Added event to let the site owner add more information into <address>
for contact e.g., email, location, tagline
2009-07-02 16:06:06 +00:00
Evan Prodromou
721ba6c88f Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-07-01 12:58:49 -04:00
Evan Prodromou
8a8390c1a7 exclude p argument when calculating selfUrl 2009-07-01 12:58:16 -04:00
Evan Prodromou
de0335fbe9 add TOS to footer menu if brought-by available 2009-06-20 22:36:56 -07:00
Jeffery To
6d308f6ffe Adds $config['invite']['enabled'] to enable/disable invites.
The invite function may not applicable for private and/or closed installs. This adds a configuration option to enable/disable invites (defaulting to enabled), hides the "Invite" nav item when necessary, and adds a check to actions/invite.php.

Note that I haven't tried the Facebook application so I didn't add any checks to actions/facebookinvite.php.
2009-06-14 16:17:22 +08:00
Zach Copley
89d0583b91 Fixes Ticket #1607 - empty 'page-notice' definition lists were
being output in a bunch of places.
2009-06-12 17:06:42 -07:00
Evan Prodromou
c0853e3040 Merge branch '0.7.x' into 0.8.x 2009-06-10 09:09:57 -07:00
Evan Prodromou
f4a1cd75ab Remove FIXME-marked Opera links until they actually work 2009-06-10 08:47:46 -07:00
Sarven Capadisli
8b5bcae58f Merge branch '0.7.x' into 0.8.x
Conflicts:

	EVENTS.txt
2009-05-18 23:28:08 +00:00
Evan Prodromou
9d13890a85 add a hook for the page notice 2009-05-15 17:11:28 -04:00
Robin Millette
fecb8c706d Attachments and their list now provide "ajax" view. Also added a few sidebars relating tags and attachments. 2009-05-15 15:04:58 -04:00
Evan Prodromou
c6816c163e reformat action.php 2009-05-15 14:18:04 -04:00
Evan Prodromou
55d7bb4701 Merge branch '0.7.x' into 0.8.x 2009-04-15 11:35:43 -04:00
Evan Prodromou
573d4cf0fb Merge branch 'nobase' into 0.7.x 2009-04-15 11:31:57 -04:00
Evan Prodromou
5ff8d8d447 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Conflicts:
	actions/public.php
2009-04-15 10:25:26 -04:00
Adrian Lang
99f4367d03 Merge branch 'link-rel-paginate' of git://gitorious.org/laconica/meitar. Fixed wrong call of common_local_url.
These changes add opera-readable prev/next relations.
2009-04-15 09:38:19 +02:00
Sarven Capadisli
7095c93f66 Simpler separation of themes. New themes can either make use of the
default styles or make their own.
2009-04-14 23:13:02 +00:00
Evan Prodromou
b142c26010 Make stuff work with no base 2009-04-14 16:02:09 -04:00
Evan Prodromou
41b247ac1a Merge branch '0.7.x' into 0.8.x 2009-04-14 14:29:51 -04:00
Evan Prodromou
4684d34713 typo in lib action 2009-04-13 15:54:16 -04:00
Evan Prodromou
e9e75fc9d5 isReadOnly() now takes arguments
Add an array of arguments to isReadOnly() method of actions, to let
them change their results depending on what actions are called.
Primarily used by the 'api' action. Ideally in the future that will be
multiple actions. But this might still be useful.
2009-04-13 15:49:26 -04:00
Sarven Capadisli
030477b02a Separation of themes (i.e., layout, typography) and skins (i.e., background
images, colours).

A theme can have multiple skins.

Majority of the changes in this commit are due to restructuring the
path/files for themes and skins.

Both theme and skin will be set to 'default' if not set in
config.php.

This commit also allows each instance of this software to create
its own theme without having to override any style from the default
distribution.

Added Cloudy theme.
2009-04-12 02:08:55 +00:00
Sarven Capadisli
e5657ca4bb Merge branch '0.7.x' into 0.8.x 2009-04-08 22:55:13 +00:00
Evan Prodromou
00dfdb3f3a Merge branch 'master' of git://gitorious.org/laconica/brianjesse-clone into brianjesse-clone/master 2009-04-07 22:32:58 -04:00
Evan Prodromou
92d18134bf Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-07 17:14:10 -04:00
Sarven Capadisli
ef2d22a84b Rearranged the global navigation items for better usability. Reason a)
placement of Search at the edge of the viewport for quicker access and
b) placement of the links that are always available (whether user is logged in
or not) in the same location (i.e., Login/Logout, Help, Search)
2009-04-07 18:09:54 +00:00
Sarven Capadisli
7f5e2c5e57 Added Invite link to global navigation 2009-04-07 18:08:56 +00:00
Evan Prodromou
4cc6d0ea2c make tags in list work 2009-04-07 11:40:13 -04:00
Sarven Capadisli
798984381f Merge branch '0.7.x' into 0.8.x 2009-04-02 06:44:54 +00:00
Sarven Capadisli
b112b32640 Selector to allow styles when a user is logged in. 2009-04-01 01:03:00 +00:00
Brian
214468d17e added a few Laconica events 2009-03-23 21:48:04 -07:00
Evan Prodromou
8c073a34ce Merge branch '0.7.x' into 0.8.x 2009-03-23 15:55:07 -04:00
Meitar Moscovitz
91b0fb8028 Add apple-touch-icon.png support; favicons for the iPhone OS. 2009-03-16 18:04:27 -04:00
Meitar Moscovitz
85d61475aa Output code to explicitly reference favicons.
This makes favicons work when Laconica is not installed at a web
server's DOCUMENT_ROOT. I've also added the capability to override the
Laconica default favicon.ico file with a theme-specific one simply by
dropping a themed favicon.ico in the appropriate theme directory.
2009-03-16 17:42:24 -04:00
Evan Prodromou
b3a0eea3b6 Merge branch '0.7.x' into 0.8.x
Conflicts:

	classes/Notice.php
	lib/action.php
	lib/router.php
	lib/twitter.php
2009-03-12 11:56:23 -04:00
Evan Prodromou
e185c0395a Revert "trac #201 Add flowplayer to enable multimedia playback capability."
This reverts commit 9c9b6790ce.

This code wasn't ready for release, so I've reverted it for now.

Conflicts:

	lib/action.php
	lib/util.php
2009-03-12 00:13:28 -04:00
Adrian Lang
c0f44ca44d Check if that $_SERVER param is set before accessing. 2009-03-11 10:39:43 +01:00
Evan Prodromou
13c183e2f4 Merge branch '0.7.x' into 0.8.x 2009-03-06 16:17:58 -08:00
Evan Prodromou
c0115bf3bc fix pagination links with new URL mapper 2009-03-04 05:29:21 -08:00
Evan Prodromou
fc44c9a7f4 Merge branch '0.7.x' into 0.8.x 2009-02-28 21:11:16 -08:00
Evan Prodromou
ee92d0b0a8 fix notice in action with caching 2009-02-26 13:36:27 -08:00
Sarven Capadisli
7af6f5392b Hook for setting document content type, charset, language, DOCTYPE and
html element properties
2009-02-26 19:56:31 +00:00
Sarven Capadisli
d30590de23 Print stylesheet 2009-02-24 04:31:31 +00:00
Zach Copley
b9f3e1e01e Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-20 17:19:08 -08:00
Zach Copley
1fdb35bbf1 New doc page for Identi.ca badge and minor updates to badge's js 2009-02-20 17:17:20 -08:00
Sarven Capadisli
f75c2328cc Hooks for: local navigation 2009-02-20 23:47:24 +00:00
Evan Prodromou
c9def4a876 more correct handling of etags and last-modified 2009-02-18 23:43:26 +00:00
Meitar Moscovitz
cca1d77748 Merge branch 'dev-0.7.x' into framebusting
Conflicts:
	lib/action.php
2009-02-18 13:01:52 +11:00
Sarven Capadisli
2eb6a6a9b0 Merge branch 'mobile-style' of git://gitorious.org/laconica/meitar into review
Conflicts:

	lib/action.php
2009-02-17 20:32:19 +00:00
Robin Millette
9c9b6790ce trac #201 Add flowplayer to enable multimedia playback capability. 2009-02-16 17:46:24 +00:00
Meitar Moscovitz
9d81cef5cc Add framebusting JavaScript to help avoid clickjacking attacks. 2009-02-16 15:45:18 +11:00
Sarven Capadisli
070d1a3f24 Hooks for: custom, laconica, UA specific stylesheets 2009-02-13 04:33:43 +00:00
Sarven Capadisli
dac8d103e6 Hooks for: header, contentblock, footer 2009-02-12 22:16:48 +00:00
Evan Prodromou
3b5fd8fb6b Revert "Code to handle PEAR_Errors raised by DB_DataObject that are bubbling"
This reverts commit 9f035e2847.

It's a lot of complicated stuff, and the global handler probably does
fine.
2009-02-12 16:05:37 -05:00
Evan Prodromou
b09eb06dae Revert "Just discovered the PEAR_Error handling function in index.php. Duh."
This reverts commit 616bdd43a9.

Kind of a long hard way to deal with a simple situation, so I'd prefer
to just use the global handler.
2009-02-12 16:04:43 -05:00
Zach Copley
616bdd43a9 Just discovered the PEAR_Error handling function in index.php. Duh.
Renamed the Action functions to throw an exception like it. I still
think it probably makes sense to have the callback defined in both
places for finer control.
2009-02-11 22:08:20 -08:00
Zach Copley
9f035e2847 Code to handle PEAR_Errors raised by DB_DataObject that are bubbling
up, but are actually expected and can safely be ignored.
2009-02-11 21:41:56 -08:00
Evan Prodromou
22b10399aa Unify feeds definition in actions
I got a little sick of trying to keep the export data and <head> links
synched in actions, so I made a common method, getFeeds(), which gets
the feeds for both. It returns an array of Feed objects, which know
about what their mime type is, title, location, all that jazz.

I changed the FeedList class so it handles the new Feed objects
instead of the old array of data.

I changed all the actions that show feeds (I think...) so that they
now use getFeeds() for all their feed needs.
2009-02-11 11:37:50 -05:00
Meitar Moscovitz
beddf90663 Trigger only on handheld device screens, not on browser screens, d'oh! 2009-02-11 03:12:14 +11:00
Meitar Moscovitz
c9e8b1e5c3 Add streamlined mobile device-friendly styles when enabled in config.
A new mobile-specific style sheet is added and loaded only if the
`$config['site']['mobile']` configuration variable is set to true.
2009-02-11 03:03:16 +11:00
Meitar Moscovitz
b240a17194 Beginning to refactor document relationship links to reduce common code.
My attempts here are to mimic the `pagination()` method shared by
actions. I'm tentatively adding the `$count` property to actions so that
we can query the number of notices ''being displayed'' per page prior to
calling the actual `pagination()` method itself, since document
relationship `<link>` elements need to be output inside of `showHead()`,
before `showContent()`, which is where `pagination()` is, gets called.
2009-02-10 20:25:44 +11:00
Meitar Moscovitz
3585012380 Merge branch 'dev-0.7.x' into link-rel-paginate 2009-02-10 18:28:12 +11:00
Evan Prodromou
32744124bc Add a hook for showing sidebar sections 2009-02-09 16:56:38 -05:00
Meitar Moscovitz
8cb3035b89 Merge branch 'dev-0.7.x' into link-rel-paginate 2009-02-10 05:05:04 +11:00
Evan Prodromou
5d246299b6 add hooks for JavaScript handling 2009-02-09 08:24:23 -05:00
Evan Prodromou
05991e2206 First events for adding menu items 2009-02-09 08:02:23 -05:00
Evan Prodromou
55cba5007e Fix indentation in lib/action.php 2009-02-09 07:51:23 -05:00
Evan Prodromou
aa06d760b3 Index and Action use Exceptions
Main Web entry point accepts exceptions, and main code in Action
throws them.
2009-02-09 07:15:52 -05:00
Meitar Moscovitz
6e2f045837 Add machine-readable pagination using HTML4.01 <link rel="next">, etc.
These extra `<link>` elements only appear on pages where pagination
makes sense. They trigger functionality in some user agents, such as
Opera's Navigation Bar for more easily navigating forward and backwards
across a paged set of notices, messages, or group lists, etc.
2009-02-09 00:02:51 +11:00
Evan Prodromou
e8d3615b3f Allow HTML in site notice (Bug#1002) 2009-02-04 08:49:42 -05:00
Evan Prodromou
0356953cf8 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into 0.7.x 2009-02-03 15:12:55 -05:00
Evan Prodromou
ab16bb876b Merge branch 'master' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-02 16:46:51 -05:00
Robin Millette
f9edd1101b trac #1099: main menu should not lead to IM settings when IM is disabled 2009-02-02 20:20:21 +00:00
Sarven Capadisli
4f1345620a Better cross-browser support for page and text zoom-in/out. 2009-02-02 14:14:14 +00:00
Sarven Capadisli
d309fd27c5 Rearraned stylesheet order for IE and fixed path to files for base IE stylesheets 2009-02-01 20:05:13 +00:00
Sarven Capadisli
add0b7f329 Resaved identica logo as transparent PNG24 in order to handle various
background colours without having to explicitly apply anti-aliasing.

Updated colour information in identica theme.

Removed ie7 base stylesheet that's no longer required.

Added ie identica stylesheet to handle solid background colour for
2009-02-01 18:04:56 +00:00
sarven
538518ead6 Not using thickbox... yet 2009-01-23 06:18:00 +00:00
Robin Millette
7f25b9db4b phpdocs 2009-01-22 04:22:32 +00:00
sarven
77a9b4b758 Moved minor dangling HTML. 2009-01-19 17:09:50 +00:00
sarven
042b01d169 Extracted the showLocalNav block information into its own method in
order to override it from other actions. This HTML need not be
outputted if there is no page_notice.
2009-01-19 17:04:59 +00:00
Evan Prodromou
582e2eefa3 Slightly better hover notices for global nav (glad it's there!) 2009-01-19 13:24:50 +00:00
Evan Prodromou
264ab53953 Merge branch 'uiredesign' of /var/www/trunk into uiredesign 2009-01-19 12:28:45 +00:00
sarven
8f9762aab1 Cross-browser stuff 2009-01-19 00:48:12 +00:00
sarven
910bd33243 Minimal cross browser styling (mostly IE7). w00t! 2009-01-19 00:10:42 +00:00
sarven
9d384aadb1 @id for site_nav_global_primary items in order to target for styling 2009-01-18 22:08:51 +00:00
sarven
5426c4ec6a Using config site name for creative commons bit. Fix i18n. 2009-01-18 19:58:28 +00:00
Evan Prodromou
2ca56c0bc6 Update caching methods to use camel case 2009-01-18 18:34:54 +00:00
Evan Prodromou
97c98cf59a Break up settings into two tabset
Made two tabsets: account and connect. Removed "Invite" from
the global nav to make room.
2009-01-17 22:30:44 +00:00
sarven
e7687c66b2 Using @id instead of @class for navigation li 2009-01-17 06:33:45 +00:00
sarven
b9fb70ee70 Markup clean up and styles 2009-01-17 00:46:33 +00:00
sarven
9881932d07 Minor 2009-01-16 23:23:02 +00:00
sarven
b7dd4d2ad1 Fix to put @class current on the navigation of the page viewed 2009-01-16 23:13:22 +00:00
Evan Prodromou
69d6404f26 Merge branch 'uiredesign' of /var/www/trunk into uiredesign 2009-01-16 19:59:27 +00:00
Evan Prodromou
ed2fd6da6b self_url -> selfUrl 2009-01-16 19:59:16 +00:00
sarven
877327a18e Update to XHR post notice 2009-01-16 17:02:46 +00:00
sarven
eacb8df691 Added jquery.form.js 2009-01-16 16:17:27 +00:00
sarven
4549e577ac Updating Creative Commons text and image 2009-01-16 15:52:17 +00:00
Evan Prodromou
20b4cae84a Put action name as body ID 2009-01-16 15:38:35 +00:00
sarven
1e8bb6bb31 Minor 2009-01-16 15:25:22 +00:00
Evan Prodromou
ba1e36dd49 Fix use of $config in Action 2009-01-16 02:21:58 +00:00
sarven
d3092274c2 Merge branch 'uiredesign' of ../evan into uiredesign 2009-01-15 23:47:43 +00:00
Evan Prodromou
16619439ab Move some accounting stuff from publicgroupnav to action
More dl's and dd's. Rather than replicate them in every sub-class,
let's just put them in one place.
2009-01-15 23:44:19 +00:00
sarven
33ee34dc26 Merge branch 'uiredesign' of ../evan into uiredesign
Conflicts:

	lib/action.php
2009-01-15 23:18:56 +00:00
Evan Prodromou
a22714b5ee Fix errant } in action 2009-01-15 23:15:13 +00:00
sarven
39b5957068 Merge branch 'uiredesign' of ../evan into uiredesign 2009-01-15 23:10:44 +00:00
Evan Prodromou
f294eab92a is_readonly() -> isReadOnly() 2009-01-15 23:07:49 +00:00
sarven
0357ea505d Merge branch 'uiredesign' of ../evan into uiredesign 2009-01-15 23:05:57 +00:00