aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | no newline at end of filefriendica2015-01-021-1/+1
* | | some work on the edit connection workflow explanation and connedit page. This...friendica2015-01-024-26/+46
* | | doc updatesfriendica2015-01-0263-2458/+2562
* | | 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
| |/ /
* / / syntax issues (with some php versions?), unchecked intvalfriendica2015-01-012-7/+31
|/ /
* | 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
* | | | revupfriendica2015-01-011-1/+1
|/ / /
* | | Merge pull request #800 from pafcu/langRedMatrix2015-01-011000-7/+499188
|\ \ \ | |/ / |/| |
| * | Add missing vendor/-directory (due to upstream .gitignore)Stefan Parviainen2014-12-317-1/+472
| * | Revert "Revert "Language names via intl library.""Stefan Parviainen2014-12-31994-7/+498717
* | | Merge pull request #802 from friendica/revert-792-cssrefactorpafcu2014-12-316-146/+144
|\ \ \
| * | | Revert "Make redbasic css more modular"pafcu2014-12-316-146/+144
|/ / /
* | | Merge pull request #801 from friendica/revert-799-cssrefactorpafcu2014-12-312-41/+39
|\ \ \ | |/ / |/| |
| * | Revert "Move mod_profiles.css content back into style.css, since it contains ...pafcu2014-12-312-41/+39
|/ /
* | Merge pull request #799 from pafcu/cssrefactorpafcu2014-12-312-39/+41
|\ \
| * | Move mod_profiles.css content back into style.css, since it contains variablesStefan Parviainen2014-12-312-39/+41
* | | Merge pull request #798 from friendica/revert-794-langRedMatrix2014-12-31994-498717/+7
|\ \ \
| * | | Revert "Language names via intl library."RedMatrix2014-12-31994-498717/+7
|/ / /
* | | Merge pull request #797 from anaqreon/imagelinkRedMatrix2014-12-316-116/+163
|\ \ \
| * | | Added url tag around image for inserted linksAndrew Manning2014-12-306-116/+163
| * | | Merge pull request #1 from friendica/masteranaqreon2014-12-30471-23780/+36276
| |\ \ \
* | \ \ \ Merge pull request #796 from pafcu/profeditfixRedMatrix2014-12-311-1/+4
|\ \ \ \ \
| * | | | | Don't show links to edit alternate profiles if multi_profiles is disabledStefan Parviainen2014-12-301-1/+4
* | | | | | Merge pull request #795 from pafcu/tplcleanupRedMatrix2014-12-3117-201/+0
|\ \ \ \ \ \
| * | | | | | Remove some old, unused templatesStefan Parviainen2014-12-3017-201/+0
* | | | | | | Merge pull request #794 from pafcu/langRedMatrix2014-12-31994-7/+498717
|\ \ \ \ \ \ \
| * | | | | | | Update function doc, return language code if language is not recognizedStefan Parviainen2014-12-301-3/+7
| * | | | | | | Language names via intl library. Fixes #773Stefan Parviainen2014-12-30994-5/+498711
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #791 from pafcu/notificationsRedMatrix2014-12-314-2/+36
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |