Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Show profile on openid server page | friendica | 2015-03-15 | 1 | -0/+4 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-15 | 2 | -7/+12 |
|\ | |||||
| * | assure that badges will be displayed as circles no matter what font is used ↵ | Mario Vavti | 2015-03-14 | 2 | -7/+12 |
| | | | | | | | | and if there is only one digit inside. move css to its proper place | ||||
* | | mysql schema typo, do the install check for store before chcking smarty, as ↵ | friendica | 2015-03-15 | 4 | -6/+6 |
|/ | | | | that is where the dir is created, change install doc to point to install/schema_xxxxx.sql instead of database.sql | ||||
* | revert the revert - that is working. My test was bad. | friendica | 2015-03-14 | 1 | -3/+3 |
| | |||||
* | revert and rethink | friendica | 2015-03-14 | 2 | -4/+4 |
| | |||||
* | create terms for Diaspora mention tags - which in Diaspora are handled ↵ | friendica | 2015-03-13 | 2 | -9/+103 |
| | | | | differently than other tag links and have to be done separately; they aren't processed by linkify_tags which handles all of our other tag processing. Also move the abook_channel clause in mod_network to the join statement. This works fine in mysql and achievies the desired result. I hope postgres can handle an expression as a join clause. | ||||
* | Merge pull request #929 from zzottel/master | RedMatrix | 2015-03-14 | 1 | -3/+3 |
|\ | | | | | fix posts not showing up in network if author is not in connections | ||||
| * | fix posts not showing up in network if author is not in connections | zottel | 2015-03-14 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #928 from dawnbreak/docu | RedMatrix | 2015-03-14 | 2 | -29/+69 |
|\ \ | |/ |/| | Some documentation, fix chatroom service class lookup. | ||||
| * | Some documentation, fix chatroom service class lookup. | Klaus Weidenbach | 2015-03-14 | 2 | -29/+69 |
| | | | | | | | | | | Add some Doxygen documentation and fixing a service class lookup for chatroom_create(). | ||||
* | | use local_channel() connnections to match the abook against when joining the ↵ | friendica | 2015-03-13 | 1 | -2/+2 |
| | | | | | | | | abook on the discover tab. | ||||
* | | make nav badges big enough to be clickable on small touch devices | friendica | 2015-03-13 | 1 | -0/+5 |
| | | |||||
* | | invoke tgroup_check() on diaspora posts/comments in case the recipient is a ↵ | friendica | 2015-03-13 | 1 | -19/+34 |
|/ | | | | forum with channel_w_stream permissions restricted. | ||||
* | update to-do list | friendica | 2015-03-13 | 3 | -3962/+2153 |
| | |||||
* | revert that | friendica | 2015-03-12 | 1 | -4/+25 |
| | |||||
* | try to allow translation of ax regs | friendica | 2015-03-12 | 1 | -29/+52 |
| | |||||
* | support a fair number of the common AX regs | friendica | 2015-03-12 | 1 | -5/+68 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-12 | 3 | -68/+99 |
|\ | |||||
| * | Merge pull request #927 from dawnbreak/master | RedMatrix | 2015-03-13 | 3 | -68/+99 |
| |\ | | | | | | | Some cleanups and a bugfix. | ||||
| | * | Some cleanups. | Klaus Weidenbach | 2015-03-13 | 3 | -68/+99 |
| | | | | | | | | | | | | | | | | | | Fixed dbesc_identifier(), but it is not used yet. Corrected some other variable names and variable initialization before using them. | ||||
* | | | Add some AX vars to openid server. | friendica | 2015-03-12 | 1 | -11/+28 |
|/ / | |||||
* | | more JS=1 weirdness | friendica | 2015-03-12 | 1 | -1/+1 |
| | | |||||
* | | reduce the occurrence of duplicated notice() messages | friendica | 2015-03-12 | 1 | -5/+8 |
| | | |||||
* | | prepare for demise of google code | friendica | 2015-03-12 | 2 | -1/+9 |
| | | |||||
* | | try and add some regs | friendica | 2015-03-12 | 2 | -1/+3 |
| | | |||||
* | | Merge pull request #926 from dawnbreak/master | Klaus | 2015-03-12 | 1 | -56/+46 |
|\| | | | | | Fix JavaScript problems on channels where you are not allowed to upload ... | ||||
| * | Fix JavaScript problems on channels where you are not allowed to upload photos. | Klaus Weidenbach | 2015-03-12 | 1 | -56/+46 |
|/ | | | | | | Add some try...catch blocks around JavaScript that throws errors. This commit should fix the current problems that were introduced by an earlier commit. | ||||
* | add generic_addon_settings template and minor fixes | Mario Vavti | 2015-03-12 | 3 | -2/+19 |
| | |||||
* | Merge branch 'master' of https://github.com/friendica/red | Mario Vavti | 2015-03-12 | 1 | -1/+1 |
|\ | |||||
| * | substr() is a mysql alias for substring(). substring() is in the SQL ↵ | Habeas Codice | 2015-03-12 | 1 | -1/+1 |
| | | | | | | | | | | | | standard and is supported by both databases. | ||||
* | | some work on feature/addon settings | Mario Vavti | 2015-03-12 | 3 | -43/+32 |
|/ | |||||
* | openid stuff | friendica | 2015-03-11 | 2 | -36/+50 |
| | |||||
* | Merge branch 'master' into openid | friendica | 2015-03-11 | 14 | -25/+105 |
|\ | |||||
| * | remove the now redundant audio/video buttons and label the editor text style ↵ | friendica | 2015-03-11 | 8 | -11/+36 |
| | | | | | | | | buttons which didn't have them. Unused editor buttons were commented in case we need to bring them back. If things go smoothly we can remove them. Use the link icon going forward - for all links. | ||||
| * | Merge pull request #925 from unary/fixinsert | RedMatrix | 2015-03-12 | 1 | -1/+1 |
| |\ | | | | | | | add missing %d for abook_closeness | ||||
| | * | add missing %d for abook_closeness | Michael Johnston | 2015-03-11 | 1 | -1/+1 |
| | | | |||||
| * | | make embeds bookmarkable | friendica | 2015-03-11 | 1 | -1/+1 |
| | | | |||||
| * | | turn parse_url into the definitive url attaching mechanism | friendica | 2015-03-11 | 2 | -3/+35 |
| | | | |||||
| * | | parse_url changes for oembed/zvideo/etc. | friendica | 2015-03-11 | 1 | -8/+22 |
| |/ | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-11 | 1 | -1/+4 |
| |\ | |||||
| | * | update sample-nginx.conf redirect to check for args | Mario Vavti | 2015-03-11 | 1 | -1/+4 |
| | | | |||||
| * | | don't relay diaspora comments to sys channel | friendica | 2015-03-11 | 1 | -0/+6 |
| |/ | |||||
* | | Merge branch 'master' into openid | friendica | 2015-03-11 | 12 | -177/+16 |
|\| | |||||
| * | skip trying to come up with an intelligent way to decide what photos should ↵ | friendica | 2015-03-11 | 2 | -20/+2 |
| | | | | | | | | get a status post - leave it manual. | ||||
| * | cleanup of old delegation stuff | friendica | 2015-03-10 | 6 | -152/+5 |
| | | |||||
| * | allow urls using the zot: or zots: URL schemes to exist without getting ↵ | friendica | 2015-03-10 | 1 | -1/+1 |
| | | | | | | | | filtered away. | ||||
| * | sql optimisation for affinity searches. A new index was added which wasn't ↵ | friendica | 2015-03-10 | 3 | -4/+8 |
| | | | | | | | | added retro-actively to existing DBs as an update. It isn't clear if this helps sites any more than just restricting the abook table to certain channel_id's is (and this field is already indexed). | ||||
* | | openid server | friendica | 2015-03-11 | 1 | -0/+237 |
| | | |||||
* | | first cut openid server. Mostly just getting it architecturally prepared - ↵ | friendica | 2015-03-10 | 1 | -1/+1 |
|/ | | | | as there may be a few twists and turns ahead. |