Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't allow affinity of 0 in connedit. | Thomas Willingham | 2014-12-02 | 1 | -1/+1 |
| | |||||
* | Italian translation | Paolo Tacconi | 2014-12-01 | 2 | -4035/+4077 |
| | |||||
* | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-11-29 | 4 | -4516/+4568 |
|\ | |||||
| * | update nl (typo) | Jeroen | 2014-11-29 | 2 | -2/+2 |
| | | |||||
| * | update nl | Jeroen | 2014-11-29 | 2 | -3957/+3999 |
| | | |||||
| * | Merge pull request #715 from f03el/master | Thomas Willingham | 2014-11-29 | 2 | -559/+569 |
| |\ | | | | | | | Update Swedish strings | ||||
| | * | Update Swedish strings | Erik Lundin | 2014-11-29 | 2 | -559/+569 |
| | | | |||||
* | | | readd link_colour again | marijus | 2014-11-29 | 1 | -1/+1 |
|/ / | |||||
* / | bootstrap-3.3.1 and minor css fixes | marijus | 2014-11-29 | 3 | -13/+21 |
|/ | |||||
* | Update Swedish strings | Erik Lundin | 2014-11-25 | 1 | -778/+785 |
| | |||||
* | Update Swedish strings | Erik Lundin | 2014-11-25 | 1 | -3170/+3195 |
| | |||||
* | Make events export track the current calendar. Turn it and 'new event' into ↵ | friendica | 2014-11-24 | 2 | -3/+13 |
| | | | | buttons | ||||
* | theme the observer tags so they stick out like a sore thumb. Too much bad juju. | friendica | 2014-11-24 | 1 | -0/+8 |
| | |||||
* | Merge pull request #707 from HaakonME/master | RedMatrix | 2014-11-25 | 2 | -4902/+5594 |
|\ | | | | | Updated Norwegian bokmål translation | ||||
| * | Updated Norwegian bokmål translation | Haakon Meland Eriksen | 2014-11-23 | 2 | -4902/+5594 |
| | | |||||
* | | Italian translation | Paolo Tacconi | 2014-11-24 | 2 | -5007/+5205 |
| | | |||||
* | | and update Dutch | Jeroen | 2014-11-24 | 2 | -4385/+4403 |
| | | |||||
* | | Merge pull request #708 from zzottel/master | zzottel | 2014-11-24 | 2 | -4392/+4519 |
|\ \ | | | | | | | German update | ||||
| * | | update to German strings | zottel | 2014-11-24 | 2 | -4392/+4519 |
| | | | |||||
* | | | add event export (this month) to event UI | friendica | 2014-11-24 | 1 | -0/+1 |
|/ / | |||||
* / | add link to search forums in the directory | friendica | 2014-11-23 | 1 | -0/+1 |
|/ | |||||
* | Update Swedish translations | Erik Lundin | 2014-11-22 | 8 | -6216/+7142 |
| | |||||
* | yet another option for the homepage | friendica | 2014-11-20 | 1 | -1/+1 |
| | |||||
* | couple of fixes: | friendica | 2014-11-19 | 1 | -1/+1 |
| | | | | | - significantly increase the content availability on the discover channel - fix the button group on the blog/list mode which made the border on a single comment button a bit wonky | ||||
* | turn the "adult photo flagging" (which prevents a particularly flagged photo ↵ | friendica | 2014-11-18 | 1 | -0/+3 |
| | | | | from showing up in your top level albums) into a feature so it doesn't clutter the normal photo edit form. This feature was a quick hack and needs more work; but it could be important to somebody. | ||||
* | blog mode - turn the comment link into a button and group with the ↵ | friendica | 2014-11-18 | 1 | -3/+6 |
| | | | | likes/dislikes | ||||
* | private mail buttons | friendica | 2014-11-18 | 2 | -21/+21 |
| | |||||
* | Revert "Directory shows channel suggestions by default" | RedMatrix | 2014-11-19 | 2 | -3/+1 |
| | |||||
* | Merge pull request #702 from pafcu/master | RedMatrix | 2014-11-19 | 2 | -1/+3 |
|\ | | | | | Directory shows channel suggestions by default | ||||
| * | Directory shows channel suggestions by default | Stefan Parviainen | 2014-11-18 | 2 | -1/+3 |
| | | |||||
* | | undo disabled submit buttons now that ACL is initialised when page loaded | friendica | 2014-11-18 | 7 | -12/+11 |
| | | |||||
* | | allow members to set the per-item "show more" height (separately for network ↵ | friendica | 2014-11-17 | 2 | -16/+6 |
| | | | | | | | | and matrix, display and search are system pages and therefore set at 400) | ||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-17 | 2 | -9/+3 |
|\ \ | |||||
| * | | Merge pull request #695 from pafcu/master | RedMatrix | 2014-11-18 | 2 | -9/+3 |
| |\| | | | | | | | Switch to a better datetime picker widget | ||||
| | * | Use new date selector for item expiry | Stefan Parviainen | 2014-11-17 | 1 | -6/+1 |
| | | | |||||
| | * | Switch to a better datetime picker widget | Stefan Parviainen | 2014-11-16 | 1 | -3/+2 |
| | | | |||||
* | | | add unseen count and way to mark unseen to list mode. Also fix automatic ↵ | friendica | 2014-11-17 | 2 | -1/+9 |
|/ / | | | | | | | mark of unseen so as to work with list mode. | ||||
* | | when in list mode, make the max height half of the normal height before ↵ | friendica | 2014-11-16 | 2 | -18/+17 |
| | | | | | | | | 'divgrow' kicks in. | ||||
* | | blog/list mode display settings | friendica | 2014-11-16 | 1 | -0/+2 |
| | | |||||
* | | "list mode" (forum and blog mode, no comments or comment boxes displayed on ↵ | friendica | 2014-11-16 | 1 | -0/+175 |
|/ | | | | the summary page) | ||||
* | buttonify some design elements that had not yet been buttonified | friendica | 2014-11-13 | 2 | -7/+7 |
| | |||||
* | put timeout code in place but don't turn it on. | friendica | 2014-11-13 | 1 | -7/+9 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-13 | 40 | -9073/+9458 |
|\ | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -4/+4 |
| | | |||||
| * | 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 | ||||
| * | make search and advanced search use the same input form | marijus | 2014-11-12 | 1 | -16/+6 |
| | | |||||
| * | cleanup | friendica | 2014-11-11 | 1 | -1/+1 |
| | | |||||
| * | add some subtle delineation to directory entries, remove forced link on ↵ | friendica | 2014-11-11 | 2 | -1/+4 |
| | | | | | | | | homepage element (SECURITY) | ||||
| * | some work on directory widgets | marijus | 2014-11-11 | 6 | -57/+38 |
| | |