aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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)
* | 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
| |/ / |/| |
* | | some backend JS support for an endless scroll directoryfriendica2014-07-221-3/+68
| | |
* | | standards compliancefriendica2014-07-221-6/+6
| | |
* | | when telling somebody that permissions have changed but not yet submitted, ↵friendica2014-07-223-16/+24
| | | | | | | | | | | | give them a submit button *right there* so they don't have to look for it.
* | | add another important notefriendica2014-07-221-0/+2
| | |
* | | provide ability to blacklist sites from "Discover".friendica2014-07-221-0/+22
|/ /
* | sql string unquotedfriendica2014-07-222-2/+2
| |
* | paranoia tweaksfriendica2014-07-211-2/+6
| |
* | the "page 2 shows up on top of page 1 when you wake up in the morning" bug. ↵friendica2014-07-212-1/+18
| | | | | | | | See the comments.
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-07-2012-5961/+6200
|\ \
| * \ Merge pull request #539 from tuscanhobbit/masterPaolo T2014-07-1912-5961/+6200
| |\ \ | | |/ | |/| IT: updated strings
| | * IT: updated stringstuscanhobbit2014-07-1912-5961/+6200
| |/
* | add more control to auth paranoia settingfriendica2014-07-203-761/+822
| |
* | doc updatesfriendica2014-07-2092-960/+1625
| |
* | correct the permissions on profile pagefriendica2014-07-171-1/+1
|/
* ensure that we don't have permission settings issues due to version skew ↵friendica2014-07-171-1/+1
| | | | across sites.
* provide a specific permission for liking profiles (reuse the obsolete ↵friendica2014-07-179-28/+56
| | | | bookmark permission), also remove the unused 'unconnected contacts' view for now.
* better handling of interactive likesfriendica2014-07-172-14/+19
|
* confirm that something was done.friendica2014-07-171-0/+8
|
* make mod_like interactive if requestedfriendica2014-07-172-10/+44
|
* collection sync issuefriendica2014-07-171-0/+25
|