aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cleanup - nothing morefriendica2014-02-051-3/+3
|
* fix auto-add of bookmarks to find sender correctly and optionally auto add ↵friendica2014-02-051-4/+10
| | | | bookmarks for self
* Merge https://github.com/friendica/red into zpullfriendica2014-02-053-2/+72
|\
| * Merge pull request #298 from cvogeley/masterfriendica2014-02-061-2/+13
| |\ | | | | | | Other not so elegant way of detecting touch screen devices
| | * Other not so elegant way of detecting touch screen devicesChristian Vogeley2014-02-021-2/+13
| | | | | | | | | | | | But at least it seems to work
| * | Merge pull request #302 from git-marijus/masterfriendica2014-02-062-0/+59
| |\ \ | | | | | | | | add a sanitized style tag to bbcode
| | * | add a sanitized style tag to bbcodemarijus2014-02-052-0/+59
| | | |
| | * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-0523-26/+244
| | |\ \ | | |/ / | |/| |
| | * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-0412-1161/+1270
| | |\ \
| | * \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-032-37/+1
| | |\ \ \
| | * \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-0319-95/+221
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-023-10/+21
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-021-10/+8
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-023-10/+36
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-0213-24/+87
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-0197-2342/+3605
| | |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | | This would be about the 75th attempt to try and prevent duplicated email ↵friendica2014-02-051-1/+10
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifications for comments. Eventually we'll find something that works.
* | | | | | | | | | | preserve system bit when editing menusfriendica2014-02-052-1/+8
| | | | | | | | | | |
* | | | | | | | | | | bookmarking bugfixfriendica2014-02-052-7/+10
| | | | | | | | | | |
* | | | | | | | | | | bookmark debug loggingfriendica2014-02-053-7/+9
| | | | | | | | | | |
* | | | | | | | | | | make links in comments bookmark-ablefriendica2014-02-044-5/+11
| | | | | | | | | | |
* | | | | | | | | | | add icon translation for new iconfriendica2014-02-041-0/+1
| | | | | | | | | | |
* | | | | | | | | | | bookmarks - mop up and go homefriendica2014-02-049-5/+66
| | | | | | | | | | |
* | | | | | | | | | | bookmarkingfriendica2014-02-047-15/+126
| | | | | | | | | | |
* | | | | | | | | | | fix the search for system bookmarksfriendica2014-02-041-3/+9
| | | | | | | | | | |
* | | | | | | | | | | Merge https://github.com/friendica/red into zpullfriendica2014-02-042-1134/+1188
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #301 from tobiasd/20140204tobiasd2014-02-032-1134/+1188
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | DE: update to the strings
| | * | | | | | | | | | DE: update to the stringsTobias Diekershoff2014-02-042-1134/+1188
| |/ / / / / / / / / /
* / / / / / / / / / / bookmark permissionsfriendica2014-02-048-4/+25
|/ / / / / / / / / /
* | | | | | | | | | photo tagging somewhat working - but can't remove photo tags until we update ↵friendica2014-02-032-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tagrm
* | | | | | | | | | some tagging fixes - including old bugs which were never reportedfriendica2014-02-032-6/+6
| | | | | | | | | |
* | | | | | | | | | transmit, receive, and parse bookmarksfriendica2014-02-034-10/+39
| | | | | | | | | |
* | | | | | | | | | accept new connection broke yesterdayfriendica2014-02-034-4/+10
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | code cleanup - remove some unused functionsfriendica2014-02-032-37/+1
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | The problem with a lot of packages is that it's easier to re-write them than ↵friendica2014-02-022-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to re-use them.
* | | | | | | | more wordsmithingfriendica2014-02-021-1/+1
| | | | | | | |
* | | | | | | | changed order of the privacy macros so that the dangerous settings come last ↵friendica2014-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and the preferred settings come first
* | | | | | | | don't load any configs from DB if installing - especially in style.pcssfriendica2014-02-023-6/+11
| | | | | | | |
* | | | | | | | wordsmithingfriendica2014-02-021-4/+4
| | | | | | | |
* | | | | | | | don't draw attention to advanced permissions and their corresponding ↵friendica2014-02-026-24/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | complexity and clearly mark the simple permissions which people are encouraged to use.
* | | | | | | | Merge pull request #300 from tazmandevil/masterfriendica2014-02-022-3/+43
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | added Thomas' additional navbar colours from APW to redbasic
| * | | | | | | | added Thomas' additional navbar colours from APW to redbasicTazman DeVille2014-02-032-3/+43
|/ / / / / / / /
* | | | | | | | minor text change "can" -> "may"friendica2014-02-021-2/+2
| | | | | | | |
* | | | | | | | Add switch to allow menus to be used as bookmark collectionsfriendica2014-02-023-2/+6
| | | | | | | |
* | | | | | | | remove the text "requires compatible chat plugin"friendica2014-02-021-1/+1
| | | | | | | |
* | | | | | | | make chat honour the pause key (but we still need to ping the server to ↵friendica2014-02-023-51/+55
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | maintain the in_room status), also the recent change to pull css out of the template file used classes instead of ids so none of the styles were sticking
* | | | | | | better check for setup modulefriendica2014-02-021-1/+1
| | | | | | |
* | | | | | | Merge https://github.com/friendica/red into zpullfriendica2014-02-024-20/+44
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge pull request #299 from toclimb/smilies-fixfriendica2014-02-021-10/+8
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | More efficient smilie replacing (see pull request #291)
| | * | | | | More efficient smilie replacingtoclimb2014-02-021-10/+8
| | | |_|/ / | | |/| | |