aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into trinidadfriendica2015-01-042-2/+2
|\
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-041-1/+1
| |\
| | * Merge pull request #817 from pafcu/aclpafcu2015-01-041-1/+1
| | |\
| | | * Fix height calculation in acl.jsStefan Parviainen2015-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-046-81/+89
|\| |
| * | Merge pull request #816 from pafcu/aclRedMatrix2015-01-055-80/+88
| |\|
| | * TypoStefan Parviainen2015-01-041-3/+3
| | * Sorting of autocompleteStefan Parviainen2015-01-0483-7141/+7366
| | |\
| | * | Autocmplete suggestions for non-local users, also suggest from visited channe...Stefan Parviainen2015-01-045-80/+68
| * | | Fix wrong requireStefan Parviainen2015-01-041-1/+1
| | |/ | |/|
* | | Merge branch 'master' into trinidadfriendica2015-01-0412-4625/+4679
|\| |
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-0410-4623/+4677
| |\ \
| | * | update NL and text-background-fix in chat for alternatives schemasJeroen2015-01-038-4620/+4672
| | * | provide some info for buttonsmarijus2015-01-032-3/+5
| * | | remove hard-coded url to caterva.eu from events code.friendica2015-01-042-2/+2
| |/ /
* | | Merge branch 'master' into trinidadfriendica2015-01-020-0/+0
|\| |
| * | no newline at end of filefriendica2015-01-021-1/+1
* | | Merge branch 'master' into trinidadfriendica2015-01-024-26/+46
|\| |
| * | some work on the edit connection workflow explanation and connedit page. This...friendica2015-01-024-26/+46
* | | Merge branch 'master' into trinidadfriendica2015-01-0263-2458/+2562
|\| |
| * | doc updatesfriendica2015-01-0263-2458/+2562
* | | Merge branch 'master' into trinidadfriendica2015-01-029-106/+89
|\| |
| * | Merge pull request #813 from pafcu/checkboxesRedMatrix2015-01-037-83/+63
| |\|
| | * Reworked switch to also display textStefan Parviainen2015-01-027-83/+63
| * | Merge pull request #812 from f03el/masterRedMatrix2015-01-031-21/+21
| |\ \
| | * | Use HTML entitiesErik Lundin2015-01-021-21/+21
| |/ /
| * | 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-012-7/+31
|\| |
| * | syntax issues (with some php versions?), unchecked intvalfriendica2015-01-012-7/+31
| |/
* | Merge branch 'master' into trinidadfriendica2015-01-01318-11043/+20068
|\|
| * fix shares that are processed with markdown (regression, this was pulled from...friendica2015-01-011-3/+5
| * htmlpurifier update - compatibility issue with language library autoloaderfriendica2015-01-01262-5949/+13348
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-0155-5091/+6715
| |\
| | * Merge pull request #808 from f03el/masterRedMatrix2015-01-023-4948/+5069
| | |\
| | | * Update Swedish strings from TransifexErik Lundin2015-01-022-4947/+4991
| | | * Swedish translationErik Lundin2015-01-021-1/+78
| | * | Merge pull request #807 from pafcu/dblclickneweventRedMatrix2015-01-021-0/+5
| | |\ \
| | | * | Double click on day in calendar creats new event starting that dayStefan Parviainen2015-01-011-0/+5
| | | |/
| | * | Merge pull request #805 from pafcu/moretplRedMatrix2015-01-0212-92/+53
| | |\ \
| | | * | Use grouped select field for role selectionStefan Parviainen2015-01-018-48/+28
| | | * | Use grouped select field for timezone selectionStefan Parviainen2015-01-015-44/+13
| | | * | Add field template for grouped selectsStefan Parviainen2015-01-011-0/+12
| | | |/
| | * | Merge pull request #804 from pafcu/areyousureRedMatrix2015-01-0215-0/+1442
| | |\ \
| | | * | Warn about unsaved settings using jquery.areyousureStefan Parviainen2015-01-0115-0/+1442
| | | |/
| | * | Merge pull request #803 from pafcu/checkboxesRedMatrix2015-01-0227-51/+146
| | |\ \ | | | |/ | | |/|
| | | * Possibly make switches work on IE8 (untested)Stefan Parviainen2015-01-0121-18/+28
| | | * Checkboxify yesno-fields, but use CSS to show them as switches in RedbasicStefan Parviainen2015-01-0113-35/+120
* | | | Merge branch 'master' into trinidadfriendica2015-01-011-1/+1
|\| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 18:48:10 +0000