aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* minor adjustments to make the form work as designedfriendica2014-11-042-8/+12
* ok heads up - potentially destabilising change. I've tried to sort out all th...friendica2014-11-0410-42/+81
* Merge https://github.com/friendica/red into pending_mergefriendica2014-11-041-11/+0
|\
| * Remove legacy custom/Thomas Willingham2014-11-041-11/+0
* | configurable visual alerts/notificationsfriendica2014-11-045-73/+206
|/
* it appears bootbox was lost in a bootstrap upgradefriendica2014-11-043-1/+901
* class > id mixupmarijus2014-11-041-1/+1
* missing </div>marijus2014-11-041-2/+3
* wall posted comment to a top-level wall post which arrived via a route (e.g. ...friendica2014-11-031-0/+3
* posted-date-selector - spacing was slightly off in dropdown entriesfriendica2014-11-031-0/+4
* Merge https://github.com/friendica/red into pending_mergefriendica2014-11-035-91/+99
|\
| * innodb issueThomas Willingham2014-11-031-2/+3
| * one </div> to much and css fixesmarijus2014-11-032-79/+79
| * Merge branch 'master' of https://github.com/friendica/redmarijus2014-11-033-1/+377
| |\
| * | if uploading a photo go away to albummarijus2014-11-031-2/+7
| * | if deleting a photo go away to albummarijus2014-11-032-8/+10
* | | various UI issues related to having an enormous number of entries in the post...friendica2014-11-033-5/+47
| |/ |/|
* | provide example import scriptfriendica2014-11-033-1/+377
|/
* php warningsfriendica2014-11-021-23/+23
* Merge https://github.com/friendica/red into pending_mergefriendica2014-11-026-24/+23
|\
| * Pixelbit restored. Going forwards, we probably want to add a checkThomas Willingham2014-11-021-0/+1
| * Merge branch 'master' of https://github.com/friendica/redmarijus2014-11-021-1/+0
| |\
| | * Remove pixelbits from directory fallback - blocked public searches provideThomas Willingham2014-11-021-1/+0
| * | css fixesmarijus2014-11-025-23/+22
| |/
* / I'm going to try again with the conversation request packets. I've looked thi...friendica2014-11-022-13/+60
|/
* add some more safety checks before turning the conversation request messages ...friendica2014-11-023-5/+7
* even more photos workmarijus2014-11-016-160/+103
* close the eventual open tool if the other opensmarijus2014-11-011-2/+2
* check that we have valid datafriendica2014-11-012-10/+17
* Merge https://github.com/friendica/red into pending_mergefriendica2014-11-0112-87/+70
|\
| * do not reload page for photo uploadmarijus2014-10-319-43/+26
| * Smarty3 now lives in storeThomas Willingham2014-10-311-4/+0
| * Merge pull request #671 from pafcu/masterjeroenpraat2014-10-311-1/+4
| |\
| | * Fix problem with default birth dateStefan Parviainen2014-10-311-1/+4
| * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-10-3185-3609/+3601
| |\ \
| * | | more work on photo uploadmarijus2014-10-315-40/+41
* | | | disable request message response until we work through thisfriendica2014-11-013-2/+4
* | | | doc updatesfriendica2014-11-0110-0/+1049
| |/ / |/| |
* | | document request packets a bit morefriendica2014-10-311-1/+4
* | | doc updatesfriendica2014-10-3184-3604/+3592
* | | flag notify packets that are sent in response to a message_id request and pre...friendica2014-10-311-4/+5
|/ /
* | Heads up: "custom/module.php" is deprecated. Please read this commit if you a...friendica2014-10-301-1/+13
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-3016-429/+737
|\ \
| * | Debian doco - no longer uses dropbear.Thomas Willingham2014-10-311-2/+2
| * | removing this was not a good idea...marijus2014-10-301-0/+4
| * | update bootstrap library to version 3.3marijus2014-10-308-333/+660
| * | some work on photo uploadmarijus2014-10-307-97/+74
* | | What this checkin does is catch the case where a comment arrived and there's ...friendica2014-10-308-23/+180
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-291-10/+12
|\| |
| * | if someone does not have permission to chat do not show the chatrooms tabmarijus2014-10-291-10/+12