aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * fix wordingMario Vavti2015-03-043-6/+5
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-044-49/+51
|\|
| * clean up account settingsMario Vavti2015-03-042-29/+20
| * Accordionize feature settingsMario Vavti2015-03-042-20/+31
* | notes on what's needed to fix the queueing algorithms.friendica2015-03-042-1/+9
|/
* add the tag hijacking preference to Diaspora settingsfriendica2015-03-033-4/+17
* enable sql_extra on pdl_selectorfriendica2015-03-031-2/+2
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-037-175/+174
|\
| * Merge pull request #916 from dawnbreak/docuRedMatrix2015-03-047-175/+174
| |\
| | * Some cleanups and documentation.Klaus Weidenbach2015-03-047-175/+174
* | | I'm going to use the site_update timestamp to indicate whenever we successful...friendica2015-03-031-0/+15
* | | don't let a zot-finger bring a dead hub back to life unless it's the site we'...friendica2015-03-031-5/+7
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-034-23/+17
|\ \
| * | yes switch to bootstrap blue again (same as link colour in default light redb...jeroenpraat2015-03-031-1/+1
| |/
| * revert login max-widthMario Vavti2015-03-031-1/+1
| * login adjustmentMario Vavti2015-03-033-19/+9
| * typoMario Vavti2015-03-031-1/+1
| * make remove channel button work againMario Vavti2015-03-032-4/+8
* | group/collection edit page cleanupfriendica2015-03-034-7/+6
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-023-90/+34
|\
| * Merge branch 'master' of https://github.com/friendica/redMario Vavti2015-03-023-13/+13
| |\
| * | some more work on settingsMario Vavti2015-03-023-90/+34
* | | automated warning after a few days if poller is deadfriendica2015-03-023-0/+63
| |/ |/|
* | tagcloud tweaksfriendica2015-03-023-13/+13
|/
* Merge pull request #915 from zzottel/masterRedMatrix2015-03-021-3/+2
|\
| * make public delivery to contacts or any connections work againzottel2015-03-021-3/+2
* | Merge pull request #914 from tuscanhobbit/devPaolo T2015-03-022-3373/+3472
|\ \ | |/ |/|
| * Updated Italian stringsPaolo Tacconi2015-03-022-3373/+3472
* | increase the dynamic range of the tag clouds slightly.friendica2015-03-011-1/+1
* | here's the email templatefriendica2015-03-011-0/+20
* | Nag hub admins with self-signed certs to fix them. Otherwise we'll just have ...friendica2015-03-012-0/+35
* | raise the default upload limit for the application. We eliminated this in Eng...friendica2015-03-019-9/+9
* | The never ending saga of parent = 0 bugs on Dreamhost.friendica2015-03-012-1/+11
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-0122-6272/+6486
|\ \
| * | settings: missing /form and whitespaceMario Vavti2015-03-011-133/+129
| * | more settings workMario Vavti2015-03-013-160/+191
| * | provide some more yes/no labelsMario Vavti2015-03-011-29/+31
| * | fix loginMario Vavti2015-03-012-86/+18
| * | first pile of work on settingsMario Vavti2015-03-0118-161/+80
| * | Merge branch 'master' of https://github.com/friendica/redMario Vavti2015-02-282-5845/+6180
| |\ \
| | * | Dutch language updatedjeroenpraat2015-02-282-5845/+6180
| * | | some css fixes for settingsMario Vavti2015-02-282-6/+5
| |/ /
* / / queue management actions. Still needs further work such as indication of last...friendica2015-03-015-12/+49
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-02-275-448/+525
|\ \
| * \ Merge pull request #913 from zzottel/masterzzottel2015-02-273-4/+11
| |\ \
| | * | update German help files to current English contentszottel2015-02-272-3/+10
| | * | fix link to siteinfo/jsonzottel2015-02-271-1/+1
| |/ /
| * | Merge pull request #912 from zzottel/masterzzottel2015-02-272-444/+514
| |\ \
| | * | update to German stringszottel2015-02-272-444/+514
| |/ /
* | | Fix a couple of places where we weren't checking for dead hublocs. Add a func...friendica2015-02-274-2352/+2394