aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* INSTALL: 'store' is created during setup but not 'store/[data]/smarty3' and ↵friendica2015-02-191-1/+1
| | | | we explicitly check for the latter and report that it isn't there or isn't writable. Doh.
* diaspora: move reshare encapsulation after tag parsing, since it seriously ↵friendica2015-02-192-14/+13
| | | | screws up the tag parser and reshares end up with a lot of unlinked tags.
* Merge pull request #906 from tuscanhobbit/devPaolo T2015-02-192-6047/+6414
|\ | | | | Italian strings updated
| * Italian strings updatedPaolo Tacconi2015-02-192-6047/+6414
|/
* Merge pull request #905 from zzottel/masterzzottel2015-02-192-6118/+6586
|\ | | | | update to German translations
| * update to German translationszottel2015-02-192-6118/+6586
|/
* Merge pull request #901 from zzottel/masterRedMatrix2015-02-191-2/+2
|\ | | | | also deliver public posts to channels with channel_w_stream = PERMS_AUTHED
| * fix parens mismatch from last commitzottel2015-02-181-2/+2
| |
| * also deliver public posts to channels with channel_w_stream = PERMS_AUTHEDzottel2015-02-181-2/+2
| |
* | Merge pull request #900 from einervonvielen/doc_dev_beginner_correctionsRedMatrix2015-02-195-54/+57
|\ \ | | | | | | Changed bbcode [toc] and changed doc for beginning deveopers
| * | Some changes of doc for beginning developerseinervonvielen2015-02-151-3/+3
| | | | | | | | | Made some corrections after following this manual step by step.
| * | Changed bb code [toc] to make it more flexibleEiner von Vielen2015-02-144-51/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This usage is know closer to the original usage of http://ndabas.github.io/toc/ Changed: - jquery.toc.js: Do not check for empty headings - bbcode.php: Added processing of [toc] with parameters - main.js: Use the default params for jquery.toc.js - bbcode.html: Added more help for [toc] and corrected some html
* | | Merge pull request #902 from dawnbreak/docuRedMatrix2015-02-191-5/+27
|\ \ \ | | | | | | | | Updated doxygen docu about deperecated functions.
| * | | Updated doxygen docu about deperecated functions.Klaus Weidenbach2015-02-181-5/+27
| | | | | | | | | | | | | | | | | | | | Corrected wrong return types in doxygen docu and add a deprecation log entry.
* | | | Merge https://github.com/friendica/red into pending_mergefriendica2015-02-181-2/+21
|\| | |
| * | | do not send activity to channels with no permission to view filestoragemarijus2015-02-181-2/+21
| | |/ | |/|
* / | first step of theme separation. Only put redbasic under git control. Ignore ↵friendica2015-02-184-3/+8
|/ / | | | | | | any other themes in view/theme .
* | The Diaspora communications policies allow comments to public posts ↵friendica2015-02-174-21/+81
| | | | | | | | literally from anybody. Allow this policy model by default for commenters from that network. This policy decision can be set or disabled on the addon/features settings page.
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-02-172-10/+13
|\ \
| * | advanced css calc() failbackmarijus2015-02-172-10/+13
| | |
* | | make tag clouds honour the full permissions repertoire, not just yes/no ↵friendica2015-02-172-3/+8
| | | | | | | | | | | | public/private, but who are you and what tags can you see
* | | Merge https://github.com/friendica/red into pending_mergefriendica2015-02-163-4/+13
|\| |
| * | quickfix for eventual css calc() not supported bugmarijus2015-02-171-0/+4
| | |
| * | Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-02-1641-159/+910
| |\ \
| * | | normalize age dataHabeas Codice2015-02-161-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql has type tinyint(3) which probably turns into a 24-bit value, but postgres uses 3-digit decimal as its constraint (probably what the mysql schema was intended to do). either that or mysql silently truncates while postgres respects the constraint. Either way, bad data gets in unchecked, now it's checked.
| * | | remove superfluous non-boolean booleanHabeas Codice2015-02-161-2/+2
| | | |
* | | | bring back like/dislike summaries on photosfriendica2015-02-164-67/+52
| |/ / |/| |
* | | hub upgrade w/name change via Alexfriendica2015-02-161-1/+1
| | |
* | | mopping up the public site ratingsfriendica2015-02-163-4/+12
| | |
* | | quick fix for photos page until calls to like_puller() are fixedfriendica2015-02-161-4/+4
| | |
* | | pubsites ratings (mod/pubsites really really needs to be templatised, this ↵friendica2015-02-163-5/+10
| | | | | | | | | | | | was quick and dirty)
* | | force site_url to be lowercase when stored. Otherwise rating hubs on ↵friendica2015-02-155-8/+22
| | | | | | | | | | | | postgres could get real messy.
* | | preparatory work for site ratingsfriendica2015-02-153-10/+28
| | |
* | | site firehosefriendica2015-02-151-3/+11
| | |
* | | issue #860, replace br html element with linefeed between table rowsfriendica2015-02-152-18/+20
| | |
* | | taganyone wasn't workingfriendica2015-02-151-2/+5
| | |
* | | missing filefriendica2015-02-151-0/+8
| | |
* | | add zotsh to utilfriendica2015-02-159-0/+646
| | |
* | | lost ability to delete eventsfriendica2015-02-155-3/+35
| | |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2015-02-148-84/+110
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2015-02-142-6/+0
| |\ \ \
| | * | | Note to myself: don't forget to remove the patch files from the repo.jeroenpraat2015-02-142-57/+0
| | | | |
| | * | | Patches from Thomas regarding offline status off whogotzot.comjeroenpraat2015-02-144-6/+57
| | | |/ | | |/|
| * / | update justifiedGallery to version 3.5.4 and add ignoreElement option which ↵marijus2015-02-146-78/+110
| |/ / | | | | | | | | | will hopefully be accepted upstream
* / / failure to auto update comments if it's your own.friendica2015-02-144-7/+11
|/ /
* / some ratings fixesfriendica2015-02-132-24/+1
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2015-02-137-68/+73
|\
| * Merge branch 'master' of https://github.com/friendica/redmarijus2015-02-131-1/+1
| |\
| | * make sql work on both db typesHabeas Codice2015-02-131-1/+1
| | |
| * | some shifting to make button groups render properlymarijus2015-02-132-48/+51
| |/