eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
11,097 Commits 8 Branches 0 Tags 309 MiB
Commit Graph

297 Commits

Author SHA1 Message Date
Zach Copley 9d87313eae Merge branch '0.9.x' into pluginize-twitter-bridge 
Conflicts:
	plugins/TwitterBridge/twitterauthorization.php
 2009-09-08 16:02:57 -07: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 089148d286 update version in, and add codename to, lib/common 2009-08-27 08:02:41 -07:00
Evan Prodromou f1fda6c050 Merge branch '0.8.x' into 0.9.x 2009-08-27 07:56:19 -07:00
Evan Prodromou 6d0a26a407 define LACONICA_VERSION for backwards compatibility 2009-08-26 10:43:44 -04:00
Evan Prodromou df86aa7214 define LACONICA and accept LACONICA for backwards compatibility 2009-08-26 10:41:36 -04:00
Evan Prodromou 434abed511 add back in /etc/laconica/* for compatibility 2009-08-26 10:34:50 -04:00
Evan Prodromou e3a53251c0 last scrub of Laconica -> StatusNet 2009-08-26 03:33:43 -04:00
Zach Copley 5efe588174 Moved the rest of the Twitter stuff into the TwitterBridge plugin 2009-08-26 00:59:06 +00: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 d35b2d3f3c change laconi.ca to status.net 2009-08-25 18:16:46 -04:00
Evan Prodromou 4737563b95 a distributed -> the distributed 2009-08-25 18:14:12 -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 ff87732053 Merge branch '0.8.x' into testing 
Conflicts:
	actions/twitterauthorization.php
	lib/oauthclient.php
	lib/twitter.php
	lib/twitterapi.php
	lib/twitteroauthclient.php
	scripts/twitterstatusfetcher.php
 2009-08-24 16:55:49 -04:00
Zach Copley e9edaab358 Twitter OAuth server dance working 2009-08-24 11:52:15 -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 bacef32aac Revert "Added a configuration option to disable OpenID." 
This reverts commit 7dc3a90d12.

Conflicts:

	actions/login.php
	actions/register.php
	lib/accountsettingsaction.php
	lib/common.php
	lib/logingroupnav.php
 2009-08-21 16:38:39 -04:00
Evan Prodromou 8236037bf0 Merge branch 'dbconfig' into 0.9.x 
Conflicts:
	lib/common.php
 2009-08-21 16:17:06 -04:00
Evan Prodromou 538dcf2eef load configuration options from database at runtime 2009-08-21 16:14:32 -04:00
Brion Vibber 5c21a371d6 Include php-gettext 1.0.7 into extlibs; loading it up if native gettext extension is not present. 
This provides a pure PHP implementation of the gettext functions.

This should help get laconica running on shared hosting environments where PHP's gettext module may not be installed.
Also gets us one step closer to running on Mac OS X 10.5 with Apple's preinstalled PHP, which doesn't provide an easy way to add modules.

Source: http://savannah.nongnu.org/projects/php-gettext
Copyright (c) 2005 Steven Armstrong <sa at c-area dot ch>
GPLv2 or later
 2009-08-21 16:01:51 -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
Evan Prodromou a28bbdfb0f configuration options for text limits 2009-08-21 06:33:22 -04:00
Francois Marier 986d95b31e Fix the default value of ['server']['path'] when running from command line scripts 
The logic in _sn_to_path() doesn't make sense when not running via a remote server.

Default to the empty string if running from the command line and ['server']['path']
is not set manually in config.php
 2009-08-20 17:46:26 +12:00
Jeffery To 7dc3a90d12 Added a configuration option to disable OpenID. 
If $config['openid']['enabled'] is set to false, OpenID is removed from
the navigation and direct accesses to OpenID login pages redirect to the
login page.

If OpenID is enabled, $config['site']['openidonly'] is ignored, i.e.
OpenID is required to go OpenID-only.
 2009-08-13 22:18:06 +08:00
Craig Andrews e9ed20a69d Merge commit 'jeff-themovie/0.8.x-openidonly' into 0.8.x 2009-08-10 11:53:35 -04:00
Zach Copley 17dcf1c317 Merge branch 'twitter-oauth' into 0.8.x 
Conflicts:

	scripts/getvaliddaemons.php
 2009-08-10 07:49:51 +00: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 7c9e12a0b8 Fixed IM and SMS enabled options to default to true. 2009-08-07 01:57:43 +08:00
Jeffery To 5f293f0e2f Added configuration option to disable post-by-email. 
This hides the relevant settings from the email settings page and
prevents maildaemon.php from processing email if the option is
disabled.
 2009-08-07 01:55:31 +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
Evan Prodromou 7a61b0737d update version to 0.8.1pre1 2009-08-05 16:06:15 -04:00
Evan Prodromou 6937704ebd give plugins a chance to autoload their classes 2009-08-04 07:34:58 -04:00
Evan Prodromou b995370d4a 0.9.0 dev version 2009-08-04 06:05:04 -04:00
Zach Copley dccd4aa68d Merge branch '0.8.x' into twitter-oauth 2009-08-03 22:47:57 +00:00
Zach Copley 6f4b2f0ac2 Twitter OAuth server dance working 2009-08-01 08:20:44 +00: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
Craig Andrews 7fff454ff9 Revert "0.9.0 dev version" 
This reverts commit 7cfb2f569d.

This should have never been committed to the 0.8.x branch.
 2009-07-23 13:00:34 -04:00
Evan Prodromou c07c4b2050 change version to 0.8.1dev 2009-07-15 23:36:08 -04:00
Evan Prodromou 6a0f0e32d5 Merge branch '0.8.x' into 0.9.x 2009-07-10 10:06:20 -07:00
Evan Prodromou 15f6309dea add a little syntactical sugar for adding plugins 2009-07-09 23:12:53 -07:00
Evan Prodromou 03ccb74052 0.9.0 dev version 2009-07-09 18:22:46 -04:00
Evan Prodromou efd94b4e54 change version number to 0.8.0 2009-07-09 18:22:10 -04:00
Evan Prodromou b78801becb correct the newuser default setting in common.php 2009-07-09 18:19:13 -04:00
Zach Copley d80c553e5f Make logging facility configurable 2009-07-02 16:06:13 -07:00
Jeff Mitchell b416df9312 Add site-wide option to change the length at which URLs are auto-shortened 2009-06-30 16:46:33 -07:00
Zach Copley b10dba2798 Merge commit 'jeff-themovie/invite-enabled' into 0.8.x 
* commit 'jeff-themovie/invite-enabled':
  Adds $config['invite']['enabled'] to enable/disable invites.
 2009-06-30 16:10:12 -07:00
Evan Prodromou 871f598dcc debug flag for sessions 2009-06-27 08:11:09 -07:00
Evan Prodromou 71dad1ff62 use the session class to store sessions 2009-06-27 06:20:24 -07:00
Jeffery To 6328add622 Merge branch '0.8.x' into invite-enabled 2009-06-26 15:31:42 +08:00
Evan Prodromou 63f12c48a8 make stomp server work with username and password 2009-06-24 19:17:41 -07:00
Sarven Capadisli 2d3e990ed4 Using default theme design values (it was previously set to identica 
theme)
 2009-06-23 21:26:47 +00:00
Evan Prodromou 7bcaa858af make file command configurable 2009-06-23 05:35:20 -07:00
Evan Prodromou 205d8afe54 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-22 17:13:28 -07:00
Evan Prodromou 9171f16b73 add commandline.inc for parsing 2009-06-22 15:29:24 -07:00
Evan Prodromou 0461aafeef Merge branch '0.8.x' into cmdline 2009-06-22 14:51:17 -07:00
Zach Copley 09e24af683 Add upload location to attachments config section 2009-06-22 21:36:04 +00:00
Evan Prodromou 7cf0a4c647 theme dir, path configurable 2009-06-22 09:31:55 -07:00
Evan Prodromou 876ab05927 Add like for search 2009-06-21 21:50:35 -07:00
Evan Prodromou 02a4ca9e2e got rid of 'skin' concept a while ago 2009-06-21 21:38:16 -07:00
Evan Prodromou aec6456c91 Update copyright dates in files modified in 2009 2009-06-20 16:12:55 -07:00
Evan Prodromou 793a6a1155 change Controlez-Vous to Control Yourself 2009-06-20 16:00:04 -07:00
Evan Prodromou 198afa0a1d change scripts to take server and path from commandline 2009-06-20 14:58:47 -07:00
Evan Prodromou 597df6a234 better calculation of path 2009-06-18 16:19:26 -07:00
Zach Copley 164588ef0f Merge branch '0.8.x' into userdesign 2009-06-17 21:40:52 +00:00
Robin Millette b58dc5e961 Added config option to enable or disable file uploads with notices. 2009-06-17 16:55:01 -04:00
Robin Millette 28d02ec8cd Make oohembed endpoint configurable. 2009-06-17 16:44:33 -04:00
Zach Copley 76cbeff33c Update background image settings to use bitflags 2009-06-17 02:35:51 -07:00
Zach Copley d1ae3176b6 Enable tiling of background imgs for Designs 2009-06-16 22:18:25 -07:00
Zach Copley bc1f877f6e Design settings now save and displays backgrounds 2009-06-16 19:17:37 -07:00
Zach Copley 44343986c3 Merge branch '0.8.x' into userdesign 
* 0.8.x:
  a little better query handling in redirect code
  a little better query handling in redirect code
  forgot some functions aren't available at status time
  redirect on non-canonical server name
  don't show create-a-group link if not logged in
  allow a configured base for cache keys
  Missing call to getProfile() caused verify_credentials to fail.
  change mods for setup script
  Script to set up new status networks
  strncmp -> strcasecmp
  Return network from network setup function
  Configurable avatar directory
 2009-06-15 21:24:22 -07:00
Evan Prodromou fd290fc3f9 allow a configured base for cache keys 2009-06-15 16:09:40 -07:00
Zach Copley 92f095f589 Merge branch '0.8.x' into userdesign 
* 0.8.x: (32 commits)
  updates to Status_network
  makeadmin action
  make admins of groups
  show aliases when showing a group
  Link and distribute notices tagged for a group alias
  Code for adding and saving group aliases
  Styles for group block
  add correct li for css magic for block stuff
  typo in profileminilist class
  return count from show
  try to get the right class for profileminilist
  fix perms for classes/statusnet.ini
  fixup perms for classes
  Added Group_alias class
  add a table for group aliases
  Cross-browser notice_attach
  Allow users to be unblocked from a group
  Some UI improvements for blocking and unblocking
  The rest of the things necessary to make group block work
  Make group block work
  ...

Conflicts:
	db/laconica.sql
	lib/common.php
 2009-06-15 11:50:08 -07:00
Evan Prodromou c077ad0775 Configurable avatar directory 
Avatar directory and path are configurable.
 2009-06-15 10:45:50 -07:00
Evan Prodromou ecbd7718d5 Code for adding and saving group aliases 
Added code to add and save group aliases. Like tags, aliases are
free-texted in to the group admin page. configurable max number of
aliases, default is three.
 2009-06-14 23:37:24 -07:00
Zach Copley 946d016df2 Reworked output for design settings page 2009-06-14 02:03:50 -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
Sarven Capadisli 77c94c44a6 Removed hanging skin crapola 2009-06-14 05:57:59 +00:00
Robin Millette 27af3c67a2 Improve file upload and attachment interface. 2009-06-09 15:18:12 -04:00
Robin Millette 683b835c3e Attachments popups for supported files are now embedded with the object xhtml tag. 2009-06-01 14:02:59 -04:00
Robin Millette ebeb5f744c Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into upload 
Conflicts:

	js/util.js
	lib/attachmentlist.php
 2009-05-31 17:12:04 -04:00
Robin Millette 3e0c291810 Added configurable options for attachments: supported mimetypes and quotas for uploads. 2009-05-31 16:42:29 -04:00
Sarven Capadisli a456ceb47c Merge branch '0.7.x' into 0.8.x 2009-05-29 00:10:23 +00:00
Evan Prodromou d068680e19 optionally use SET NAMES for utf8 to DB 2009-05-27 14:57:45 -04:00
Evan Prodromou 76aa85fe5e Merge branch '0.8.x' into stats 
Conflicts:
	README
 2009-05-25 22:47:23 -04:00
Evan Prodromou 99f8501d32 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 
Conflicts:
	config.php.sample
 2009-05-11 17:53:23 -04:00
Zach Copley bc190595d1 Added TwitterStatusFetcher into daemon startup and shutdown subsystem 2009-05-07 02:07:31 -07:00
Sarven Capadisli d30df07908 Merge branch '0.7.x' into 0.8.x 
Resolved Conflicts:
	lib/queuehandler.php
	lib/util.php
	theme/base/css/display.css
 2009-05-01 00:16:25 +00:00
CiaranG ec5e06a542 Suppress errors when checking for the existence of files that might be restricted by open_basedir - should resolve issue #1310 2009-04-21 23:36:15 +01:00
Evan Prodromou d76bb2fd11 Revert "allow snapshots to be disabled easily" 
This reverts commit 0838143d58.

Already handled with the 'never' option.
 2009-04-16 13:05:35 -04:00
Evan Prodromou ca5753255f Merge branch '0.8.x' into stats 2009-04-16 12:58:07 -04:00
Evan Prodromou 546ab05dba update version string for dev version 2009-04-16 12:57:57 -04:00
Evan Prodromou 0838143d58 allow snapshots to be disabled easily 2009-04-16 12:53:17 -04:00
Evan Prodromou 415abdfdef config options for snapshots 2009-04-16 12:50:13 -04:00
Evan Prodromou c4040303ce initial snapshot stuff 2009-04-16 10:18:16 -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
Evan Prodromou 8f40a1a30c Update README and common for new version 
Update versions in README, add the new song title, and update the
version stamp in the common.php file.
 2009-04-07 23:02:55 -04:00
Evan Prodromou fe426a3152 welcome notice, default sub for new users 2009-03-28 17:36:39 -04:00
Evan Prodromou 07eae0ce4d Support SSL for some, all, or no pages 
Support SSL URLs either for all pages; no pages; or for sensitive
pages accepting passwords, like login, registration, API, and others.
 2009-03-26 15:03:59 -04:00
Evan Prodromou 0b436ec997 update version number to 0.7.2.1 2009-03-12 12:45:03 -04:00