Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/friendica/red | Mario Vavti | 2015-03-04 | 2 | -1/+9 |
|\ | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-04 | 3 | -6/+5 |
| |\ | |||||
| * \ | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-04 | 4 | -49/+51 |
| |\ \ | |||||
| * | | | notes on what's needed to fix the queueing algorithms. | friendica | 2015-03-04 | 2 | -1/+9 |
| | | | | |||||
* | | | | cleanup removeaccount | Mario Vavti | 2015-03-04 | 2 | -22/+22 |
| | | | | |||||
* | | | | cleanup removeme | Mario Vavti | 2015-03-04 | 3 | -23/+33 |
| |_|/ |/| | | |||||
* | | | fix wording | Mario Vavti | 2015-03-04 | 3 | -6/+5 |
| |/ |/| | |||||
* | | clean up account settings | Mario Vavti | 2015-03-04 | 2 | -29/+20 |
| | | |||||
* | | Accordionize feature settings | Mario Vavti | 2015-03-04 | 2 | -20/+31 |
|/ | |||||
* | add the tag hijacking preference to Diaspora settings | friendica | 2015-03-03 | 3 | -4/+17 |
| | |||||
* | enable sql_extra on pdl_selector | friendica | 2015-03-03 | 1 | -2/+2 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-03 | 7 | -175/+174 |
|\ | |||||
| * | Merge pull request #916 from dawnbreak/docu | RedMatrix | 2015-03-04 | 7 | -175/+174 |
| |\ | | | | | | | Some cleanups and documentation. | ||||
| | * | Some cleanups and documentation. | Klaus Weidenbach | 2015-03-04 | 7 | -175/+174 |
| | | | | | | | | | | | | | | | | | | | | | Fixed some wrong variable names. Initialized some variables before using them. Removed some checks for STATUSNET_PRIVACY_COMPATIBILITY in include/security.php as it does not seem to be defined anywhere. | ||||
* | | | I'm going to use the site_update timestamp to indicate whenever we ↵ | friendica | 2015-03-03 | 1 | -0/+15 |
| | | | | | | | | | | | | successfully connect with a site. This way we can mark hubs dead on non-directory servers; but we have to wait before implementing this until we have a history of site_update being updated. | ||||
* | | | don't let a zot-finger bring a dead hub back to life unless it's the site ↵ | friendica | 2015-03-03 | 1 | -5/+7 |
|/ / | | | | | | | we're currently talking to. | ||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-03 | 4 | -23/+17 |
|\ \ | |||||
| * | | yes switch to bootstrap blue again (same as link colour in default light ↵ | jeroenpraat | 2015-03-03 | 1 | -1/+1 |
| |/ | | | | | | | redbasic schema). using link_colour for yes switch didnt work on dark schemas (displayes as white on white). | ||||
| * | revert login max-width | Mario Vavti | 2015-03-03 | 1 | -1/+1 |
| | | |||||
| * | login adjustment | Mario Vavti | 2015-03-03 | 3 | -19/+9 |
| | | |||||
| * | typo | Mario Vavti | 2015-03-03 | 1 | -1/+1 |
| | | |||||
| * | make remove channel button work again | Mario Vavti | 2015-03-03 | 2 | -4/+8 |
| | | |||||
* | | group/collection edit page cleanup | friendica | 2015-03-03 | 4 | -7/+6 |
|/ | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-02 | 3 | -90/+34 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/friendica/red | Mario Vavti | 2015-03-02 | 3 | -13/+13 |
| |\ | |||||
| * | | some more work on settings | Mario Vavti | 2015-03-02 | 3 | -90/+34 |
| | | | |||||
* | | | automated warning after a few days if poller is dead | friendica | 2015-03-02 | 3 | -0/+63 |
| |/ |/| | |||||
* | | tagcloud tweaks | friendica | 2015-03-02 | 3 | -13/+13 |
|/ | |||||
* | Merge pull request #915 from zzottel/master | RedMatrix | 2015-03-02 | 1 | -3/+2 |
|\ | | | | | make public delivery to contacts or any connections work again | ||||
| * | make public delivery to contacts or any connections work again | zottel | 2015-03-02 | 1 | -3/+2 |
| | | | | | | | | $hash wasn't defined in this case | ||||
* | | Merge pull request #914 from tuscanhobbit/dev | Paolo T | 2015-03-02 | 2 | -3373/+3472 |
|\ \ | |/ |/| | Updated Italian strings | ||||
| * | Updated Italian strings | Paolo Tacconi | 2015-03-02 | 2 | -3373/+3472 |
| | | |||||
* | | increase the dynamic range of the tag clouds slightly. | friendica | 2015-03-01 | 1 | -1/+1 |
| | | |||||
* | | here's the email template | friendica | 2015-03-01 | 1 | -0/+20 |
| | | |||||
* | | Nag hub admins with self-signed certs to fix them. Otherwise we'll just have ↵ | friendica | 2015-03-01 | 2 | -0/+35 |
| | | | | | | | | | | | | to start marking them as dead sites. | ||||
* | | raise the default upload limit for the application. We eliminated this in ↵ | friendica | 2015-03-01 | 9 | -9/+9 |
| | | | | | | | | English long ago, but several of the translated htconfig files still have the old limit. | ||||
* | | The never ending saga of parent = 0 bugs on Dreamhost. | friendica | 2015-03-01 | 2 | -1/+11 |
| | | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-01 | 22 | -6272/+6486 |
|\ \ | |||||
| * | | settings: missing /form and whitespace | Mario Vavti | 2015-03-01 | 1 | -133/+129 |
| | | | |||||
| * | | more settings work | Mario Vavti | 2015-03-01 | 3 | -160/+191 |
| | | | |||||
| * | | provide some more yes/no labels | Mario Vavti | 2015-03-01 | 1 | -29/+31 |
| | | | |||||
| * | | fix login | Mario Vavti | 2015-03-01 | 2 | -86/+18 |
| | | | |||||
| * | | first pile of work on settings | Mario Vavti | 2015-03-01 | 18 | -161/+80 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/friendica/red | Mario Vavti | 2015-02-28 | 2 | -5845/+6180 |
| |\ \ | |||||
| | * | | Dutch language updated | jeroenpraat | 2015-02-28 | 2 | -5845/+6180 |
| | | | | |||||
| * | | | some css fixes for settings | Mario Vavti | 2015-02-28 | 2 | -6/+5 |
| |/ / | |||||
* / / | queue management actions. Still needs further work such as indication of ↵ | friendica | 2015-03-01 | 5 | -12/+49 |
|/ / | | | | | | | last successful connection or indication that the hub was marked offline, but these are potentially expensive queries. | ||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-02-27 | 5 | -448/+525 |
|\ \ | |||||
| * \ | Merge pull request #913 from zzottel/master | zzottel | 2015-02-27 | 3 | -4/+11 |
| |\ \ | | | | | | | | | update German help and fix a link in main.bb | ||||
| | * | | update German help files to current English contents | zottel | 2015-02-27 | 2 | -3/+10 |
| | | | |