aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* missed removing a test casefriendica2015-03-041-1/+1
|
* the link icon on comments now calls the link parsing tool (just like the ↵friendica2015-03-045-2/+39
| | | | main editor window). Eventually the link specific icons (image, link, audio, video) will all be handled by inserting a link using the link icon (here and in the main editor window) and the separate buttons will go away. We also need to tie this to oembed so that there's one place to insert a link - no matter what kind of link it is, and we'll try to find the best way to render that as content. Similarly upload will upload content, no matter what kind of content; and we'll likewise try and figure out the best way to present whatever content was uploaded (img, file, audio, video, whatever).
* Deprecate the "wall uploads" photo album. Photo uploads (from any source) ↵friendica2015-03-042-3/+2
| | | | with no album specified will go now into an album based on YYYY-MM.
* missing commafriendica2015-03-041-1/+1
|
* don't re-use $xfriendica2015-03-041-2/+2
|
* add queue priorityfriendica2015-03-045-3/+34
|
* parse_url: if url returns an image/audio/video file instead of a webpage, ↵friendica2015-03-042-0/+35
| | | | return the bbcode for the appropriate content type. This results in two web fetches of the url in question, but the first one is just a HEAD. This way we won't try and download and parse an entire video. TODO: img's are checked to see if they should be zid-ified, but audio/video currently are not.
* add repo pointersfriendica2015-03-041-0/+9
|
* Merge pull request #917 from dawnbreak/docuRedMatrix2015-03-051481-173508/+66
|\ | | | | remove Doxygen API Documentation from repository.
| * remove Doxygen API Documentation from repository.Klaus Weidenbach2015-03-041481-173508/+66
| | | | | | | | | | | | | | This removes around 14MB and can get easily generate locally by doxygen util/Doxyfile when needed. Restructured .gitignore a bit and some additions like zotshrc, etc. Fixed a typo in doc/main.bb
* | cleanup mail buttonsfriendica2015-03-043-9/+5
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-041-3/+3
|\ \
| * | more on/off switch colour adjustmentMario Vavti2015-03-041-1/+1
| | |
| * | make on/off switches work better with schemesMario Vavti2015-03-041-2/+2
| | |
* | | remove broken sql query from early queue manager.friendica2015-03-041-3/+0
|/ /
* / missed a couplefriendica2015-03-041-0/+2
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-045-45/+55
|\
| * Merge branch 'master' of https://github.com/friendica/redMario Vavti2015-03-042-1/+9
| |\
| * | cleanup removeaccountMario Vavti2015-03-042-22/+22
| | |
| * | cleanup removemeMario Vavti2015-03-043-23/+33
| | |
* | | provide a list of potential addons and what they do for members who can't ↵friendica2015-03-042-2/+59
| |/ |/| | | | | | | | | see the descriptions on the admin/plugins page Not all of these are in red-addons repository, please add any that haven't been listed. We should probably provide a list of addon repositories at the end.
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-043-6/+5
|\|
| * 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.
| | * Some cleanups and documentation.Klaus Weidenbach2015-03-047-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 ↵friendica2015-03-031-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 ↵friendica2015-03-031-5/+7
|/ / | | | | | | we're currently talking to.
* | 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 ↵jeroenpraat2015-03-031-1/+1
| |/ | | | | | | redbasic schema). using link_colour for yes switch didnt work on dark schemas (displayes as white on white).
| * 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 again
| * make public delivery to contacts or any connections work againzottel2015-03-021-3/+2
| | | | | | | | $hash wasn't defined in this case
* | Merge pull request #914 from tuscanhobbit/devPaolo T2015-03-022-3373/+3472
|\ \ | |/ |/| Updated Italian strings
| * Updated Italian stringsPaolo Tacconi2015-03-022-3373/+3472
| |