aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Often somebody will join the matrix with a dodgy cert and we'll sort that out...friendica2014-04-132-12/+26
* remove extra tag loggingfriendica2014-04-121-1/+1
* don't match quote remnantsfriendica2014-04-121-1/+5
* let normal hashtags be quoted strings alsofriendica2014-04-121-1/+12
* Merge branch 'master' into prvtagfriendica2014-04-121-13/+13
|\
| * Ooops, replaced too manyThomas Willingham2014-04-121-2/+2
| * Revert to prepare_text, use bbcode only for withThomas Willingham2014-04-121-15/+15
* | no this is the way to do itfriendica2014-04-111-2/+2
* | Use @+ to tag a forum and also restrict the post to the forum, this leaves @!...friendica2014-04-111-2/+2
|/
* make sure we can find that functionfriendica2014-04-111-0/+1
* we also need a loop breakerfriendica2014-04-111-0/+6
* Merge pull request #405 from beardy-unixer/masterRedMatrix2014-04-122-17/+18
|\
| * Don't count deleted channels when figuring out where to send a user on login.Thomas Willingham2014-04-111-2/+3
| * Bring BBCode to profilesThomas Willingham2014-04-111-15/+15
* | Merge pull request #404 from git-marijus/masterRedMatrix2014-04-122-3/+9
|\ \
| * | bootstrapify aclselectormarijus2014-04-112-3/+9
| |/
* / soft revert 9bb7811 until we can look at it more closely.friendica2014-04-111-4/+5
|/
* add the message-id to delivery reports. This _could_ allow an enterprising de...friendica2014-04-101-14/+14
* Discover page: when importing public items, alter the item so that it has the...friendica2014-04-101-0/+19
* move the deleted flag setting to encode_item_flags() where it belongs now tha...friendica2014-04-101-4/+3
* Include the entire original item when notifying other channels of deletions a...friendica2014-04-102-6/+1
* Merge https://github.com/friendica/red into pending_mergefriendica2014-04-091-4/+3
|\
| * Merge pull request #399 from git-marijus/masterRedMatrix2014-04-101-4/+3
| |\
| | * use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair editblo...marijus2014-04-091-2/+1
| | * change the way jot tools are displayed/hiddenmarijus2014-04-081-2/+2
* | | issue #400 - lock not showing up for previews of private mentions (or 'new/se...friendica2014-04-091-1/+5
|/ /
* / 'anybody in this network' permissions were not being allowed for non-connecte...friendica2014-04-091-6/+22
|/
* some fixes to #395friendica2014-04-072-2/+2
* convert /network saved search to bootstrap buttonsfriendica2014-04-071-2/+2
* this should be better - "xchan deleted" state on remote sites only follows th...friendica2014-04-071-9/+6
* undo one of yesterday's changes - if a channel was deleted we want to mark th...friendica2014-04-071-6/+6
* prevent follows of and notifications to deceased channelsfriendica2014-04-073-2/+18
* check_webbie (webbie validator) returning bad webbiesfriendica2014-04-061-2/+4
* a bit more work towards issue #395 - cleaning up some cases which were going ...friendica2014-04-061-9/+3
* jot and location style fixesmarijus2014-04-061-1/+1
* Merge pull request #397 from sasiflo/masterRedMatrix2014-04-061-1/+1
|\
| * Merge remote-tracking branch 'upstream/master'sasiflo2014-04-061-8/+9
| |\
| * \ Merge remote-tracking branch 'upstream/master'sasiflo2014-04-061-1/+1
| |\ \
| * | | Hope I have repaired the channel admin page.sasiflo2014-04-061-1/+1
* | | | issue #395, item 2friendica2014-04-062-3/+9
| |_|/ |/| |
* | | use parent_mid in the parent query for enotify instead of of the parent id. T...friendica2014-04-061-8/+9
| |/ |/|
* | Typo in externals SQL.Thomas Willingham2014-04-051-1/+1
|/
* provide the ability for rpost to post as another of your channels. This does ...friendica2014-04-052-0/+30
* finish "ifpending" connectionsfriendica2014-04-041-1/+1
* introduce a connection type called 'ifpending' for number 6 of issue #395 - s...friendica2014-04-041-1/+1
* start of legacy probe utilityfriendica2014-04-021-0/+99
* more efficient public feed fetchingfriendica2014-04-021-6/+17
* Let admins set a default expire days value.Thomas Willingham2014-04-011-3/+7
* wrong var name in add_source_routefriendica2014-03-311-2/+2
* crank up loggingfriendica2014-03-311-0/+2