aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into trinidadfriendica2015-01-101-2/+2
|\
| * connection clone issuesfriendica2015-01-101-2/+2
* | Merge branch 'master' into trinidadfriendica2015-01-102-1/+2
|\|
| * Fix unescaped image dataHabeas Codice2015-01-101-0/+1
| * basic changes for file activitymarijus2015-01-091-1/+1
* | Merge branch 'master' into trinidadfriendica2015-01-082-23/+28
|\|
| * Merge pull request #833 from pafcu/oneautocompleterpafcu2015-01-082-23/+28
| |\
| | * Fix saved searches on network page, fix caching mith multiple autocompletersStefan Parviainen2015-01-081-22/+26
| | * Honor requested count in navbar searchStefan Parviainen2015-01-081-1/+2
* | | Merge branch 'master' into trinidadfriendica2015-01-074-42/+22
|\| |
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-071-34/+14
| |\|
| | * Return results from acl.php in standard formStefan Parviainen2015-01-071-20/+0
| | * Make nav search use textcompleteStefan Parviainen2015-01-071-14/+14
| * | syncing connections issue, incorrect return_url after deleting connectionfriendica2015-01-072-6/+6
| * | don't allow admin to delete the sys channel from the channel manage pagefriendica2015-01-061-2/+2
| |/
* | begin the grand unification for 3.0. Start by splitting DAV into a web access...friendica2015-01-062-27/+156
* | undo these bits of trinidad - we're going to do things differentlyfriendica2015-01-051-1/+1
* | Merge branch 'master' into trinidadfriendica2015-01-041-1/+1
|\|
| * the last checkin removed hostname from the address for autocomplete searches....friendica2015-01-041-1/+1
* | 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
| |/ /