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

3142 Commits

Author SHA1 Message Date
Brion Vibber
6c4ade4251 Merge branch 'testing' into 0.9.x 2010-03-09 11:27:53 -08:00
Brion Vibber
4caf0d2e73 Merge commit 'origin/master' into testing 2010-03-09 11:27:30 -08:00
Craig Andrews
689e2e112b make common_copy_args() work when the post/get request includes arrays (form elements with names ending in [] having multiple values) 2010-03-08 21:43:34 -05:00
Craig Andrews
51a245f18c Added Memcached plugin (using pecl/memcached versus pecl/memcache) 2010-03-08 17:17:37 -05:00
Brion Vibber
42463e160d Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-08 13:37:45 -08:00
Brion Vibber
217ad420ac Fix ticket #2208: regression in XMPP sending when server != host 
The upstream class sets $this->basejid with host unconditionally, which wasn't previously an issue as the fulljid would always be filled in by the server at connect time before sending messages. With the new queued messaging, we need to make sure we've filled out $this->fulljid correctly without making a connection.
Now using $server if provided to build $this->basejid and $this->fulljid in the queued XMPP proxy class, so queued messages are sent correctly.
 2010-03-08 12:19:06 -08:00
Brion Vibber
a77efb2447 XMPP cleanup: fix outgoing XMPP when queuing is disabled; fix notice for first access to undefined member variable 2010-03-08 10:32:40 -08:00
Evan Prodromou
5f7aa6f2e3 make API realm configurable 2010-03-08 12:36:03 -05:00
Dave Hall
dbe6b979d7 implement mail headers 2010-03-04 23:10:27 -05:00
Brion Vibber
2f41e93339 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-04 14:44:38 -08:00
Siebrand Mazeland
5dbcc184c9 Add Breton to language.php 2010-03-04 20:04:44 +01:00
Evan Prodromou
f7f7f167d6 update version number 2010-03-04 13:18:41 -05:00
Brion Vibber
f969d6349c Merge branch 'testing' into 0.9.x 
Conflicts:
	db/08to09.sql
 2010-03-04 10:16:59 -08:00
Sarven Capadisli
bc6a77f334 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-04 12:51:18 -05:00
Sarven Capadisli
74dbd37e9a Bringing aside back because it is needed for Design values. Will hide 
from CSS instead.
 2010-03-04 12:49:42 -05:00
Brion Vibber
0ddd1ef191 Ignore API 'since' silently as Twitter does instead of throwing a 403 error. Getting extra results is less disruptive than total failure. 
Threw in an X-StatusNet-Warning header on the off chance some API client developer notices it. :)
 2010-03-04 08:55:36 -08:00
Evan Prodromou
fd4eefe6b4 OStatus enabled by default 2010-03-04 11:43:31 -05:00
Brion Vibber
62d5f1addb Merge branch 'testing' 2010-03-04 07:00:45 -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
14d7f4a598 Removed unused stub class 2010-03-04 01:23:02 -08:00
Zach Copley
79b392a39e Add generator tag into Atom feeds. 2010-03-04 01:16:25 -08:00
Zach Copley
37b106d49c Fix variable name in NoConfigException 2010-03-04 00:00:46 -08:00
Zach Copley
8ffb34a90c Temp fix for problem getting actor from PuSH updates where actor is only specified in subject 2010-03-03 20:58:34 -08:00
Zach Copley
f210cadfec Revert "Revert "Show <activity:subject> and no activity actors for user feed"" 
This reverts commit e2578cfad6.
 2010-03-03 20:58:34 -08:00
Zach Copley
61de37ec7b Move snapshot configuration to its own admin panel 
Turn on with: $config['admin']['panels'][] = 'snapshot';
 2010-03-03 16:49:14 -08:00
