aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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. ↵friendica2015-01-024-26/+46
| | | | | | | | This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved.
* | 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 text
| | * Reworked switch to also display textStefan Parviainen2015-01-027-83/+63
| | |
| * | Merge pull request #812 from f03el/masterRedMatrix2015-01-031-21/+21
| |\ \ | | | | | | | | Use HTML entities
| | * | 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)
| | * | 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 ↵friendica2015-01-011-3/+5
| | | | | | | | from diaspora2bb a couple weeks back as it was affecting diaspora input, but here we're dealing with red input only)
| * 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
| | |\ | | | | | | | | Swedish translation of frontpage + update from Transifex
| | | * Update Swedish strings from TransifexErik Lundin2015-01-022-4947/+4991
| | | |
| | | * Swedish translationErik Lundin2015-01-021-1/+78
| | | | | | | | | | | | | | | | | | | | Original translation provided by RedSwede, redswede@redmatrix.nl. Proof-read and complemented by Erik Lundin.
| | * | Merge pull request #807 from pafcu/dblclickneweventRedMatrix2015-01-021-0/+5
| | |\ \ | | | | | | | | | | Double click on day in calendar creates new event starting that day
| | | * | 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
| | |\ \ | | | | | | | | | | Move some HTML out to templates
| | | * | 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.areyousure
| | | * | Warn about unsaved settings using jquery.areyousureStefan Parviainen2015-01-0115-0/+1442
| | | |/
| | * | Merge pull request #803 from pafcu/checkboxesRedMatrix2015-01-0227-51/+146
| | |\ \ | | | |/ | | |/| Checkboxyfy settings, style checkboxes as switches in redbasic
| | | * 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
|\| | |
| * | | revupfriendica2015-01-011-1/+1
| |/ /
* | | Merge branch 'master' into trinidadfriendica2015-01-011006-153/+499332
|\| |
| * | Merge pull request #800 from pafcu/langRedMatrix2015-01-011000-7/+499188
| |\ \ | | |/ | |/| Language names
| | * 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
| | | | | | | | | | | | This reverts commit 4f35efa0bad4ae6489b63f3eebafe6542d654094.
| * | Merge pull request #802 from friendica/revert-792-cssrefactorpafcu2014-12-316-146/+144
| |\ \ | | | | | | | | Revert "Make redbasic css more modular"
| | * | 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 cont...
| | * Revert "Move mod_profiles.css content back into style.css, since it contains ↵pafcu2014-12-312-41/+39
| |/ | | | | | | var..."
| * Merge pull request #799 from pafcu/cssrefactorpafcu2014-12-312-39/+41
| |\ | | | | | | Move mod_profiles.css content back into style.css, since it contains var...
| | * Move mod_profiles.css content back into style.css, since it contains variablesStefan Parviainen2014-12-312-39/+41
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 06:10:47 +0000