Commit Graph

243 Commits

Author SHA1 Message Date
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