| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | Merge pull request #619 from dawnbreak/master | Klaus | 2014-10-07 | 1 | -0/+0 | |
| | |\| | | | | | | | | | | We have no submodules, so no need for .gitmodules file. | |||||
| | | * | | We have no submodules, so no need for .gitmodules file. | Klaus Weidenbach | 2014-10-06 | 1 | -0/+0 | |
| | |/ / | ||||||
| * / / | shareable design elements | friendica | 2014-10-06 | 7 | -12/+89 | |
| |/ / | ||||||
| * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-06 | 4 | -7064/+7 | |
| |\ \ | ||||||
| | * \ | Merge pull request #618 from solstag/master | RedMatrix | 2014-10-07 | 4 | -7064/+7 | |
| | |\ \ | | | | | | | | | new version of moment.js to match datetimepicker | |||||
| | | * | | new version of moment.js to match datetimepicker | Alexandre Hannud Abdo | 2014-10-06 | 4 | -7064/+7 | |
| | | | | | ||||||
| * | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-06 | 12 | -0/+0 | |
| |\| | | | ||||||
| | * | | | This one had a minor glitch. | Jeroen | 2014-10-06 | 3 | -0/+0 | |
| | | | | | ||||||
| | * | | | Re-created the new png avatars in SVG and exported them directly from ↵ | Jeroen | 2014-10-06 | 12 | -0/+0 | |
| | |/ / | | | | | | | | | | Inkscape to PNG. Result: super sharp. | |||||
| * / / | install doc double escapes the store/[data] path. | friendica | 2014-10-06 | 2 | -2/+2 | |
| |/ / | ||||||
| * | | attempt to deal with the diaspora recursive reshare from hell (Bob reshared ↵ | friendica | 2014-10-05 | 1 | -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 ↵ | friendica | 2014-10-05 | 1 | -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_merge | friendica | 2014-10-05 | 3 | -142/+176 | |
| |\ \ | ||||||
| | * \ | Merge pull request #617 from solstag/master | RedMatrix | 2014-10-06 | 3 | -142/+176 | |
| | |\ \ | | | | | | | | | New tag version of datetimepicker avoids hanging some browsers | |||||
| | | * | | New tag version of datetimepicker avoids hanging some browsers | Alexandre Hannud Abdo | 2014-10-05 | 3 | -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 photo | friendica | 2014-10-05 | 1 | -1/+3 | |
| |/ / / | ||||||
| * | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-05 | 33 | -145/+364 | |
| |\| | | ||||||
| | * | | Merge pull request #616 from dawnbreak/docu | RedMatrix | 2014-10-06 | 3 | -137/+271 | |
| | |\ \ | | | | | | | | | Documentation and some restructure in RedBasicAuth | |||||
| | | * | | Some documentation for include/reddav.php and a bit code cleanup. | Klaus Weidenbach | 2014-10-05 | 2 | -84/+197 | |
| | | | | | | | | | | | | | | | | | | | | | Removed some duplicate code in RedBasicAuth and restructured a bit. Still work in progress. | |||||
| | | * | | Some documentation of include/auth.php. | Klaus Weidenbach | 2014-10-05 | 1 | -53/+74 | |
| | | | | | ||||||
| | * | | | image/jpeg > image/png | Jeroen | 2014-10-05 | 2 | -5/+5 | |
| | | | | | ||||||
| | * | | | Licenses issues. | Jeroen | 2014-10-05 | 6 | -0/+0 | |
| | | | | | ||||||
| | * | | | +png support | jeroenpraat | 2014-10-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | | https://redmatrix.nl/channel/jeroenpraat/?f=&mid=83603d8f0876c040efafce87755fcd252dbe8da4a75d82fdb230519e3c8dcb72@redmatrix.nl | |||||
| | * | | | Changed default avatars to PNG as agreed with Mike here: ↵ | Jeroen | 2014-10-05 | 32 | -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/typo | Klaus | 2014-10-05 | 1 | -1/+1 | |
| | |\ \ \ | | |/ / | |/| | | typo | |||||
| | | * | | typo | Michael Johnston | 2014-10-03 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | diaspora share not rendering issue - still have one remaining (the recursive ↵ | friendica | 2014-10-05 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | | share from hell) | |||||
| * | | | add blueimp-jquery-file-upload library | friendica | 2014-10-05 | 56 | -0/+10272 | |
| | | | | ||||||
| * | | | add 'nopush' option to the post API so somebody could bulk load a bunch of ↵ | friendica | 2014-10-05 | 2 | -10/+17 | |
| | | | | | | | | | | | | | existing content via the API without invoking the notifier and sending each out as a fresh post. | |||||
| * | | | network page default option | friendica | 2014-10-04 | 2 | -2/+5 | |
| | | | | ||||||
| * | | | +urls to pubsites and install | jeroenpraat | 2014-10-04 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | updated it with the same text as in assets/home.html | jeroenpraat | 2014-10-04 | 1 | -5/+5 | |
| |/ / | ||||||
| * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-03 | 2 | -5/+6 | |
| |\ \ | ||||||
| | * \ | Merge pull request #612 from beardy-unixer/master | RedMatrix | 2014-10-04 | 1 | -3/+4 | |
| | |\ \ | | | | | | | | | Set timezone when creating a channel. | |||||
| | | * | | That's a string, not an integer | Thomas Willingham | 2014-10-03 | 1 | -1/+1 | |
| | | | | | ||||||
| | | * | | Set timezone when creating a channel. | Thomas Willingham | 2014-10-03 | 1 | -3/+4 | |
| | | | | | ||||||
| | * | | | it seems this is needed also to not allow editing profile photo album | marijus | 2014-10-03 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | more infrastructure for sharing page design elements | friendica | 2014-10-03 | 1 | -1/+43 | |
| |/ / / | ||||||
| * | | | remove the privacy macros in settings and connedit now that we have privacy ↵ | friendica | 2014-10-03 | 2 | -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 elements | friendica | 2014-10-03 | 1 | -1/+7 | |
| | | | | ||||||
| * | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-03 | 7 | -119/+165 | |
| |\ \ \ | ||||||
| | * \ \ | Merge pull request #611 from tuscanhobbit/dev | RedMatrix | 2014-10-03 | 1 | -0/+1 | |
| | |\ \ \ | | |/ / | |/| | | site language in siteinfo/json has been re-added | |||||
| | | * | | site language in siteinfo/json has been re-added | Paolo Tacconi | 2014-10-02 | 1 | -0/+1 | |
| | | | | | ||||||
| | * | | | more work on photos | marijus | 2014-10-02 | 4 | -71/+75 | |
| | |/ / | ||||||
| | * | | Merge pull request #610 from tuscanhobbit/dev | RedMatrix | 2014-10-02 | 3 | -48/+89 | |
| | |\ \ | | | | | | | | | site language wasn't included in siteinfo/json | |||||
| | | * | | query for statistics are now executed by poller | Paolo Tacconi | 2014-10-02 | 3 | -49/+89 | |
| | | | | | ||||||
| | | * | | Merge from master | Paolo Tacconi | 2014-10-02 | 4 | -5/+22 | |
| | | |\ \ | ||||||
| | | | * \ | Rebase from upstream | Paolo Tacconi | 2014-10-02 | 4 | -5/+22 | |
| | | | |\ \ | ||||||
| | | * | | | | site language was left out of siteinfo | tuscanhobbit | 2014-10-01 | 1 | -0/+1 | |
| | | |/ / / | ||||||
| | | * | | | Merge from upstream | tuscanhobbit | 2014-10-01 | 24 | -1380/+2063 | |
| | | |\ \ \ | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |