GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
5,584 Commits 8 Branches 4 Tags 309 MiB
Commit Graph

211 Commits

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