aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Issue #590: Linked conversation titles to source. jeroenpraat2014-09-121-1/+1
| | | If a theme wants to have it different, it can always copy this .tpl file to ../theme/tpl/. I didn't commit this directly, because it's a little bit controversial. But I like it!
* Update nl. Added a link from the edit profile page to the edit visibility page.Jeroen2014-08-015-4155/+3995
|
* Merge pull request #550 from tuscanhobbit/masterPaolo T2014-08-0111-1230/+1258
|\ | | | | IT: updated strings
| * IT: updated stringsPaolo Tacconi2014-08-0111-1230/+1258
| |
* | 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 ↵Jeroen2014-07-311-2/+2
| | | | | | | | | | | | | | | | https://github.com/friendica/red/commit/994b6b5258856a97cf6863de74e5a8baddf59b49
* | | | 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, ↵friendica2014-07-295-4/+24
| | | | | | | | since the password is required to remove a channel. Somebody looking at an open session on somebody else's computer can simply change the password and then proceed to maliciously remove the channel. This change gives the owner 2 days to discover that something is wrong and recover his/her password and potentially save their channel from getting erased by the vandal. This is most likely to happen if a relationship has gone bad, or something incriminating was found in your private messages when you left your computer briefly unattended.
* | 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 ↵Jeroen2014-07-293-10/+10
| | | | | | | | size to 1.0rem. This respects the user's browser font settings. Please comment if this changes the font sizes to much. There are some other font sizes that need to be changed to a scalable size (like btn-xs), but they don't have a priority. First see if this works. - Also made it possible for users to zoom on smart devices. - Small update to Redable. Aside is now disabled on almost all tablets in portrait mode.
* | Merge pull request #548 from tuscanhobbit/masterRedMatrix2014-07-292-0/+21
|\| | | | | Chatroom lines are deleted after a while or the chat becomes slow to load
| * 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
| | | | | | | | to load
* | 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 ↵Jeroen2014-07-282-3/+2
| | | | | | | | | | | | https://github.com/friendica/red/commit/075fc6727762d4e45ddcae5843eec0100ad3ab72 - Also fixed empty delete button showing up for channels without edit photo rights.
* | | 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 ↵friendica2014-07-271-0/+2
| | | | | | | | instead of bottom)
* | Improved photo view page. Added a delete button, stylized other button and ↵Jeroen2014-07-275-13/+59
| | | | | | | | rearangend divs a but. I even made a javascript function (copied is the right word). I changed the application (non-posts) font size (temporary) to 14px, same as button (btn) font size. I like to change all font sizes to 1.0rem (posts) and 0.8rem (application) in the near future, but I will test that first on my hub.
* | 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 ↵friendica2014-07-2422-5992/+6892
|\ \ \ | | | | | | | | | | | | RedMatrixCanada-master
| * | | 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
| | | | | | | | | | | | forum indicator.
* | | 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 ↵friendica2014-07-244-6/+5
|/ / | | | | | | can later add alternate encodings.
* | 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
|\ \ | | | | | | | | | | | | Conflicts: view/it/messages.po
| * | Just a small typomrjive2014-07-241-1/+1
| | | | | | | | | Fixed a small typo (and also to try if I'm doing right)