Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-13 | 197 | -11360/+17155 |
|\ | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | update nl | Jeroen | 2014-11-13 | 2 | -2470/+2601 |
| | | |||||
| * | let's try this without a timeout | friendica | 2014-11-13 | 2 | -5/+5 |
| | | |||||
| * | make it a bit personal | friendica | 2014-11-12 | 1 | -3/+3 |
| | | |||||
| * | ok, I think I'll give it a break now. | friendica | 2014-11-12 | 1 | -6/+8 |
| | | |||||
| * | minor word tweaks | friendica | 2014-11-12 | 1 | -3/+3 |
| | | |||||
| * | populate initial ACL before the ajax loader gets called, just in case the ↵ | friendica | 2014-11-12 | 1 | -1/+3 |
| | | | | | | | | form is submitted before it completes. Related to issue #615 | ||||
| * | this should make all the 'sys' webpage design tools useable by the admin | friendica | 2014-11-12 | 4 | -156/+211 |
| | | |||||
| * | wordsmith | friendica | 2014-11-12 | 1 | -1/+1 |
| | | |||||
| * | more minor wordsmithing | friendica | 2014-11-12 | 1 | -2/+2 |
| | | |||||
| * | Some dates couldn't be verified without going way back in the archives so at ↵ | friendica | 2014-11-12 | 1 | -3/+3 |
| | | | | | | | | least make this document accurate based on what I have in front of me. | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-12 | 2 | -206/+290 |
| |\ | |||||
| | * | Merge pull request #689 from dawnbreak/docu | RedMatrix | 2014-11-13 | 2 | -206/+290 |
| | |\ | | | | | | | | | Some Doxygen documentation. | ||||
| | | * | Some Doxygen documentation. | Klaus Weidenbach | 2014-11-13 | 2 | -206/+290 |
| | |/ | | | | | | | | | | | | | Add some more Doxygen formating for boot.php and dba_driver.php. Cleaning a bit up, too. | ||||
| * | | add history link | friendica | 2014-11-12 | 1 | -0/+1 |
| | | | |||||
| * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-12 | 3 | -19/+9 |
| |\| | |||||
| | * | make search and advanced search use the same input form | marijus | 2014-11-12 | 3 | -19/+9 |
| | | | |||||
| * | | History of RedMatrix, Friendica, Mike Macgirvin, and associated other stuff. | friendica | 2014-11-12 | 1 | -0/+48 |
| | | | |||||
| * | | sys edit ability to menus and menu items | friendica | 2014-11-12 | 2 | -60/+96 |
| |/ | |||||
| * | extend sys support to layouts | friendica | 2014-11-12 | 4 | -132/+212 |
| | | |||||
| * | uid not set in webpages.php, start on editwebpage.php | friendica | 2014-11-11 | 2 | -38/+72 |
| | | |||||
| * | cleanup | friendica | 2014-11-11 | 4 | -40/+55 |
| | | |||||
| * | slow progress on sys publishing, making sure all the data we need is in the ↵ | friendica | 2014-11-11 | 4 | -10/+25 |
| | | | | | | | | 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 | 2 | -10/+25 |
| | | |||||
| * | and urlencode that. | friendica | 2014-11-11 | 1 | -2/+2 |
| | | |||||
| * | Most directory searches are POST. get_query_args() only handles GET so that ↵ | friendica | 2014-11-11 | 1 | -1/+9 |
| | | | | | | | | had to be fixed or page 2 of directory search results wouldn't match the search. | ||||
| * | 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 | 3 | -2/+5 |
| | | | | | | | | homepage element (SECURITY) | ||||
| * | some work on directory widgets | marijus | 2014-11-11 | 6 | -57/+38 |
| | | |||||
| * | tie the narrow nav-pills to .widget instead of aside | marijus | 2014-11-11 | 2 | -4/+5 |
| | | |||||
| * | the code is a bit crufty, but this should fix issue #687 | friendica | 2014-11-11 | 3 | -4/+27 |
| | | |||||
| * | 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 |
| |\ \ |