aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into trinidadfriendica2015-01-041-1/+1
|\
| * only check the LHS of xchan_addr for autocomplete, don't match on the hostname.friendica2015-01-041-1/+1
* | Merge branch 'master' into trinidadfriendica2015-01-042-76/+73
|\|
| * Merge pull request #816 from pafcu/aclRedMatrix2015-01-051-75/+72
| |\
| | * TypoStefan Parviainen2015-01-041-3/+3
| | * Sorting of autocompleteStefan Parviainen2015-01-044-21/+56
| | |\
| | * | Autocmplete suggestions for non-local users, also suggest from visited channe...Stefan Parviainen2015-01-041-75/+52
| * | | Fix wrong requireStefan Parviainen2015-01-041-1/+1
| | |/ | |/|
* | | Merge branch 'master' into trinidadfriendica2015-01-041-1/+3
|\| |
| * | provide some info for buttonsmarijus2015-01-031-1/+3
* | | Merge branch 'master' into trinidadfriendica2015-01-021-9/+11
|\| |
| * | some work on the edit connection workflow explanation and connedit page. This...friendica2015-01-021-9/+11
* | | Merge branch 'master' into trinidadfriendica2015-01-021-2/+5
|\| |
| * | Merge pull request #810 from pafcu/aclsortpafcu2015-01-021-2/+5
| |\ \
| | * | Sort acl results according to match position (only type='c' for now)Stefan Parviainen2015-01-021-2/+5
| | |/
* | | Merge branch 'master' into trinidadfriendica2015-01-011-7/+15
|\| |
| * | syntax issues (with some php versions?), unchecked intvalfriendica2015-01-011-7/+15
| |/
* | Merge branch 'master' into trinidadfriendica2015-01-015-28/+30
|\|
| * fix shares that are processed with markdown (regression, this was pulled from...friendica2015-01-011-3/+5
| * Merge pull request #805 from pafcu/moretplRedMatrix2015-01-023-12/+5
| |\
| | * Use grouped select field for role selectionStefan Parviainen2015-01-012-8/+3
| | * Use grouped select field for timezone selectionStefan Parviainen2015-01-012-4/+2
| * | Checkboxify yesno-fields, but use CSS to show them as switches in RedbasicStefan Parviainen2015-01-012-13/+20
| |/
* | Merge branch 'master' into trinidadfriendica2014-12-304-5/+21
|\|
| * Merge pull request #797 from anaqreon/imagelinkRedMatrix2014-12-311-1/+8
| |\
| | * Added url tag around image for inserted linksAndrew Manning2014-12-301-1/+8
| * | Merge pull request #791 from pafcu/notificationsRedMatrix2014-12-311-0/+5
| |\ \ | | |/ | |/|
| | * Make showing wall posts, intros and private messages under Notices optionalStefan Parviainen2014-12-301-0/+5
| * | Merge pull request #793 from pafcu/filestorageurlfixpafcu2014-12-301-1/+5
| |\ \
| | * | Encode URL offered in filestorage. Fixes #780Stefan Parviainen2014-12-301-1/+5
| * | | Sort notificationsStefan Parviainen2014-12-301-2/+2
| |/ /
| * | fix recursive file permissionsmarijus2014-12-301-1/+1
* | | Merge branch 'master' into trinidadfriendica2014-12-293-15/+34
|\| |
| * | Merge pull request #789 from pafcu/chanmanRedMatrix2014-12-301-5/+2
| |\ \ | | |/ | |/|
| | * Don't show current channel separately in channel manager, highlight it insteadStefan Parviainen2014-12-291-5/+2
| * | filter posts you author from unseen notifications - note there are other ways...friendica2014-12-281-4/+9
| * | Merge pull request #772 from pafcu/chanmanRedMatrix2014-12-291-3/+10
| |\|
| | * Allow quick access to mail and connections from Channel ManagerStefan Parviainen2014-12-271-2/+7
| | * Fix #771, add tooltips to mail and intros count in channel manager, always sh...Stefan Parviainen2014-12-271-1/+3
| * | Merge pull request #769 from pafcu/profilesRedMatrix2014-12-291-4/+14
| |\ \
| | * | Redirect /profiles to default profile when multi_profiles is off. Fixes #768Stefan Parviainen2014-12-271-4/+14
| | |/
* | / initial trinidad checkinfriendica2014-12-291-1/+1
|/ /
* | issue #777, make photo cache time configurable, read the comments.friendica2014-12-272-4/+17
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-12-261-3/+0
|\|
| * Cruft left over from stuff we don't have anymore.Thomas Willingham2014-12-261-3/+0
* | doc updatefriendica2014-12-261-1/+1
|/
* Pass sitename to appsThomas Willingham2014-12-221-0/+1
* provide last successful poll run time (using relative time) in siteinfo so th...friendica2014-12-211-1/+5
* Merge https://github.com/friendica/red into pending_mergefriendica2014-12-211-1/+2
|\
| * files: make mod/filestorage.php load via ajax and some design work. work in p...marijus2014-12-211-1/+2