habeascodice
737a3362d5
Merge remote branch 'upstream/master'
2014-10-07 22:35:02 -07:00
habeascodice
f84453497b
x
2014-10-07 22:34:30 -07:00
friendica
ee6c53c2e5
add imagick version check when guessing mimetype. It probably isn't important here, but let's make sure we have the right driver installed if we do something else with photos afterward.
2014-10-07 21:16:30 -07:00
friendica
b595f9d3ee
log the recursive reshare from hell at logger_debug until we get through this mess.
2014-10-07 20:42:57 -07:00
habeascodice
c01a983957
Merge remote branch 'upstream/master'
2014-10-07 16:13:22 -07:00
friendica
14d538c793
check the imagick version before using it.
2014-10-07 15:14:06 -07:00
nostupidzone
60a89670f6
add ability to skip broken imagemagick on shared hosting
2014-10-07 09:54:27 -07:00
marijus
21eae4df9c
porting more widgets to bs nav-pills
2014-10-07 18:11:36 +02:00
friendica
c6e86ae0d9
Merge https://github.com/friendica/red into pending_merge
2014-10-06 21:38:15 -07:00
friendica
ac77076135
Make a best guess at how to pull the attribution from the recursive reshare from hell.
2014-10-06 21:37:02 -07:00
RedMatrix
ae915df0a5
Merge pull request #620 from dawnbreak/RedDAV
...
Moved RedBrowser class from reddav.php to it's own file.
2014-10-07 15:17:19 +11:00
friendica
bbf88cf639
found one bug trying to fetch the recursive reshare from hell. I still think there's a problem with attribution but we'll have to wait and find that once we have some content to track. Also in private messages, on the message list page, change the text from delete message to delete conversation, because that's what we're really doing.
2014-10-06 20:54:52 -07:00
friendica
03585b8f88
SQL error - private message conversation lookup
2014-10-06 19:37:51 -07:00
friendica
03bbbdaf10
shareable design elements
2014-10-06 17:47:17 -07:00
Klaus Weidenbach
33394f58ff
Moved RedBrowser class from reddav.php to it's own file.
...
First step on cleaning up ReadDAV classes and restructuring it bit in
preparation for adding some more DAV features, photo access, CalDAV, etc.
and hopefully also some PHPunits.
Add a PHP5.3 namespace for RedDAV classes. Any objections against this or
the vendor namespace?
Add some more documentation for RedBrowser.
2014-10-06 23:38:33 +02:00
habeascodice
6b40c2cd09
Merge remote branch 'upstream/master'
2014-10-06 08:43:29 -07:00
friendica
34ef3fda76
attempt to deal with the diaspora recursive reshare from hell (Bob reshared Nancy's reshare of George's reshare of Lilly's reshare of Nathan's post). The attribution may be wrong so this is still a work in progress.
2014-10-05 22:17:51 -07:00
friendica
2cadc5a840
send dislike activities to diaspora as comments, also send likes and dislikes of comments as additional comments. We won't go into why this is necessary for a service that claims to support activitystreams.
2014-10-05 17:27:52 -07:00
friendica
bf6c72fc0e
Merge https://github.com/friendica/red into pending_merge
2014-10-05 15:42:25 -07:00
friendica
d4a6a6b4f5
diaspora share not rendering issue - still have one remaining (the recursive share from hell)
2014-10-05 15:41:03 -07:00
RedMatrix
7bad7e505a
Merge pull request #616 from dawnbreak/docu
...
Documentation and some restructure in RedBasicAuth
2014-10-06 09:02:21 +11:00
Jeroen
a17eae941b
image/jpeg > image/png
2014-10-05 21:38:47 +00:00
Jeroen
ae9b0c0e1b
Changed default avatars to PNG as agreed with Mike here: https://redmatrix.nl/channel/jeroenpraat/?f=&mid=83603d8f0876c040efafce87755fcd252dbe8da4a75d82fdb230519e3c8dcb72@redmatrix.nl . Added a few new. You can set it like this: util/config system default_profile_photo red_avatar
2014-10-05 18:32:28 +00:00
Klaus Weidenbach
305498eb16
Some documentation for include/reddav.php and a bit code cleanup.
...
Removed some duplicate code in RedBasicAuth and restructured a bit.
Still work in progress.
2014-10-05 15:24:16 +02:00
Klaus Weidenbach
0875448ab9
Some documentation of include/auth.php.
2014-10-05 14:51:58 +02:00
friendica
9135ad30d8
network page default option
2014-10-04 23:53:05 -07:00
Thomas Willingham
557894bc01
That's a string, not an integer
2014-10-03 15:16:05 +01:00
Thomas Willingham
09e0b4e2a1
Set timezone when creating a channel.
2014-10-03 00:57:07 +01:00
RedMatrix
a932c20dc4
Merge pull request #610 from tuscanhobbit/dev
...
site language wasn't included in siteinfo/json
2014-10-02 23:05:59 +10:00
Paolo Tacconi
15c1529e83
query for statistics are now executed by poller
2014-10-02 13:43:48 +02:00
friendica
16b94f1dc0
issues with diaspora comment signatures on relayed comments that are relayed through a redmatrix site (parent post is redmatrix) and involve a private post.
2014-10-02 02:43:07 -07:00
friendica
baa0b0f393
only auto-follow the site recommendations if creating the first channel for an account.
2014-10-01 15:40:19 -07:00
friendica
467c6c72f0
ability to pre-populate connections for new channels. e.g. "MySpace Tom"
2014-10-01 14:48:08 -07:00
friendica
f19d718631
that's why remove_obsolete_hublocs() isn't telling anybody when it does its thing, I forgot to uncomment the bit that tells everybody after I tested it. I needed extensive testing to make sure we didn't accidentally wipe out all hublocs everywhere. Testing went fine so I just assumed it was all working as planned; but went back today to find out why I wasn't told of a recent change.
2014-09-30 23:41:50 -07:00
friendica
79f1d48e19
Merge https://github.com/friendica/red into pending_merge
2014-09-30 21:31:31 -07:00
friendica
cb44d015f3
allow site specific templates, css, js, whatever
2014-09-30 21:30:27 -07:00
RedMatrix
e12872fdae
Merge pull request #608 from beardy-unixer/master
...
Pluggable page templates
2014-10-01 14:11:16 +10:00
friendica
f8468b4c3a
allow custom role permissions and fix site timezone.
2014-09-29 23:36:41 -07:00
friendica
5292e3a100
implement a "powered-by" but leave it turned off until somebody with a good eye for layout can figure out where best to put it.
2014-09-29 21:58:35 -07:00
habeascodice
79bb60aafd
Merge remote branch 'upstream/master'
2014-09-29 15:46:56 -07:00
habeascodice
e62a95aaba
regex missing terminator char
2014-09-29 15:41:47 -07:00
Thomas Willingham
7c3b428e67
Merge branch 'master' of https://github.com/friendica/red
2014-09-29 19:12:12 +01:00
Thomas Willingham
90378e8ef8
Silence insanely noisy log - should probably stick this in a dlogger
...
if we need it - we're getting literally hundreds of thousands of these.
2014-09-29 19:06:43 +01:00
Thomas Willingham
9de5b6b905
Pluggable page templates
2014-09-29 15:13:39 +01:00
habeascodice
73ebdff083
Merge remote branch 'upstream/master'
2014-09-28 19:31:19 -07:00
habeascodice
c0b59ae36a
Typo in regex causes runtime error
2014-09-28 19:30:47 -07:00
Thomas Willingham
ffe6d20dc0
BBCode - $1 wrote doesn't make sense as a spoiler. $1 spoiler does.
2014-09-28 03:20:49 +01:00
friendica
2b02f611ad
Merge https://github.com/friendica/red into pending_merge
2014-09-27 05:11:32 -07:00
friendica
51c0904a8a
Merge https://github.com/friendica/red into pending_merge
2014-09-27 00:15:43 -07:00
friendica
fa019791fa
some background work for import/export of things and liked things/profiles
2014-09-27 00:14:35 -07:00
