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

2953 Commits

Author SHA1 Message Date
Siebrand Mazeland
396a0c08b3 Localisation updates from http://translatewiki.net. 2011-04-09 20:53:29 +02:00
Shashi Gowda
f47027abbe Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 
Conflicts:
	lib/profileblock.php
	theme/default/css/display.css
 2011-04-09 21:57:45 +05:30
Shashi Gowda
a0ac51c22f use notifyDeferred for tag/untag so that it gets queued offline 2011-04-09 17:18:33 +05:30
Zach Copley
e3789488c6 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 
* '1.0.x' of gitorious.org:statusnet/mainline:
  use conversationnoticestream in conversationrepliesaction
  use conversationnoticestream in conversationaction
  make ConversationNoticeStream accept a profile parameter
  enable user directory and extended profile by default
  Remove incompatible theme victorian
  Remove incompatible theme shiny
  Remove incompatible theme pigeonthoughts
  Remove incompatible theme mnml
  Remove incompatible theme identica
  Remove incompatible theme h4ck3r
  Remove incompatible theme default
  Remove incompatible theme cloudy
  Remove incompatible theme cleaner
  Remove incompatible theme clean
  Remove incompatible theme biz
  correctly return for deleted items
  show event as deleted
  Use pkeyGet() instead of idStream() for fave caching
  store oft-requested stuff in the data object
 2011-04-08 15:47:18 -07:00
Zach Copley
3022d711e3 Add some more events to aside profile blocks and rework a bit 2011-04-08 15:45:49 -07:00
Evan Prodromou
8cb0d7e708 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-04-08 17:09:15 -04:00
Zach Copley
8335d234f7 Don't try to show search and tag subs unless a user is logged in 2011-04-08 13:56:08 -07:00
Evan Prodromou
bfc33f3999 Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-04-08 16:14:09 -04:00
Siebrand Mazeland
ea82086297 Update translator documentation. 
Whitespace updates.
Header updates.
Break long lines in README.
Indentation updates.
 2011-04-08 18:47:07 +02:00
Siebrand Mazeland
b77531897a Fixed incorrect single quotes with newlines from Commit:3e8bf13aab25050cce09a3180ea7b56c41ed40e3. 2011-04-08 18:47:04 +02:00
Evan Prodromou
997babfea3 correctly return for deleted items 2011-04-08 12:15:32 -04:00
Evan Prodromou
50c4731d20 show event as deleted 2011-04-08 12:14:05 -04:00
Shashi Gowda
4d61760154 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 2011-04-08 17:16:20 +05:30
Siebrand Mazeland
3e8bf13aab Update translator documentation. 
L10n/i18n updates.
 2011-04-08 10:59:10 +02:00
Siebrand Mazeland
a9eaaf6341 Update translator documentation. 
Whitespace updates.
L10n/i18n updates.
 2011-04-08 01:22:04 +02:00
Siebrand Mazeland
2640232c68 Update translator documentation. 
L10n and i18n updates.
Break long lines in README before or at 80 characters.
Superfluous whitespace removed.
 2011-04-08 01:22:02 +02:00
Siebrand Mazeland
a5aade0a3b Update maintainer e-mail address. 
Update translator documentation.
 2011-04-08 01:21:58 +02:00
Evan Prodromou
45ba33e2ac use InboxNoticeStream in AllmapAction in Mapstraction 2011-04-07 15:41:34 -04:00
Shashi Gowda
ad86eb78d3 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 
Conflicts:
	js/util.min.js
	lib/default.php
 2011-04-07 23:13:45 +05:30
Siebrand Mazeland
6806a42e2c Update translator documentation. 2011-04-07 10:06:46 +02:00
Evan Prodromou
a1fa47d904 Cache RSVP counts for Event plugin 2011-04-07 00:01:51 -04:00
Evan Prodromou
524b98bfa3 remove debugging statement from Happening 2011-04-06 23:48:10 -04:00
Evan Prodromou
bf39c95795 Bookmarks more robust to missing profiles 2011-04-06 23:47:05 -04:00
Evan Prodromou
d9ca956ecf SQLStatsPlugin to get some profiling data on SQL queries 2011-04-06 22:46:28 -04:00
Siebrand Mazeland
512bd91dee Translator documentation added. 
Whitespace updates.
 2011-04-06 23:43:52 +02:00
