eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity
9,712 Commits 8 Branches 3 Tags 310 MiB
06a63b0404
Commit Graph

9712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brion Vibber
fee6b78e28 Merge branch 'testing' into 0.9.x 2010-04-19 18:47:56 +02:00
Brion Vibber
369885f04f Merge branch 'master' into testing 2010-04-19 18:47:11 +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
Craig Andrews
d7d3a50d87 Don't attempt to retrieve the current user from the DB while processing a DB error 2010-04-18 19:28:49 -04:00
Craig Andrews
9398c61ed3 Use PHP exceptions for PEAR error handling. 
Allows for the common try/catch construct, which makes error handling cleaner and easier.
 2010-04-18 19:28:41 -04:00
Craig Andrews
39392e03a7 Merge branch '0.9.x' into 1.0.x 
Conflicts:
	actions/confirmaddress.php
	actions/imsettings.php
 2010-04-18 19:21:15 -04:00
Siebrand Mazeland
83edc126c0 Localisation updates for !StatusNet from !translatewiki.net !sntrans 
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
 2010-04-18 22:07:51 +02:00
Craig Andrews
23bad16bba don't attempt to read a user's ldap password 2010-04-17 15:09:56 -04:00
Craig Andrews
ffd688b8ef json_encode strings put out as javascript 2010-04-17 14:36:11 -04:00
Brion Vibber
617a994550 Merge branch 'testing' into 0.9.x 2010-04-15 23:12:25 +02:00
Brion Vibber
53650c7a5e Merge branch 'master' into testing 2010-04-15 23:07:58 +02:00
Christopher Vollick
4f0672a94c Allow setconfig.php to Print Entire Config 
Previously it only printed out the configuration in the DB.

Now it can also print out the entire current configuration.
 2010-04-15 23:02:29 +02:00
Craig Andrews
1081b06bbe Allow cross-site ajax with CORS. 
Only allows un-credentialed (as in, no cookies or basic auth), no custom headers, and get (no post, put, delete, etc) requests.
 2010-04-15 12:52:59 -04:00
Brion Vibber
c748933132 Merge branch 'testing' into 0.9.x 2010-04-14 15:59:12 +02:00
Brion Vibber
c95bff7744 Merge branch 'master' into testing 2010-04-14 15:58:42 +02:00
Brion Vibber
efcdfabc12 Ticket #2205: pass geo locations over Twitter bridge (will only be used if enabled on the Twitter side) 2010-04-14 15:45:00 +02:00
Brion Vibber
f789928942 Merge branch 'testing' into 0.9.x 2010-04-14 11:15:48 +02:00
Brion Vibber
3da50c19df Merge branch 'master' into testing 2010-04-14 11:15:21 +02:00
Brion Vibber
a21a172639 Fix for "#foo !foo" in same notice failing during save, causing failout before distribution. Move saveGroups after saveTags when saving notices; groups may save additional tags, so need to be moved after so the check for duplicates actually works. 2010-04-14 11:11:02 +02:00
Brion Vibber
d445b977fc move comment to correct place 2010-04-14 11:09:54 +02:00
Siebrand Mazeland
89f28c7a0f Localisation updates for !StatusNet from !translatewiki.net !sntrans 
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
 2010-04-12 23:54:09 +02:00
Brion Vibber
9463287710 showplugins.php: dump list of activated plugins and their settings on this site 2010-04-12 11:50:42 -07:00
Brion Vibber
a05e674843 showplugins.php: dump list of activated plugins and their settings on this site 2010-04-12 11:49:59 -07:00
Siebrand Mazeland
2bb02e8698 Adding Dutch translation for OpenID plugin. 2010-04-12 00:57:02 +02:00
Siebrand Mazeland
c59e90b20b Number parameters 2010-04-11 23:57:18 +02:00
Siebrand Mazeland
d7033c8906 Localisation updates for !StatusNet from !translatewiki.net !sntrans 
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
 2010-04-11 23:47:04 +02:00
