aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-02-083-7/+29
|\ | | | | | | | | | | Conflicts: mod/events.php view/css/mod_events.css
| * generate the correct service permalinkfriendica2015-02-082-6/+28
| |
| * get_rel_link broken - also weekly doc updatesfriendica2015-02-061-1/+1
| |
| * event form cleanup backported from trinidad - still need to style the checkboxesfriendica2015-02-051-1/+2
| |
* | Merge branch 'master' into tresfriendica2015-02-0513-53/+467
|\| | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css
| * allow post expiration to be set from a config (and therefore a plugin/addon)friendica2015-02-051-1/+4
| |
| * over-ride permissions for sys channel delivery from diasporafriendica2015-02-051-9/+13
| |
| * another issue with diaspora postings to sys channel - sys has no ↵friendica2015-02-051-6/+14
| | | | | | | | connections, hence no abook records.
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-02-052-23/+65
| |\
| | * typomarijus2015-02-051-1/+1
| | |
| | * forgot to remove some debug stuffmarijus2015-02-051-2/+0
| | |
| | * make file activity respect parent dir permissions workmarijus2015-02-051-22/+66
| | |
| | * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-02-0513-35/+397
| | |\
| | * | escape datesHabeas Codice2015-02-051-1/+1
| | | |
| * | | author profile photo in reshare wasn't linkedfriendica2015-02-051-1/+1
| | |/ | |/|
| * | diaspora public posts not delivering to sys channel if there were no other ↵friendica2015-02-041-4/+9
| | | | | | | | | | | | subscribers
| * | forgot to add the self exclusionfriendica2015-02-041-2/+4
| | |
| * | allow anybody to view ratings - including oneself. Only allow authenticated ↵friendica2015-02-041-9/+9
| | | | | | | | | | | | folks to edit them.
| * | add 'view ratings' to the widget. It's actually two stacked widgets rather ↵friendica2015-02-041-2/+6
| | | | | | | | | | | | than a widget with two entries. That's the only way we can keep the theming consistent with the rconnect button.
| * | honour the rating enable setting (which we really do need to rename since it ↵friendica2015-02-041-0/+5
| | | | | | | | | | | | isn't poco any more)
| * | remote rating and addition of rate-me to channel profile sidebarfriendica2015-02-042-12/+32
| | |
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-02-041-28/+60
| |\ \
| | * | not quite there yet but getting closer a littlemarijus2015-02-041-28/+60
| | | |
| * | | first cut at rating widget. The flaw is that it is limited because it ↵friendica2015-02-042-0/+33
| |/ / | | | | | | | | | requires local_channel() (formerly local_user()). We need to extend this to take you home like rpost does if you're logged in as remote_channel() - and/or we need zot to send the rating message to the source channel and target in addition to the directories.
| * | order ratings friends firstfriendica2015-02-031-4/+0
| | |
| * | final cleanup on ratings featurefriendica2015-02-031-0/+1
| | |
| * | finish off the sync functionsfriendica2015-02-031-0/+43
| | |
| * | ratings - mopping up, most everything but directory sync implementedfriendica2015-02-031-0/+3
| | |
| * | Merge branch 'master' into pocoratefriendica2015-02-032-2/+7
| |\ \
| | * | garbage in garbage outfriendica2015-02-032-2/+7
| | | |
| * | | send rating information to directoriesfriendica2015-02-023-24/+153
| |/ /
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-02-021-0/+75
| |\ \
| | * | comment out latest changes - needs more testingmarijus2015-02-021-4/+4
| | | |
| | * | comment this out for now - it is not always truemarijus2015-02-021-2/+2
| | | |
| | * | one important line missingmarijus2015-02-021-0/+1
| | | |
| | * | we also need folder heremarijus2015-02-021-1/+1
| | | |
| | * | typomarijus2015-02-021-1/+1
| | | |
| | * | just select permsmarijus2015-02-021-1/+1
| | | |
| | * | respect parent dir permissionsmarijus2015-02-021-0/+74
| | | |
| * | | issue #889 private tags for forums no longer recognised after tag refactor a ↵friendica2015-02-022-0/+4
| |/ / | | | | | | | | | few weeks back. This solution is not optimal as it also leaves you in the privacy ACL in some cases and not in others but it restores the previous functionality
* | | Merge branch 'master' into tresfriendica2015-02-013-1/+6
|\| |
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-02-011-0/+1
| |\ \
| | * | add multipart/mixed to getIconFromType()marijus2015-02-011-0/+1
| | | |
| * | | two tracks proceeding in parallel - first adding the ability to store a ↵friendica2015-02-011-0/+4
| |/ / | | | | | | | | | digital signature with ratings so that directories can pass them around, second provide some directory registration functions so we can obtain a list of directories from somewhere (to pass ratings around between them). This gives the primary directory role some value as that is where you register your directory.
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-311-1/+1
| |\|
| * | issue #885, autoperms not working for diaspora connectionsfriendica2015-01-311-1/+1
| | |
* | | Merge branch 'master' into tresfriendica2015-01-315-18/+63
|\ \ \ | | |/ | |/| | | | | | | Conflicts: include/zot.php
| * | prevent silly fake null date from causing problems OTW from older buildsHabeas Codice2015-01-301-1/+1
| |/
| * sync_locations() toggle DB flag functions were broken - result of postgres ↵friendica2015-01-301-4/+22
| | | | | | | | changes. Split these into seperate set and reset blocks.
| * fix random profilesfriendica2015-01-301-2/+3
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 10:32:39 +0000