Siebrand Mazeland
caa6690f4c Update translator documentation. 
Whitespace updates.
Break lines in README at or before 80 characters.
L10n updates.
 2011-04-06 23:43:50 +02:00
Zach Copley
b541443370 QnA - Fix typo 2011-04-06 11:15:32 -07:00
Siebrand Mazeland
553a0c8b9b i18n/L10n updates/fixes. 
Translator documentation added/updated.
Whitespace updates.
 2011-04-06 16:36:35 +02:00
Siebrand Mazeland
5b660bd3c6 Update translator documentation. 
i18n/L10n fixes.
Superfluous whitespace removed.
 2011-04-06 15:36:03 +02:00
Siebrand Mazeland
1a91f85438 Tabs to spaces. 2011-04-06 15:12:56 +02:00
Siebrand Mazeland
cc78aca0d2 L10n and whitespace updates. 2011-04-06 15:08:39 +02:00
Siebrand Mazeland
e25cb9b570 Shorten plugin description. 2011-04-06 15:07:23 +02:00
Siebrand Mazeland
5f591e05ae Update translator documentation. 
i18n/L10n fixes.
Superfluous whitespace removed.
onPluginVersion() added where missing.
 2011-04-06 14:57:48 +02:00
Siebrand Mazeland
cca159883a Update translator documentation. 
i18n/L10n issues fixed.
Superfluous whitespace removed.
 2011-04-06 02:11:09 +02:00
Evan Prodromou
cffbda8183 add search submenu to default local nav 2011-04-05 18:45:37 -04:00
Evan Prodromou
11bbc5adcd a little more protection against empty tags 2011-04-05 18:36:49 -04:00
Evan Prodromou
f2a9c9c26d check for 0-tag menu 2011-04-05 18:29:09 -04:00
Evan Prodromou
a5de3a076b cut-and-paste error in TagSubMenu 2011-04-05 18:19:26 -04:00
Evan Prodromou
a6620dbaf4 Added tagsub to the left-hand menu 2011-04-05 18:14:48 -04:00
Evan Prodromou
03ad3f69cc Merge branch '1.0.x' into testing 2011-04-05 13:47:49 -04:00
Evan Prodromou
d09995561d Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-04-05 13:47:07 -04:00
Evan Prodromou
d3b9aabac3 Questions show private lock correctly 2011-04-05 13:46:44 -04:00
Evan Prodromou
4397686c91 include limited-scope class on bookmarks in output 2011-04-05 13:44:27 -04:00
Evan Prodromou
c9ca11eb64 include limited-scope class on bookmarks in output 2011-04-05 13:43:54 -04:00
Zach Copley
8ef341d589 QnA - best answers were not getting the 'best' class on their lis (fixed) 2011-04-05 10:29:10 -07:00
Evan Prodromou
36b331d469 Merge branch '1.0.x' into testing 
Conflicts:
	plugins/Event/RSVP.php
 2011-04-05 13:16:28 -04:00
Zach Copley
6954cb3508 QnA - Add ToSelector to new question 2011-04-05 09:12:54 -07:00
Evan Prodromou
9018a118fa add toselector to poll 2011-04-05 11:18:35 -04:00
Evan Prodromou
c0f63c9a69 add toselector to bookmark 2011-04-05 11:18:25 -04:00
Evan Prodromou
fff66e1ebb move toselector out of <ul> in eventform 2011-04-05 11:18:10 -04:00
Zach Copley
5267f3d649 QnA - Better ajax response when making a new answer. Still not right. Needs to use threading. 2011-04-05 00:27:51 -07:00
Zach Copley
6c0bb0f35b QnA 
* Some bug fixes
* Better Question page
 2011-04-04 23:58:35 -07:00
Zach Copley
cd7ab56874 QnA 
* show number of answers on question notices
* change label on answer submit button to "Answer"
 2011-04-04 22:05:43 -07:00
