Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-10 | 3 | -32/+28 |
|\ | |||||
| * | Merge pull request #685 from zzottel/master | RedMatrix | 2014-11-11 | 1 | -3/+3 |
| |\ | | | | | | | set channel_w_stream to 0 for forum roles | ||||
| | * | set channel_w_stream to 0 for forum roles | zottel | 2014-11-10 | 1 | -3/+3 |
| | | | |||||
| * | | Merge pull request #686 from beardy-unixer/master | RedMatrix | 2014-11-11 | 2 | -29/+25 |
| |\ \ | | | | | | | | | Add a new theme flag - library. Not directly available to be used itsel... | ||||
| | * | | Add a new theme flag - library. Not directly available to be used itself but | Thomas Willingham | 2014-11-10 | 2 | -29/+25 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installed as a lib for other themes. Like SDL, or GTK. Get rid of mobility - it's better done with Comanche and schemas. Describe themes instead of restricting them. Mobile themes can be used as the desktop theme and vice-versa. This deals with the problem of "but my device is something inbetween". Presently not exposed to members. | ||||
* | / | issue #683 - don't linkify homepage field without validating | friendica | 2014-11-10 | 3 | -1/+5 |
|/ / | |||||
* | | indicate public forums in directory results (there will be some [possibly ↵ | friendica | 2014-11-10 | 4 | -4/+16 |
| | | | | | | | | considerable] lag time before existing forums are correctly tagged). | ||||
* | | add public forum identification to libzot. No attempt is made to identify ↵ | friendica | 2014-11-10 | 3 | -2/+23 |
| | | | | | | | | other types of forums or weird custom channel permissions. If the channel is auto-accept and taggable, it's a public forum. | ||||
* | | class is a reserved word | friendica | 2014-11-10 | 3 | -6/+6 |
|/ | |||||
* | add defaults to database tables | friendica | 2014-11-09 | 2 | -190/+2467 |
| | |||||
* | menu page cleanup | friendica | 2014-11-09 | 3 | -16/+21 |
| | |||||
* | remove extraneous logging | friendica | 2014-11-09 | 1 | -4/+1 |
| | |||||
* | directory listing shows phantom keywords | friendica | 2014-11-09 | 2 | -2/+4 |
| | |||||
* | Merge pull request #682 from pafcu/master | RedMatrix | 2014-11-09 | 1 | -1/+1 |
|\ | | | | | Use consistent terminology for channel directory | ||||
| * | Use consistent terminology for channel directory | Stefan Parviainen | 2014-11-09 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #681 from pafcu/master | RedMatrix | 2014-11-09 | 5 | -241/+96 |
|\| | | | | | New layout for directory | ||||
| * | New layout for directory | Stefan Parviainen | 2014-11-09 | 5 | -241/+96 |
| | | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-08 | 13 | -6235/+6474 |
|\ \ | |||||
| * | | prevent posting before acl got populated since this will disregard the ↵ | marijus | 2014-11-08 | 6 | -10/+11 |
| | | | | | | | | | | | | default acl setting and the post will be visible to the default audience without warning. the chance that this happens is quite small while writing a post but can easily happen on eg editing photos (maybe just tick a checkbox and press submit). the acl and submit buttons are disabled by default and will be activated as soon as acl is populated. | ||||
| * | | Merge pull request #680 from pafcu/master | RedMatrix | 2014-11-09 | 2 | -2/+6 |
| |\| | | | | | | | Some hlighlighting on hover | ||||
| | * | Fix merge conflict | Stefan Parviainen | 2014-11-08 | 315 | -13484/+19854 |
| | |\ | | |/ | |/| | |||||
| * | | Document reinstalling, or saying don't do that without explicitly stating ↵ | Thomas Willingham | 2014-11-08 | 1 | -2/+10 |
| | | | | | | | | | | | | don't do that. | ||||
| * | | Merge pull request #678 from zzottel/master | zzottel | 2014-11-07 | 2 | -3/+4 |
| |\ \ | | | | | | | | | update to German help files | ||||
| | * | | update to German help files | zottel | 2014-11-07 | 2 | -3/+4 |
| | | | | |||||
| * | | | Merge pull request #677 from zzottel/master | zzottel | 2014-11-07 | 2 | -6218/+6443 |
| |\| | | | | | | | | | | update to German strings | ||||
| | * | | update to German strings | zottel | 2014-11-07 | 2 | -6218/+6443 |
| |/ / | |||||
| | * | Highlight badge on hover | Stefan Parviainen | 2014-11-08 | 1 | -0/+4 |
| | | | |||||
| | * | Fix highlighting of login button | Stefan Parviainen | 2014-11-08 | 1 | -2/+2 |
| | | | |||||
* | | | add acl loading fix to menu-item edits | friendica | 2014-11-08 | 2 | -2/+2 |
|/ / | |||||
* | | tgroup_check - decrypt if obscured before checking body text for reshares | friendica | 2014-11-07 | 1 | -1/+9 |
| | | |||||
* | | revert that bit | friendica | 2014-11-07 | 1 | -7/+1 |
| | | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-07 | 2 | -6/+7 |
|\ \ | |||||
| * | | provide lockstate for photo edit | marijus | 2014-11-07 | 2 | -6/+7 |
| | | | |||||
* | | | fix broken photo edits when adult flag is changed | friendica | 2014-11-07 | 1 | -8/+7 |
| | | | |||||
* | | | rev update | friendica | 2014-11-07 | 2 | -522/+609 |
| | | | |||||
* | | | doc updates | friendica | 2014-11-07 | 102 | -406/+1576 |
|/ / | |||||
* | | include self in load_contact_links so you don't get a connect menu entry for ↵ | friendica | 2014-11-06 | 1 | -3/+2 |
| | | | | | | | | yourself | ||||
* | | Merge pull request #676 from magicoli/master | RedMatrix | 2014-11-07 | 2 | -6/+6 |
|\ \ | | | | | | | fix nbsp tag typoes in french translation | ||||
| * | | fix nbsp tag typoes in french translation | Olivier van Helden (hal) | 2014-11-07 | 2 | -6/+6 |
|/ / | |||||
* | | visible flag reversed | friendica | 2014-11-06 | 1 | -1/+1 |
| | | |||||
* | | Provide a way to mark photos as adult and hide them from the default album ↵ | friendica | 2014-11-06 | 4 | -32/+45 |
| | | | | | | | | view. Still need a button or setting to enable "unsafe viewing". This has no effect anywhere but in the album views. They can still be viewed by flipping through the individual photos with 'prev' and 'next'. We probably need a comprehensive strategy for how to deal with n-s-f-w photos in albums so consider this a band-aid which requires additional work and integration with other facilities which access these photos. It is entirely optional. | ||||
* | | Merge pull request #675 from zzottel/master | RedMatrix | 2014-11-07 | 1 | -3/+3 |
|\ \ | | | | | | | don't overwrite $x (contains import_xchan result) with role permissions | ||||
| * | | don't overwrite $x (contains import_xchan result) with role permissions | zottel | 2014-11-06 | 1 | -3/+3 |
|/ / | |||||
* | | provide a lockstate for photo uploads | marijus | 2014-11-06 | 1 | -1/+4 |
| | | |||||
* | | make sure the "tagcloud" actually shows hashtags. So we don't confuse folks ↵ | friendica | 2014-11-06 | 1 | -1/+1 |
| | | | | | | | | with categories. | ||||
* | | category tagblock | friendica | 2014-11-06 | 3 | -1/+34 |
| | | |||||
* | | logging changes, untranslated string | friendica | 2014-11-05 | 2 | -4/+4 |
| | | |||||
* | | crude skeleton for location manager and the UI sucks but at least it's on a ↵ | friendica | 2014-11-05 | 3 | -28/+71 |
| | | | | | | | | webpage and you don't have to do it by hand. | ||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-05 | 1 | -1/+1 |
|\ \ | |||||
| * | | Merge pull request #674 from pafcu/master | RedMatrix | 2014-11-06 | 1 | -1/+1 |
| |\| | | | | | | | Fix duplicate element id |