Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-17 | 2 | -30/+32 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Merge pull request #697 from pafcu/master | RedMatrix | 2014-11-18 | 1 | -25/+28 | |
| |\ \ \ | | | |/ | | |/| | Fix dirsearch parser to not get confused by logic terms in values and to ... | |||||
| | * | | Fix dirsearch parser to not get confused by logic terms in names and to ↵ | Stefan Parviainen | 2014-11-17 | 1 | -25/+28 | |
| | | | | | | | | | | | | | | | | handle quoted single word names | |||||
| * | | | Merge pull request #695 from pafcu/master | RedMatrix | 2014-11-18 | 1 | -5/+4 | |
| |\| | | | | | | | | | | Switch to a better datetime picker widget | |||||
| | * | | Switch to a better datetime picker widget | Stefan Parviainen | 2014-11-16 | 1 | -5/+4 | |
| | | | | ||||||
* | | | | whitespace | friendica | 2014-11-17 | 1 | -7/+7 | |
| | | | | ||||||
* | | | | add unseen count and way to mark unseen to list mode. Also fix automatic ↵ | friendica | 2014-11-17 | 2 | -10/+35 | |
|/ / / | | | | | | | | | | mark of unseen so as to work with list mode. | |||||
* | | | allow somebody to access the "home page content" (whatever that may be) even ↵ | friendica | 2014-11-16 | 1 | -23/+25 | |
| | | | | | | | | | | | | after logging in by including a home/splash argument. It appears that nothing else is required to provide 'sys' channel webpage contents except a link in the admin page to create them. There *may* be an issue with comanche theme selection but we'll cross that bridge when we come to it. Also thinking that we might want to map /home/foo to /page/sys/foo in the longer term scheme of things. | |||||
* | | | module cleanup | friendica | 2014-11-16 | 1 | -106/+109 | |
| | | | ||||||
* | | | blog/list mode display settings | friendica | 2014-11-16 | 1 | -0/+10 | |
| | | | ||||||
* | | | "list mode" (forum and blog mode, no comments or comment boxes displayed on ↵ | friendica | 2014-11-16 | 2 | -2/+13 | |
|/ / | | | | | | | the summary page) | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-15 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | fix lost $sql_extra in recent sql query changes | marijus | 2014-11-15 | 1 | -1/+1 | |
| | | | ||||||
* | | | minor changes to support forum mode | friendica | 2014-11-15 | 1 | -4/+0 | |
|/ / | ||||||
* | | Merge pull request #691 from dawnbreak/master | RedMatrix | 2014-11-14 | 1 | -10/+9 | |
|\ \ | |/ |/| | Changed two strange looking places in boot.php. | |||||
| * | Fixed a variable conflict in mod/xchan.php. | Klaus Weidenbach | 2014-11-14 | 1 | -10/+9 | |
| | | | | | | | | | | A variable $rr inside the foreachs was used twice. Add translation to mod/xchan.php. | |||||
* | | violates new sql standards | Habeas Codice | 2014-11-13 | 1 | -1/+1 | |
| | | | | | | | | missed during merge | |||||
* | | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-13 | 20 | -854/+1123 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: boot.php include/dba/dba_driver.php include/diaspora.php include/follow.php include/session.php include/zot.php mod/photos.php mod/ping.php | |||||
| * | this should make all the 'sys' webpage design tools useable by the admin | friendica | 2014-11-12 | 4 | -156/+211 | |
| | | ||||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-12 | 1 | -1/+2 | |
| |\ | ||||||
| | * | make search and advanced search use the same input form | marijus | 2014-11-12 | 1 | -1/+2 | |
| | | | ||||||
| * | | sys edit ability to menus and menu items | friendica | 2014-11-12 | 2 | -60/+96 | |
| |/ | ||||||
| * | extend sys support to layouts | friendica | 2014-11-12 | 3 | -131/+211 | |
| | | ||||||
| * | uid not set in webpages.php, start on editwebpage.php | friendica | 2014-11-11 | 2 | -38/+72 | |
| | | ||||||
| * | cleanup | friendica | 2014-11-11 | 1 | -37/+45 | |
| | | ||||||
| * | slow progress on sys publishing, making sure all the data we need is in the ↵ | friendica | 2014-11-11 | 1 | -6/+21 | |
| | | | | | | | | places we need it but validate it anyway | |||||
| * | some more work on sys publishing | friendica | 2014-11-11 | 2 | -33/+40 | |
| | | ||||||
| * | a couple of places where we need to look for a sys channel euid. | friendica | 2014-11-11 | 1 | -10/+18 | |
| | | ||||||
| * | Nothing here, move along. | friendica | 2014-11-11 | 1 | -2/+2 | |
| | | ||||||
| * | add some subtle delineation to directory entries, remove forced link on ↵ | friendica | 2014-11-11 | 1 | -1/+1 | |
| | | | | | | | | homepage element (SECURITY) | |||||
| * | the code is a bit crufty, but this should fix issue #687 | friendica | 2014-11-11 | 1 | -0/+16 | |
| | | ||||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-10 | 1 | -28/+25 | |
| |\ | ||||||
| | * | Merge pull request #686 from beardy-unixer/master | RedMatrix | 2014-11-11 | 1 | -28/+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 | 1 | -28/+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 | 1 | -0/+2 | |
| |/ / | ||||||
| * | | indicate public forums in directory results (there will be some [possibly ↵ | friendica | 2014-11-10 | 2 | -0/+5 | |
| | | | | | | | | | | | | 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 | 1 | -0/+16 | |
| | | | | | | | | | | | | 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 | 1 | -4/+4 | |
| |/ | ||||||
| * | menu page cleanup | friendica | 2014-11-09 | 1 | -15/+17 | |
| | | ||||||
| * | remove extraneous logging | friendica | 2014-11-09 | 1 | -4/+1 | |
| | | ||||||
| * | directory listing shows phantom keywords | friendica | 2014-11-09 | 1 | -1/+3 | |
| | | ||||||
| * | New layout for directory | Stefan Parviainen | 2014-11-09 | 2 | -191/+49 | |
| | | ||||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-07 | 1 | -5/+6 | |
| |\ | ||||||
| | * | provide lockstate for photo edit | marijus | 2014-11-07 | 1 | -5/+6 | |
| | | | ||||||
| * | | fix broken photo edits when adult flag is changed | friendica | 2014-11-07 | 1 | -8/+7 | |
| |/ | ||||||
| * | Provide a way to mark photos as adult and hide them from the default album ↵ | friendica | 2014-11-06 | 1 | -27/+31 | |
| | | | | | | | | 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. | |||||
| * | provide a lockstate for photo uploads | marijus | 2014-11-06 | 1 | -1/+4 | |
| | | ||||||
| * | crude skeleton for location manager and the UI sucks but at least it's on a ↵ | friendica | 2014-11-05 | 1 | -28/+42 | |
| | | | | | | | | webpage and you don't have to do it by hand. | |||||
| * | some minor cleanup of unreported (and as yet undiscovered) issues with ↵ | friendica | 2014-11-05 | 1 | -0/+1 | |
| | | | | | | | | permissions toggling. No smoking guns and no obvious issues discovered here. Repeated and tried to duplicate zottell's issue as described without seeing any obvious problems. | |||||
| * | changed notification description | friendica | 2014-11-04 | 1 | -1/+1 | |
| | |