aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Tried this once before but had to revert. Basically prevent a comment from be...friendica2014-10-191-1/+7
* Merge https://github.com/friendica/red into pending_mergefriendica2014-10-191-4009/+3853
|\
| * Merge pull request #650 from pafcu/masterRedMatrix2014-10-201-1/+1
| |\
| | * Move registration button to before login in nav to avoid problems with mobile...Stefan Parviainen2014-10-191-1/+1
| * | Merge pull request #651 from 23n/masterThomas Willingham2014-10-191-2/+1
| |\ \
| | * | edit me23n2014-10-191-2/+1
| |/ /
| * | Seventy five people you won't believe contributed to RedMatrix!Thomas Willingham2014-10-191-0/+77
| * | Merge pull request #649 from pafcu/masterRedMatrix2014-10-193-110/+57
| |\|
| | * Don't display date format, it's already in the placeholder textStefan Parviainen2014-10-193-37/+1
| | * Changes in the datetimesel api, prevent user from picking event end date earl...Stefan Parviainen2014-10-192-72/+53
| | * Give an error if event is supposed to end before it starts. Closes friendica/...Stefan Parviainen2014-10-191-2/+4
| * | Merge pull request #646 from pafcu/masterRedMatrix2014-10-194-208/+91
| |\|
| | * Oops, forgot one fileStefan Parviainen2014-10-181-73/+85
| | * Initial stab at better general datetime pickerStefan Parviainen2014-10-183-135/+6
| * | Doco - if I ever have to touch dozens of files to change one link again,Thomas Willingham2014-10-1753-66/+79
| * | PolicyThomas Willingham2014-10-172-1/+1
| * | New util/messages.poJeroen2014-10-171-4009/+3853
| * | Remote login > Remote authentication as discussedJeroen2014-10-171-1/+1
| * | oups... forgot to remove some debug stuffmarijus2014-10-171-1/+1
| * | make lockview for photos workmarijus2014-10-172-5/+15
* | | merge madnessfriendica2014-10-1964-1253/+1177
* | | string updatefriendica2014-10-191-374/+368
* | | new doc added to doc checkinfriendica2014-10-1920-0/+2790
* | | doc updatesfriendica2014-10-19114-2050/+2239
* | | wall-e random signature failuresfriendica2014-10-191-1/+2
|/ /
* | mark signature forgeriesfriendica2014-10-166-4/+16
* | Merge pull request #645 from pafcu/masterRedMatrix2014-10-172-13/+13
|\|
| * Merge branch 'master' of https://github.com/pafcu/redStefan Parviainen2014-10-1612-34/+48
| |\
| | * Merge pull request #1 from friendica/masterpafcu2014-10-1612-34/+48
| | |\
| * | | Login menuStefan Parviainen2014-10-162-13/+13
| |/ /
* | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-10-163-3/+6
|\ \ \ | | |/ | |/|
| * | jsonp support (thankxs fabrixxm)friendica2014-10-163-3/+6
* | | lighttpd sample conf security enhancementmarijus2014-10-161-0/+5
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-151-1/+1
|\ \
| * \ Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-10-162-3/+3
| |\ \
| * | | Let's not play security expert. Use Mozillas recommended serverThomas Willingham2014-10-161-1/+1
* | | | remove log statementfriendica2014-10-151-2/+0
* | | | missing event permissionsfriendica2014-10-154-4/+7
| |/ / |/| |
* | | Don't recognise hashtags starting with #, e.g. ###friendica2014-10-152-3/+3
|/ /
* | SSL is broken you say? Well bah gum.Thomas Willingham2014-10-161-1/+1
* | $comments > $commentboxmarijus2014-10-151-1/+1
* | some work on single photo view commentsmarijus2014-10-153-19/+29
* | one more item_id > idmarijus2014-10-151-1/+1
* | it seems we do not have an key called item_id here so must be id onlymarijus2014-10-151-1/+1
|/
* chanman is now 'locs' and a couple of post handlers have been defined.friendica2014-10-142-31/+90
* back to wrestling with the !@#$ diaspora recursive reshare from hellfriendica2014-10-141-3/+8
* missing quotefriendica2014-10-141-1/+1
* this is the reason Diaspora forum tagging was brokenfriendica2014-10-144-6/+14
* if a hubloc primary change results in an xchan primary change, create a direc...friendica2014-10-131-1/+5
* figuring out how to bootstrap the change_primary procedure when all you have ...friendica2014-10-132-0/+6