aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into pending_mergefriendica2014-08-011-2/+2
|\
| * Merge branch 'master' of https://github.com/friendica/redJeroen2014-07-317-23/+25
| |\
| * | Font sizes (temporary?) scaled down a bit. See https://github.com/friendica/r...Jeroen2014-07-311-2/+2
* | | make the profile minimal by default. Use features to enable the advanced form.friendica2014-08-016-325/+392
* | | doc updatesfriendica2014-08-0131-198/+238
| |/ |/|
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-07-318-265/+250
|\|
| * nl: better translation hometownJeroen2014-07-302-5/+5
| * update/upgrade nlJeroen2014-07-304-238/+226
| * More doc updatesJeroen2014-07-304-24/+12
| * Inserted text from Network Privacy (changed this to Identity Privacy)jeroenpraat2014-07-301-0/+9
* | convert application strings to en-USfriendica2014-07-317-23/+25
|/
* block channel removal for 48 hours after changing the account password, since...friendica2014-07-295-4/+24
* we didn't need the extra query - everything we require is already in memoryfriendica2014-07-291-37/+26
* implement the new friend activity post which has been missing for some time nowfriendica2014-07-292-10/+54
* sql errorfriendica2014-07-293-4/+6
* Stupid BluefishJeroen2014-07-291-1/+1
* As talked about earlier: set body font size to 0.8rem and post/comment font s...Jeroen2014-07-293-10/+10
* Merge pull request #548 from tuscanhobbit/masterRedMatrix2014-07-292-0/+21
|\
| * deleted a command with debug codePaolo Tacconi2014-07-291-0/+1
| * Chatroom lines are deleted after MAX_CHATROOM_HOURS or the chat becomes slow ...Paolo Tacconi2014-07-292-0/+20
* | derivative themes not loading parent theme includes when visiting /cloudfriendica2014-07-281-0/+11
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-07-282-3/+2
|\ \
| * | 14px>12pt as agreed on https://github.com/friendica/red/commit/075fc6727762d4...Jeroen2014-07-282-3/+2
* | | Start of a comprehensive Privacy Policy documentfriendica2014-07-284-4/+72
|/ /
* | style the photo like buttonsfriendica2014-07-271-2/+2
* | re-align the "remember me" button on login page after bootstrap updatefriendica2014-07-271-0/+2
* | clear floats on photo page (footer content appearing on right of page instead...friendica2014-07-271-0/+2
* | Improved photo view page. Added a delete button, stylized other button and re...Jeroen2014-07-275-13/+59
* | restrict categories list to items that aren't deletedfriendica2014-07-272-1/+2
* | honour sys channel permissions for who can view the sys owned contentfriendica2014-07-263-4/+19
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-07-251-0/+4
|\ \
| * \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-07-2529-6024/+6896
| |\ \
| * | | fixes #545marijus2014-07-251-0/+4
* | | | wrong label on iconfriendica2014-07-255-91/+95
| |/ / |/| |
* | | make profile edit pencil stand out a bit on darker backgroundsfriendica2014-07-242-1/+2
* | | always provide a profile edit entry in the nav usermenufriendica2014-07-244-16/+32
* | | cherry pick pull request #544friendica2014-07-246-68/+15
* | | Merge branch 'master' of https://github.com/RedMatrixCanada/red into RedMatri...friendica2014-07-2422-5992/+6892
|\ \ \
| * | | French Translationsmycocham2014-07-2422-5992/+6892
| |/ /
* | | issues #542 #543 - mentions not linked on editing a post if they contained a ...friendica2014-07-241-0/+9
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-07-248-1026/+1680
|\| |
| * | update to bootstrap-3.2 and minor css adjustmentsmarijus2014-07-248-1026/+1680
* | | add an encoding type to formatted zot communication structures so that we can...friendica2014-07-244-6/+5
|/ /
* | allow jotnets to work with rpostfriendica2014-07-231-1/+1
* | Merge branch 'master' of https://github.com/mrjive/red into mrjive-masterfriendica2014-07-231-1/+1
|\ \
| * | Just a small typomrjive2014-07-241-1/+1
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-07-232-1095/+1154
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/friendica/redJeroen2014-07-236-25/+122
| |\ \ \
| * | | | update nlJeroen2014-07-232-1095/+1154
* | | | | rev updatefriendica2014-07-231-1/+1
| |/ / / |/| | |