friendica
6e4f7383f1
Merge https://github.com/friendica/red into pending_merge
2014-10-06 15:16:46 -07:00
friendica
dc6b789871
Merge https://github.com/friendica/red into pending_merge
2014-10-06 15:02:48 -07:00
friendica
5236516145
install doc double escapes the store/[data] path.
2014-10-06 15:01:55 -07:00
RedMatrix
7577227a6d
Merge pull request #618 from solstag/master
...
new version of moment.js to match datetimepicker
2014-10-07 09:01:54 +11: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
Klaus Weidenbach
cef8955d57
We have no submodules, so no need for .gitmodules file.
2014-10-06 23:03:58 +02:00
Jeroen
5be36112ed
This one had a minor glitch.
2014-10-06 19:59:50 +00:00
Jeroen
532417f4e4
Re-created the new png avatars in SVG and exported them directly from Inkscape to PNG. Result: super sharp.
2014-10-06 17:20:15 +00:00
habeascodice
6b40c2cd09
Merge remote branch 'upstream/master'
2014-10-06 08:43:29 -07:00
Alexandre Hannud Abdo
c528eef4b4
new version of moment.js to match datetimepicker
2014-10-06 11:55:37 -03: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
e0854a6815
Merge https://github.com/friendica/red into pending_merge
2014-10-05 17:18:28 -07:00
friendica
4d049741ef
try and guess mimetype for openid profile photo
2014-10-05 17:17:25 -07:00
RedMatrix
43898031d8
Merge pull request #617 from solstag/master
...
New tag version of datetimepicker avoids hanging some browsers
2014-10-06 09:44:09 +11: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
Alexandre Hannud Abdo
b15301aabb
New tag version of datetimepicker avoids hanging some browsers
...
But still won't work with those same browsers.
Devel versions seem to work, but I chose to be conservative.
2014-10-05 19:13:01 -03: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
0fd55707f5
Licenses issues.
2014-10-05 21:22:53 +00:00
jeroenpraat
0049f4c71a
+png support
...
https://redmatrix.nl/channel/jeroenpraat/?f=&mid=83603d8f0876c040efafce87755fcd252dbe8da4a75d82fdb230519e3c8dcb72@redmatrix.nl
2014-10-05 21:05:50 +02: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
fe9de8e834
Merge pull request #613 from unary/typo
...
typo
2014-10-05 17:34:55 +02: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
82ba42586c
add blueimp-jquery-file-upload library
2014-10-05 01:18:50 -07:00
friendica
191ef124cf
add 'nopush' option to the post API so somebody could bulk load a bunch of existing content via the API without invoking the notifier and sending each out as a fresh post.
2014-10-05 01:09:57 -07:00
friendica
9135ad30d8
network page default option
2014-10-04 23:53:05 -07:00
jeroenpraat
b0544cc9e7
+urls to pubsites and install
2014-10-04 13:49:44 +02:00
jeroenpraat
c4ee971b52
updated it with the same text as in assets/home.html
2014-10-04 13:39:48 +02:00
Michael Johnston
5eba3c17cb
typo
2014-10-03 20:36:52 -04:00
friendica
f618e02117
Merge https://github.com/friendica/red into pending_merge
2014-10-03 16:52:01 -07:00
friendica
ec604a4158
more infrastructure for sharing page design elements
2014-10-03 16:51:22 -07:00
RedMatrix
62f7bf51ba
Merge pull request #612 from beardy-unixer/master
...
Set timezone when creating a channel.
2014-10-04 07:56:42 +10:00
marijus
55b75381ad
it seems this is needed also to not allow editing profile photo album
2014-10-03 19:15:37 +02:00
Thomas Willingham
557894bc01
That's a string, not an integer
2014-10-03 15:16:05 +01:00
friendica
e2f45a76b1
remove the privacy macros in settings and connedit now that we have privacy roles attached to the channel. One can still use the advanced permission dialogues, but they shouldn't have a reason to if they created the channel with a suitable channel type - plus it's just a bunch of extra permissions settings to confuse people.
2014-10-03 04:54:27 -07:00
friendica
a177cd1bd4
more work on shared design elements
2014-10-03 04:05:05 -07:00
friendica
328d72971d
Merge https://github.com/friendica/red into pending_merge
2014-10-03 03:35:50 -07:00
friendica
2bd4b36238
rev update
2014-10-03 03:35:01 -07:00
friendica
f5623ae11d
doc updates
2014-10-03 03:34:50 -07:00
RedMatrix
dfd39ebb3c
Merge pull request #611 from tuscanhobbit/dev
...
site language in siteinfo/json has been re-added
2014-10-03 18:51:16 +10:00
Thomas Willingham
09e0b4e2a1
Set timezone when creating a channel.
2014-10-03 00:57:07 +01:00
marijus
df70c2c9b6
more work on photos
2014-10-02 21:04:50 +02:00
Paolo Tacconi
9495aba499
site language in siteinfo/json has been re-added
2014-10-02 16:25:34 +02: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
Paolo Tacconi
9cebe8ccf0
Merge from master
2014-10-02 11:31:56 +02:00