Siebrand Mazeland
8795b3546d Add translator documentation and number parameters if multiple are used in a message. 2010-04-11 23:39:24 +02:00
Siebrand Mazeland
7ace3156ca Add translator documentation. 
Fixed a few inconsistencies in the process. Confused about the e-mail related messages in the code.
 2010-04-11 23:24:38 +02:00
Siebrand Mazeland
97ee2c2f12 Fix a typo and small error in translator documentation 2010-04-11 23:22:36 +02:00
Siebrand Mazeland
76d3fdacae Add translator documentation. 
Fixed a few inconsistencies in the process. Apparently this code has been copied to imsettings.php, and some cases of 'email' had not been changed to 'IM'. Added FIXME for using globals/macros (?) in messages like "%%site.name%%". For easier/more consistent translation, this should preferably be plain %s parameters.
 2010-04-11 22:37:03 +02:00
Siebrand Mazeland
ec0fee0f2a Add translator documentation and FIXMEs that plural support should be added for some messages. 2010-04-11 22:15:41 +02:00
Siebrand Mazeland
69eebc1ec8 Add translator documentation for uses of 'Yes' and 'No' in the interface. 2010-04-11 21:04:07 +02:00
Siebrand Mazeland
03a5e96a61 Localisation updates for !StatusNet from !translatewiki.net !sntrans 
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
 2010-04-11 20:40:25 +02:00
Brion Vibber
7fada4ddcc Fix syntax errors that snuck in while documenting translations 2010-04-10 19:38:58 -07:00
Brion Vibber
1eeb23e1e3 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 
Conflicts:
	actions/confirmaddress.php
 2010-04-10 17:56:11 -07:00
Brion Vibber
edd883d3b0 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-04-10 17:54:37 -07:00
Brion Vibber
71c828de89 Allow blocking someone who's not currently subscribed to you (prevents seeing @-replies from them, or them subbing to you in future) 2010-04-10 17:52:40 -07:00
Siebrand Mazeland
af06c554a0 * DB -> Database in message 
* some translator documentation added
 2010-04-11 01:08:51 +02:00
Siebrand Mazeland
19b86da426 Lower case "Web" 2010-04-11 01:03:06 +02:00
Siebrand Mazeland
9b788471d4 Add translator documentation. 2010-04-10 22:50:15 +02:00
Siebrand Mazeland
204cf0b96b Add translator documentation 
* approved message had not been i18n-ed
* also had to i18n 'read-only' and 'read-write'
 2010-04-10 22:49:33 +02:00
Siebrand Mazeland
1661be6851 i18n for low level logging is not needed. 2010-04-10 21:59:17 +02:00
Siebrand Mazeland
b45f08557e Localisation updates for !StatusNet from !translatewiki.net !sntrans 
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
 2010-04-10 21:19:45 +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
Evan Prodromou
5d96cf2eec catch UserNoProfileException and continue 2010-04-10 11:36:23 -04:00
Siebrand Mazeland
86a3016a6f Document messages for which clarification was requested. 
Because N/S/E/W were on the same lines, and the "// TRANS:" comment must be directly above the line in which the message is located to work, I added the messages to a variable first.
 2010-04-10 01:49:25 +02:00
Siebrand Mazeland
518832da28 Document messages for which clarification was requested. 2010-04-10 01:48:16 +02:00
Siebrand Mazeland
c15549ff5a Fix double space in message 2010-04-10 01:47:27 +02:00
Siebrand Mazeland
47c1aad5d6 Localisation updates for !StatusNet from !translatewiki.net !sntrans 
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
 2010-04-10 01:20:25 +02:00
Siebrand Mazeland
166c1edba9 Fix inconsistencies in clientError() messages 
* use correct punctuation
* single quotes when replace was possible
* wording updated when needed
 2010-04-09 16:11:20 -07:00