Shashi Gowda
ced00cf0bd Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 2011-04-05 10:28:05 +05:30
Zach Copley
984869e5fb Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 
* '1.0.x' of gitorious.org:statusnet/mainline:
  fix scope for replies to group-private notices
  Direct events to users or groups
 2011-04-04 21:37:22 -07:00
Zach Copley
338a75e12b QnA - JavaScript to hide close and best buttons when clicked 2011-04-04 21:36:42 -07:00
Evan Prodromou
a9856e6550 Direct events to users or groups 2011-04-04 22:16:38 -04:00
Zach Copley
84b328450f QnA - Whoops - this actually removes the unused function mentioned in the last commit 2011-04-04 18:06:29 -07:00
Zach Copley
559a688e42 QnA - Add in stub js 2011-04-04 17:31:38 -07:00
Zach Copley
92156317b6 QnA - truncate long question titles in notice content 2011-04-04 17:04:13 -07:00
Zach Copley
53c653038d QnA - Don't output question-description if it's empty; Do output question-closed msg if question is closed 2011-04-04 15:28:28 -07:00
Zach Copley
9a371658bd QnA - Rework output for notice stream 2011-04-04 15:08:47 -07:00
Zach Copley
5193afb8bf QnA - Allow closing questions 2011-04-04 14:33:20 -07:00
Zach Copley
e6fd3fa038 QnA: Unify answer forms 2011-04-04 12:02:33 -07:00
Zach Copley
c4b9dc7a0f Merge branch 'qna' into 1.0.x 
* qna:
  QnA - Allow answer revisions and marking a question as "best"
  QnA - add best class to best answers
  QnA - Better display of questions and answers in streams
  QnA - save answer revisions and show # of revisions
 2011-04-04 01:30:15 -07:00
Zach Copley
528d999ae7 QnA - Allow answer revisions and marking a question as "best" 2011-04-04 01:28:37 -07:00
Shashi Gowda
57198a7464 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 
Conflicts:
	actions/tagother.php
	lib/subscriberspeopleselftagcloudsection.php
	lib/subscriptionspeopleselftagcloudsection.php
 2011-04-04 13:26:27 +05:30
Zach Copley
960aebdbc4 QnA - add best class to best answers 2011-04-03 17:25:44 -07:00
Zach Copley
bac112c244 QnA - Better display of questions and answers in streams 2011-04-03 16:57:59 -07:00
Siebrand Mazeland
e552993307 Fix incorrect substitution syntax. 2011-04-04 01:36:47 +02:00
Siebrand Mazeland
c50b06dd7e Localisation updates from http://translatewiki.net. 2011-04-04 01:27:23 +02:00
Siebrand Mazeland
2dbdb0f185 Translator documentation updated/added. 
i18n tweaks.
Superfluous whitespace removed.

YAY! All StatusNet core messages in the 1.0.x branch have been documented at this point in time!!!
 2011-04-04 00:41:48 +02:00
Siebrand Mazeland
09523a19d7 Localisation updates from http://translatewiki.net. 2011-04-03 15:35:52 +02:00
Siebrand Mazeland
527151c5ef L10n/i18n tweaks. 2011-04-03 15:06:52 +02:00
Zach Copley
8e086d5a90 QnA - save answer revisions and show # of revisions 2011-04-02 00:00:27 -07:00
Siebrand Mazeland
d2a2575648 Localisation updates from http://translatewiki.net. 2011-04-01 22:59:31 +02:00
Siebrand Mazeland
bf75ae8f9b L10n tweaks. 2011-04-01 22:35:23 +02:00
Siebrand Mazeland
ade7172a25 L10n/i18n updates. 2011-04-01 22:32:56 +02:00
Siebrand Mazeland
6c9554ddb2 L10n updates. 2011-04-01 22:27:35 +02:00
Siebrand Mazeland
5a34d26b98 i18n/L10n updates. 2011-04-01 22:20:25 +02:00
Siebrand Mazeland
8bf3424532 Fix incorrect translator documentation. 2011-04-01 22:14:43 +02:00
Siebrand Mazeland
308a761e5b Fix typo in message. 2011-04-01 22:12:39 +02:00
Siebrand Mazeland
6e67eb3b81 Many i18n and L10n updates. 2011-04-01 22:08:38 +02:00
Siebrand Mazeland
969d80f270 Fix i18n issues and bugs in string replacement. 2011-04-01 21:56:55 +02:00
Siebrand Mazeland
62eed1e23e Fix i18n issues. 
Fix incorrect variable usage in messages.
 2011-04-01 19:55:15 +02:00