Brion Vibber
9fadf8da11 Put all required field setup into AtomUserNoticeFeed and AtomGroupNoticeFeed, consolidating some code. (RSS feeds pulling title, logo etc from the Atom data structure so we don't dupe it.) 
OStatus now calling the feed classes directly instead of faking a call into the API, should be less flakey.
 2010-03-03 16:33:20 -08:00
Brion Vibber
4a2511139e Initial user role controls on profile pages, for owner to add/remove administrator and moderator options. 
Buttons need to be themed.
 2010-03-03 15:43:49 -08:00
Evan Prodromou
0f1c6e239a Merge branch 'testing' 2010-03-03 18:20:45 -05:00
Zach Copley
337b1aaaa1 Site-wide notice text admin panel 2010-03-03 14:37:30 -08:00
Sarven Capadisli
ef6bf8f331 Removed aside container from output for the admin panel sections 2010-03-03 15:42:34 -05:00
Zach Copley
c7d390e494 Add class="admin" to the content div of admin panels for styling 2010-03-03 12:18:20 -08:00
Brion Vibber
0881eba80e Language setting fixes: 
- switch 'en_US' to 'en', fixes the "admin panel switches to Arabic" bug
- tweak setting descriptions to clarify that most of the time we'll be using browser language
- add a backend switch to disable language detection (should this be exposed to ui?)
 2010-03-03 12:10:43 -08:00
Brion Vibber
13521cb510 Merge branch 'testing' of git@gitorious.org:statusnet/mainline 2010-03-03 11:42:02 -08:00
Brion Vibber
33af29b47c Fix for 4113f2884113f288: show regular subscribe form for all non-OMB profiles. We can't initiate remote sub for an OMB from our end, so dropping there. 2010-03-03 19:22:22 +00:00
Brion Vibber
3bb42d1170 Use poster's subscribed groups to disambiguate group linking when a remote group and a local group exist with the same name. (If you're a member of two groups with the same name though, there's not a defined winner.) 2010-03-03 19:00:02 +00:00
Zach Copley
a82cd89a97 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 
* 'testing' of gitorious.org:statusnet/mainline:
  Using position relative only for the remote subscription in section
  Added group subscription button to groups mini list
  Added event hooks at the start and end of groups mini list
 2010-03-03 10:28:45 -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
Sarven Capadisli
15574c59de Added event hooks at the start and end of groups mini list 2010-03-03 12:55:01 -05:00
Brion Vibber
7313cd9094 Merge branch 'testing' of git@gitorious.org:statusnet/mainline 
Conflicts:
	plugins/OStatus/OStatusPlugin.php
 2010-03-03 09:53:38 -08:00
Sarven Capadisli
06fb1124f5 Added event hooks for start and end of subscriptions mini list 2010-03-03 11:14:39 -05:00
Brion Vibber
79ffebb51b OStatus: save file records for enclosures 
Also stripping id from foreign HTML messages (could interfere with UI) and disabled failing attachment popup for a.attachment links that don't have a proper id, so you can click through instead of getting an error.

Issues:
* any other links aren't marked and saved
* inconsistent behavior between local and remote attachments (local displays in lightbox, remote doesn't)
* if the enclosure'd object isn't referenced in the content, you won't be offered a link to it in our UI
 2010-03-02 16:36:08 -08:00
Brion Vibber
7175e7c7a1 OStatus fix: look for <link>s in the current element's children, not in all its descendants. Was breaking notice URL transfer, pulling a profile link by mistake. 2010-03-02 15:38:52 -08:00
Craig Andrews
09705a1e98 stupid mistake... let's not talk about this. 2010-03-02 14:25:27 -08:00
Craig Andrews
c30f95c55c Updated some references to the long gnone "isEnclosure" function to the new "getEnclosure" 2010-03-02 14:25:06 -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
878818d2c0 Add translator documentation 
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
 2010-03-02 22:01:18 +01:00
Sarven Capadisli
e9c127ddd8 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-02 15:26:27 -05:00
Sarven Capadisli
4113f28851 Added Subscribe button to remote user entity actions in profie lists 2010-03-02 15:25:32 -05:00
Brion Vibber
72460091dd Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing 2010-03-02 12:21:48 -08:00
Brion Vibber
6b134ae4c7 Dropped deprecated timestamp-based 'since' parameter for all API methods. When it sneaks in it can cause some very slow queries due to mismatches with the indexing. 
Twitter removed 'since' support some time ago, and we've already removed it from the public timeline, so it shouldn't be missed.
 2010-03-02 11:54:02 -08:00