wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,039 Commits 8 Branches 0 Tags 330 MiB
a053871ddc
Commit Graph

11039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarven Capadisli
4484c63ff4 Fix for XHR more text behaviour on conversation pages 2010-03-26 14:57:33 +01:00
Sarven Capadisli
94f904bf66 Fix for XHR more text behaviour on conversation pages 2010-03-26 14:56:15 +01:00
Evan Prodromou
e3a46d2b83 Merge branch '0.9.x' into 1.0.x 2010-03-26 09:18:07 -04:00
Evan Prodromou
36a8e8e8a3 Merge branch 'testing' into 0.9.x 2010-03-26 09:17:47 -04:00
Evan Prodromou
75b2bf2a4e Do ostatus queue first 
We do the OStatus queue first, so if we're sending a notice to the
same server twice (e.g., with OMB), our richer and more featureful
notice comes in first.
 2010-03-26 08:45:23 -04:00
Brion Vibber
e91bf2b8a9 Tweak to OStatus long message cropping: use original source notice URL for the link in the text version, don't shorten the link for the HTML so we can append params to it in JS. 
Conflicts:

	plugins/OStatus/classes/Ostatus_profile.php
 2010-03-25 16:08:09 -07:00
Brion Vibber
013647f0ba Add doc comments on saveHTMLFile; drop the extra <div> wrapping the contents to make it easier to extract without getting extra markup. 2010-03-25 23:11:06 +01:00
Brion Vibber
511a164c99 Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-03-25 14:32:28 -07:00
Brion Vibber
e174a7211d Restore lost addition of inline HTML attachment display. 2010-03-25 14:31:22 -07:00
Evan Prodromou
46655eb3ca version number and codename 2010-03-25 17:25:26 -04:00
Evan Prodromou
cbf321eeb3 Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-03-25 17:24:10 -04:00
Sarven Capadisli
c066e5285c If indenting is disabled on the output, this fixes the entity_tags crop 2010-03-25 22:20:59 +01:00
Sarven Capadisli
353659764b Fix for processing indicator for aside 2010-03-25 22:20:50 +01:00
Sarven Capadisli
ec84c6acee Updated biz theme to use realtime icons from core 2010-03-25 22:20:43 +01:00
Sarven Capadisli
2bd75d0f5b A lot of updates to keep the themes current (at least in functionality) 2010-03-25 22:20:36 +01:00
Sarven Capadisli
aeab594d32 location -> label class for cloudy 2010-03-25 22:20:27 +01:00
Sarven Capadisli
b4a4438abd Using unique @for, @id pair for jabber and sms options in subscriptions 2010-03-25 22:20:20 +01:00
Sarven Capadisli
5e79ef58e4 Using hCard label instead of location. Matches userprofile. 2010-03-25 22:20:14 +01:00
Sarven Capadisli
2b3a2e6b6d Updated tag list output in subscriptions list. Matches userprofile. 2010-03-25 22:20:06 +01:00
Sarven Capadisli
711079a3cb Removed print stylesheet 2010-03-25 22:19:58 +01:00
Sarven Capadisli
41c8048efd Moved print inside base stylesheet using media rules. One less HTTP GET. 2010-03-25 22:19:50 +01:00
Sarven Capadisli
3ee6ac4edf Minor core alignment for cloudy 2010-03-25 22:19:42 +01:00
Sarven Capadisli
0bc8dda209 Updated logos 2010-03-25 22:19:29 +01:00
Sarven Capadisli
f9cfc0ee60 Removed box-shadow and outline on notice more link focus 2010-03-25 22:19:20 +01:00
Sarven Capadisli
e01bc7a339 Using opacity on the notice more link icon 2010-03-25 22:19:09 +01:00
Sarven Capadisli
a5dfaf23c2 Minor margin to more link 2010-03-25 22:19:02 +01:00
Sarven Capadisli
a2ceab2431 Updated biz theme logo 2010-03-25 22:18:53 +01:00
Sarven Capadisli
72cf8e712d Added processing indicator for more anchor 2010-03-25 22:18:43 +01:00
Sarven Capadisli
f137946607 Using an icon to represent the action for more text 2010-03-25 22:18:29 +01:00
Sarven Capadisli
8336e24179 Using &#8230; (hellip) instead of "more" for link text 2010-03-25 22:18:21 +01:00
Brion Vibber
c11064a539 Updated 'more' anchor for attachments to do an XHR GET 
Conflicts:

	lib/attachmentlist.php
	plugins/OStatus/classes/Ostatus_profile.php

Merge tried to delete things that it seems it shouldn't, very confusing order. Hope rest of the cherry-picking isn't a problem.
 2010-03-25 14:15:54 -07:00
Evan Prodromou
9c63ae6e44 add whitelist and blacklist for openid URLs 2010-03-25 16:58:05 -04:00
Sarven Capadisli
7fc8b6af4a Removed unnecessary form_id. Using jQuery .find() instead of 
constructing the selector.
 2010-03-25 21:48:49 +01:00
Sarven Capadisli
f4339ddb7d Added extra condition to focusing on notice form on page load. If the 
window location contains a fragument identifier, it will skip focus
and do what the UA does natively.
 2010-03-25 21:46:49 +01:00
Sarven Capadisli
56deca63d0 Removed dangling stylesheet 2010-03-25 21:46:35 +01:00
Evan Prodromou
5b23b7e736 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-25 16:35:35 -04:00
Evan Prodromou
7f6fdb528c remove debugging calls 2010-03-25 16:35:22 -04:00
Sarven Capadisli
3c5586d4bd Using rel=external instead of class=external for jOverlay title link 2010-03-25 21:33:38 +01:00
Sarven Capadisli
53bed00f90 Added rel=external to geo location link 2010-03-25 21:33:26 +01:00
Sarven Capadisli
9ea48298d5 Updated plugin to open external links on a new window that are not 
attachments
 2010-03-25 21:33:07 +01:00
Sarven Capadisli
321093886f Assigned an identifier for the representative user and group profile 2010-03-25 21:32:28 +01:00
Brion Vibber
040b4b74ef Merge commit 'origin'; branch '0.9.x' into 1.0.x 2010-03-25 13:05:02 -07:00
Brion Vibber
29a25848de Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-25 13:04:09 -07:00
Brion Vibber
cd9017408e And clarify a little more 2010-03-25 12:48:31 -07:00
Brion Vibber
38fac1d463 Clarify RewriteBase comment in htaccess.sample 2010-03-25 12:21:02 -07:00
Brion Vibber
800b335906 Merge commit 'origin/master' into testing 
Conflicts:
	classes/Notice.php
 2010-03-25 11:43:26 -07:00
Evan Prodromou
697222575d Merge branch 'blacklisttable' into testing 2010-03-25 13:51:52 -04:00
Evan Prodromou
920acf8d96 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-25 13:50:49 -04:00
Evan Prodromou
6e644f77a4 Store blacklist patterns in their own tables 
We were bumping into limits on the config format in the Blacklist
plugin. So, added new tables for nickname and homepage blacklists, and
changed the plugin to use those instead of config file (actually,
still uses config file in addition, for compatibility).
 2010-03-25 13:49:12 -04:00
Sarven Capadisli
7f1b852c97 If indenting is disabled on the output, this fixes the entity_tags crop 2010-03-25 17:47:04 +01:00