aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* We have no submodules, so no need for .gitmodules file.Klaus Weidenbach2014-10-061-0/+0
|
* Merge https://github.com/friendica/red into pending_mergefriendica2014-10-064-7064/+7
|\
| * Merge pull request #618 from solstag/masterRedMatrix2014-10-074-7064/+7
| |\ | | | | | | new version of moment.js to match datetimepicker
| | * new version of moment.js to match datetimepickerAlexandre Hannud Abdo2014-10-064-7064/+7
| | |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-0612-0/+0
|\| |
| * | This one had a minor glitch.Jeroen2014-10-063-0/+0
| | |
| * | Re-created the new png avatars in SVG and exported them directly from ↵Jeroen2014-10-0612-0/+0
| |/ | | | | | | Inkscape to PNG. Result: super sharp.
* / install doc double escapes the store/[data] path.friendica2014-10-062-2/+2
|/
* attempt to deal with the diaspora recursive reshare from hell (Bob reshared ↵friendica2014-10-051-10/+40
| | | | 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.
* send dislike activities to diaspora as comments, also send likes and ↵friendica2014-10-051-13/+5
| | | | dislikes of comments as additional comments. We won't go into why this is necessary for a service that claims to support activitystreams.
* Merge https://github.com/friendica/red into pending_mergefriendica2014-10-053-142/+176
|\
| * Merge pull request #617 from solstag/masterRedMatrix2014-10-063-142/+176
| |\ | | | | | | New tag version of datetimepicker avoids hanging some browsers
| | * New tag version of datetimepicker avoids hanging some browsersAlexandre Hannud Abdo2014-10-053-142/+176
| | | | | | | | | | | | | | | But still won't work with those same browsers. Devel versions seem to work, but I chose to be conservative.
* | | try and guess mimetype for openid profile photofriendica2014-10-051-1/+3
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-0533-145/+364
|\|
| * Merge pull request #616 from dawnbreak/docuRedMatrix2014-10-063-137/+271
| |\ | | | | | | Documentation and some restructure in RedBasicAuth
| | * Some documentation for include/reddav.php and a bit code cleanup.Klaus Weidenbach2014-10-052-84/+197
| | | | | | | | | | | | | | | Removed some duplicate code in RedBasicAuth and restructured a bit. Still work in progress.
| | * Some documentation of include/auth.php.Klaus Weidenbach2014-10-051-53/+74
| | |
| * | image/jpeg > image/pngJeroen2014-10-052-5/+5
| | |
| * | Licenses issues.Jeroen2014-10-056-0/+0
| | |
| * | +png supportjeroenpraat2014-10-051-1/+1
| | | | | | | | | https://redmatrix.nl/channel/jeroenpraat/?f=&mid=83603d8f0876c040efafce87755fcd252dbe8da4a75d82fdb230519e3c8dcb72@redmatrix.nl
| * | Changed default avatars to PNG as agreed with Mike here: ↵Jeroen2014-10-0532-1/+86
| | | | | | | | | | | | 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
| * | Merge pull request #613 from unary/typoKlaus2014-10-051-1/+1
| |\ \ | | |/ | |/| typo
| | * typoMichael Johnston2014-10-031-1/+1
| | |
* | | diaspora share not rendering issue - still have one remaining (the recursive ↵friendica2014-10-051-1/+1
|/ / | | | | | | share from hell)
* | add blueimp-jquery-file-upload libraryfriendica2014-10-0556-0/+10272
| |
* | add 'nopush' option to the post API so somebody could bulk load a bunch of ↵friendica2014-10-052-10/+17
| | | | | | | | existing content via the API without invoking the notifier and sending each out as a fresh post.
* | network page default optionfriendica2014-10-042-2/+5
| |
* | +urls to pubsites and installjeroenpraat2014-10-041-0/+2
| |
* | updated it with the same text as in assets/home.htmljeroenpraat2014-10-041-5/+5
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2014-10-032-5/+6
|\
| * Merge pull request #612 from beardy-unixer/masterRedMatrix2014-10-041-3/+4
| |\ | | | | | | Set timezone when creating a channel.
| | * That's a string, not an integerThomas Willingham2014-10-031-1/+1
| | |
| | * Set timezone when creating a channel.Thomas Willingham2014-10-031-3/+4
| | |
| * | it seems this is needed also to not allow editing profile photo albummarijus2014-10-031-2/+2
| | |
* | | more infrastructure for sharing page design elementsfriendica2014-10-031-1/+43
|/ /
* | remove the privacy macros in settings and connedit now that we have privacy ↵friendica2014-10-032-30/+0
| | | | | | | | 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.
* | more work on shared design elementsfriendica2014-10-031-1/+7
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-037-119/+165
|\ \
| * \ Merge pull request #611 from tuscanhobbit/devRedMatrix2014-10-031-0/+1
| |\ \ | | |/ | |/| site language in siteinfo/json has been re-added
| | * site language in siteinfo/json has been re-addedPaolo Tacconi2014-10-021-0/+1
| | |
| * | more work on photosmarijus2014-10-024-71/+75
| |/
| * Merge pull request #610 from tuscanhobbit/devRedMatrix2014-10-023-48/+89
| |\ | | | | | | site language wasn't included in siteinfo/json
| | * query for statistics are now executed by pollerPaolo Tacconi2014-10-023-49/+89
| | |
| | * Merge from masterPaolo Tacconi2014-10-024-5/+22
| | |\
| | | * Rebase from upstreamPaolo Tacconi2014-10-024-5/+22
| | | |\
| | * | | site language was left out of siteinfotuscanhobbit2014-10-011-0/+1
| | |/ /
| | * | Merge from upstreamtuscanhobbit2014-10-0124-1380/+2063
| | |\ \
| | * \ \ Merge from upstreamtuscanhobbit2014-09-2814-156/+453
| | |\ \ \
| | * \ \ \ Merge from origintuscanhobbit2014-09-2883-1956/+2370
| | |\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 09:44:15 +0000