aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | Merge pull request #297 from tazmandevil/masterThomas Willingham2014-02-021-1/+1
| |\ \ | | | | | | | | link hover colour remains user set link_colour (w/o change default,Mike)
| | * | link hover colour remains user set link_colour (w/o change default,Tazman DeVille2014-02-021-1/+1
| | |/ | | | | | | | | | Mike)
| * / Move CSS out of chat templateThomas Willingham2014-02-022-9/+35
| |/
* / some windows fixesfriendica2014-02-023-10/+21
|/
* add links to change chat status and leave roomfriendica2014-02-024-16/+36
|
* add epub mimetype (application/epub+zip)friendica2014-02-022-1/+2
|
* fix default link colorfriendica2014-02-012-2/+2
|
* Merge https://github.com/friendica/red into zpullfriendica2014-02-015-5/+13
|\
| * Merge pull request #296 from tazmandevil/masterfriendica2014-02-014-3/+11
| |\ | | | | | | link color
| | * user configured link colourTazman DeVille2014-02-022-2/+2
| | |
| | * link coloursTazman DeVille2014-02-021-0/+1
| | |
| | * link colour optionsTazman DeVille2014-02-024-3/+10
| | |
| * | Merge pull request #294 from git-marijus/masterfriendica2014-02-011-2/+2
| |\ \ | | | | | | | | comment out since it is not clear if this is not implemented yet or obsolete
| | * | comment out since it is not clear if this is not implemented yet or obsoletemarijus2014-01-311-2/+2
| | | |
* | | | provide donation options on siteinfo pagefriendica2014-02-012-1/+18
|/ / /
* | | Merge https://github.com/friendica/red into zpullfriendica2014-02-012-1/+18
|\ \ \ | | |/ | |/|
| * | Merge pull request #295 from cvogeley/mastercvogeley2014-02-011-0/+17
| |\ \ | | | | | | | | Press return to post chat posts- SHIFT-RETURN creates line break
| | * | Press return to post chat posts- SHIFT-RETURN creates line breakChristian Vogeley2014-02-011-0/+17
| |/ / | | | | | | | | | on mobile devices keep default behavior
| * | Doc - Make TOS include work.Thomas Willingham2014-02-011-1/+1
| | |
* | | config: don't try to unserialise an arrayfriendica2014-02-011-4/+4
|/ /
* | status indicationfriendica2014-02-012-2/+12
| |