aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into pending_mergefriendica2014-07-104-6/+7
|\
| * Merge pull request #531 from tonybaldwin/masterThomas Willingham2014-07-101-0/+1
| |\
| | * added link to nubasic in external resources/3rd party themestonybaldwin2014-07-101-0/+1
| |/
| * small fix nljeroenpraat2014-07-092-3/+3
| * Minor docoThomas Willingham2014-07-081-3/+3
* | docofriendica2014-07-102-2/+8
* | make sure we don't block new folks if there's a different register policy and...friendica2014-07-091-1/+1
* | finish implementing email verification. Currently it only applies if REGISTER...friendica2014-07-096-9/+44
|/
* This is a bit wordy - but gets to the point about what problems we are trying...friendica2014-07-071-1/+5
* more event display formattingfriendica2014-07-074-11/+24
* event render improvementsfriendica2014-07-063-4/+10
* numerous event fixes - mostly related to editing an eventfriendica2014-07-062-23/+42
* a bit of word cleanupfriendica2014-07-061-6/+9
* Merge https://github.com/friendica/red into pending_mergefriendica2014-07-064-5969/+6189
|\
| * Added a help file about privacy (as promised). Please take a look and fix spe...jeroenpraat2014-07-072-0/+16
| * nl 100%git statusjeroenpraat2014-07-062-5969/+6173
* | homepage revisionsfriendica2014-07-063-20/+17
|/
* make the pending connections query consistent between mod/ping and mod/connec...friendica2014-07-051-5/+7
* remove cyclic dependency on XCHAN_FLAGS_HIDDENfriendica2014-07-052-3/+4
* when deleting items, delete linked events and photos during stage1friendica2014-07-043-3555/+3720
* doc updatesfriendica2014-07-0499-2395/+3470
* add 'block_public' checking to get_all_perms() and perm_is_allowed() so we ha...friendica2014-07-031-0/+12
* some initial work towards email address verificationfriendica2014-07-033-0/+133
* Merge https://github.com/friendica/red into pending_mergefriendica2014-07-032-62/+62
|\
| * fix nljeroenpraat2014-07-032-62/+62
* | visage tracking opt-in/opt-outfriendica2014-07-033-0/+29
|/
* session DNT - if you want it use it.friendica2014-07-031-0/+4
* move code out of templates - not sure how this even worked.friendica2014-07-033-11/+19
* Merge https://github.com/friendica/red into pending_mergefriendica2014-07-0215-12456/+11854
|\
| * Red Matrix default instead of global default. Is more clear. Update nl to 99%...jeroenpraat2014-07-024-6077/+5878
| * Merge branch 'master' of https://github.com/friendica/redjeroenpraat2014-07-0221-6408/+6018
| |\
| | * Merge pull request #526 from zzottel/masterzzottel2014-07-029-305/+101
| | |\
| | | * update German docszottel2014-07-029-305/+101
| | |/
| | * Merge pull request #525 from tuscanhobbit/masterPaolo T2014-07-022-6074/+5875
| | |\
| | | * IT: strings updatedPaolo Tacconi2014-07-022-6074/+5875
| * | | Changed Default to Light (global default). So if hub owners want to change th...jeroenpraat2014-07-021-1/+1
* | | | turn that into a featurefriendica2014-07-023-3/+3
| |/ / |/| |
* | | Merge pull request #524 from zzottel/masterRedMatrix2014-07-021-1/+1
|\ \ \
| * | | Fix for #510: $a->poi wasn't set for tabs actions with commands, so connedit_...zottel2014-07-021-1/+1
|/ / /
* | | use a better hashtag replacement when preventing tag hijackingfriendica2014-07-011-2/+2
* | | minor adjustmentsfriendica2014-07-012-1/+6
* | | minor optimisationfriendica2014-07-012-9/+5
* | | optionally allow zrl usage from specific markdown sourcesfriendica2014-07-013-12/+19
* | | easter eggfriendica2014-07-013-5/+10
|/ /
* | updated util/messages.pojeroenpraat2014-07-011-3747/+3585
* | fix 1 error in nl that somehow sneaked injeroenpraat2014-07-012-3/+3
* | update/approve nl to 98%git statusjeroenpraat2014-07-012-99/+99
* | Doco - better wording. Unless it was intended to block indexing, butThomas Willingham2014-07-011-1/+1
* | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-07-015-141/+159
|\ \
| * | update nljeroenpraat2014-07-012-117/+117