Zach Copley
1e73ba00bd Merge branch 'qna' into 1.0.x 
* qna:
  Some work towards allowing revisions
  Make new answers work
  More plumbing
  Work on QnA notice display -- in progress
  * Move stuff around again * Make answers save
  * Fix plugin filename * Make questions save!
  Renamed QuestionAndAnswerPlugin to QnAPlugin
  Most objects and forms are in place, now I just have to make it work.
  Skeleton / Stub for Question and Answers micro-app plugin
 2011-04-01 02:37:32 -07:00
Zach Copley
9cea85065c Some work towards allowing revisions 2011-04-01 02:35:05 -07:00
Siebrand Mazeland
4ac471f380 Localisation updates from http://translatewiki.net. 2011-03-31 23:30:07 +02:00
Zach Copley
eeff6285ae Make new answers work 2011-03-31 09:58:26 -07:00
Brion Vibber
24945715d0 Provisional fix for ticket #3108: Facebook bridge sends "likes" as the notice's original poster instead of as the person doing the liking. 
Adds optional $profile parameter for Facebookclient constructor and uses that for the foreign_link lookup if provided instead of the notice's poster.
 2011-03-30 17:02:40 -07:00
Siebrand Mazeland
14456cbbb2 Fix gettext domain for messages in plugins "_()" to "_m()". 
Some other i18n and L10n updates, too.

i18n/L10n review not complete.
 2011-03-30 22:31:23 +02:00
Brion Vibber
0ac0925309 Fix timestamps in fallback content for EventPlugin 
A bunch of the common_* functions for date formatting expect an interpretable string, rather than a Unix timestamp, as input. Switched to using the DB-formatted timestamps as we put them into the object rather than the unix timestamp intermediate value when formatting the plaintext and HTML fallback content.
 2011-03-30 12:50:56 -07:00
Brion Vibber
d2cd5b3353 Tweak which should fix ActivityStreams output for Twitter profiles (if remote_profile entries didn't match, we ended up losing id/URI). 
Explicitly uses the Twitter profile URL as profile URI if matching, without having to check the db.
 2011-03-30 11:22:32 -07:00
Zach Copley
7669bed9f3 More plumbing 2011-03-30 10:33:15 -07:00
Shashi Gowda
5a2bab07b2 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 
Conflicts:
	actions/tagother.php
	classes/Profile.php
	classes/Profile_tag.php
	js/util.min.js
 2011-03-30 15:47:42 +05:30
Brion Vibber
1c63ae29fe typo fix in format string 2011-03-29 17:00:00 -07:00
Brion Vibber
20ca5027cc Consolidate common code in micro-apps custom notice type display actions. 
The ShowNoticeAction subclasses were cut-n-pasting a lot of prepare() code from ShowNoticeAction, though the only part that's different is how we look up the notice. Broke that out to a getNotice() method, so only that needs to be copied. Avoids extra copies of permission checks and other common code in this spot.
 2011-03-29 16:58:15 -07:00
Brion Vibber
23436ad83d Fix for bookmark posting: missing object was causing error output to crush ajax 2011-03-29 16:50:06 -07:00
Siebrand Mazeland
0a19674c9f @evan Fixed message domain for messages in plugins for recent commits. 
Numbered parameters when more than one used in a message.
L10n updates for consistency.
i18n for non-translatable exception.
Updated translator documentation.
Removed superfluous whitespace.
 2011-03-30 00:48:41 +02:00
Evan Prodromou
908551ae3d disallow access to out-of-scope poll 2011-03-28 22:50:52 -04:00