| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into trinidad | friendica | 2015-01-02 | 4 | -26/+46 |
| |\ | |||||
| | * | some work on the edit connection workflow explanation and connedit page. ↵ | friendica | 2015-01-02 | 4 | -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 trinidad | friendica | 2015-01-02 | 63 | -2458/+2562 |
| |\| | |||||
| | * | doc updates | friendica | 2015-01-02 | 63 | -2458/+2562 |
| | | | |||||
| * | | Merge branch 'master' into trinidad | friendica | 2015-01-02 | 9 | -106/+89 |
| |\| | |||||
| | * | Merge pull request #813 from pafcu/checkboxes | RedMatrix | 2015-01-03 | 7 | -83/+63 |
| | |\ | | | | | | | Reworked switch to also display text | ||||
| | | * | Reworked switch to also display text | Stefan Parviainen | 2015-01-02 | 7 | -83/+63 |
| | | | | |||||
| | * | | Merge pull request #812 from f03el/master | RedMatrix | 2015-01-03 | 1 | -21/+21 |
| | |\ \ | | | | | | | | | Use HTML entities | ||||
| | | * | | Use HTML entities | Erik Lundin | 2015-01-02 | 1 | -21/+21 |
| | |/ / | |||||
| | * | | Merge pull request #810 from pafcu/aclsort | pafcu | 2015-01-02 | 1 | -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 Parviainen | 2015-01-02 | 1 | -2/+5 |
| | | |/ | |||||
| * | | | Merge branch 'master' into trinidad | friendica | 2015-01-01 | 2 | -7/+31 |
| |\| | | |||||
| | * | | syntax issues (with some php versions?), unchecked intval | friendica | 2015-01-01 | 2 | -7/+31 |
| | |/ | |||||
| * | | Merge branch 'master' into trinidad | friendica | 2015-01-01 | 318 | -11043/+20068 |
| |\| | |||||
| | * | fix shares that are processed with markdown (regression, this was pulled ↵ | friendica | 2015-01-01 | 1 | -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 autoloader | friendica | 2015-01-01 | 262 | -5949/+13348 |
| | | | |||||
| | * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-01 | 55 | -5091/+6715 |
| | |\ | |||||
| | | * | Merge pull request #808 from f03el/master | RedMatrix | 2015-01-02 | 3 | -4948/+5069 |
| | | |\ | | | | | | | | | Swedish translation of frontpage + update from Transifex | ||||
| | | | * | Update Swedish strings from Transifex | Erik Lundin | 2015-01-02 | 2 | -4947/+4991 |
| | | | | | |||||
| | | | * | Swedish translation | Erik Lundin | 2015-01-02 | 1 | -1/+78 |
| | | | | | | | | | | | | | | | | | | | | | Original translation provided by RedSwede, redswede@redmatrix.nl. Proof-read and complemented by Erik Lundin. | ||||
| | | * | | Merge pull request #807 from pafcu/dblclicknewevent | RedMatrix | 2015-01-02 | 1 | -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 day | Stefan Parviainen | 2015-01-01 | 1 | -0/+5 |
| | | | |/ | |||||
| | | * | | Merge pull request #805 from pafcu/moretpl | RedMatrix | 2015-01-02 | 12 | -92/+53 |
| | | |\ \ | | | | | | | | | | | Move some HTML out to templates | ||||
| | | | * | | Use grouped select field for role selection | Stefan Parviainen | 2015-01-01 | 8 | -48/+28 |
| | | | | | | |||||
| | | | * | | Use grouped select field for timezone selection | Stefan Parviainen | 2015-01-01 | 5 | -44/+13 |
| | | | | | | |||||
| | | | * | | Add field template for grouped selects | Stefan Parviainen | 2015-01-01 | 1 | -0/+12 |
| | | | |/ | |||||
| | | * | | Merge pull request #804 from pafcu/areyousure | RedMatrix | 2015-01-02 | 15 | -0/+1442 |
| | | |\ \ | | | | | | | | | | | Warn about unsaved settings using jquery.areyousure | ||||
| | | | * | | Warn about unsaved settings using jquery.areyousure | Stefan Parviainen | 2015-01-01 | 15 | -0/+1442 |
| | | | |/ | |||||
| | | * | | Merge pull request #803 from pafcu/checkboxes | RedMatrix | 2015-01-02 | 27 | -51/+146 |
| | | |\ \ | | | |/ | | |/| | Checkboxyfy settings, style checkboxes as switches in redbasic | ||||
| | | | * | Possibly make switches work on IE8 (untested) | Stefan Parviainen | 2015-01-01 | 21 | -18/+28 |
| | | | | | |||||
| | | | * | Checkboxify yesno-fields, but use CSS to show them as switches in Redbasic | Stefan Parviainen | 2015-01-01 | 13 | -35/+120 |
| | | | | | |||||
| * | | | | Merge branch 'master' into trinidad | friendica | 2015-01-01 | 1 | -1/+1 |
| |\| | | | |||||
| | * | | | revup | friendica | 2015-01-01 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge branch 'master' into trinidad | friendica | 2015-01-01 | 1006 | -153/+499332 |
| |\| | | |||||
| | * | | Merge pull request #800 from pafcu/lang | RedMatrix | 2015-01-01 | 1000 | -7/+499188 |
| | |\ \ | | |/ | |/| | Language names | ||||
| | | * | Add missing vendor/-directory (due to upstream .gitignore) | Stefan Parviainen | 2014-12-31 | 7 | -1/+472 |
| | | | | |||||
| | | * | Revert "Revert "Language names via intl library."" | Stefan Parviainen | 2014-12-31 | 994 | -7/+498717 |
| | | | | | | | | | | | | | This reverts commit 4f35efa0bad4ae6489b63f3eebafe6542d654094. | ||||
| | * | | Merge pull request #802 from friendica/revert-792-cssrefactor | pafcu | 2014-12-31 | 6 | -146/+144 |
| | |\ \ | | | | | | | | | Revert "Make redbasic css more modular" | ||||
| | | * | | Revert "Make redbasic css more modular" | pafcu | 2014-12-31 | 6 | -146/+144 |
| | |/ / | |||||
| | * | | Merge pull request #801 from friendica/revert-799-cssrefactor | pafcu | 2014-12-31 | 2 | -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 ↵ | pafcu | 2014-12-31 | 2 | -41/+39 |
| | |/ | | | | | | | var..." | ||||
| | * | Merge pull request #799 from pafcu/cssrefactor | pafcu | 2014-12-31 | 2 | -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 variables | Stefan Parviainen | 2014-12-31 | 2 | -39/+41 |
| | | | | |||||
| * | | | Merge branch 'master' into trinidad | friendica | 2014-12-30 | 994 | -498717/+7 |
| |\| | | |||||
| | * | | Merge pull request #798 from friendica/revert-794-lang | RedMatrix | 2014-12-31 | 994 | -498717/+7 |
| | |\ \ | | | | | | | | | Revert "Language names via intl library." | ||||
| | | * | | Revert "Language names via intl library." | RedMatrix | 2014-12-31 | 994 | -498717/+7 |
| | |/ / | |||||
| * | | | Merge branch 'master' into trinidad | friendica | 2014-12-30 | 1036 | -514/+499133 |
| |\| | | |||||
| | * | | Merge pull request #797 from anaqreon/imagelink | RedMatrix | 2014-12-31 | 6 | -116/+163 |
| | |\ \ | | | | | | | | | Imagelink | ||||
| | | * | | Added url tag around image for inserted links | Andrew Manning | 2014-12-30 | 6 | -116/+163 |
| | | | | | |||||
| | | * | | Merge pull request #1 from friendica/master | anaqreon | 2014-12-30 | 471 | -23780/+36276 |
| | | |\ \ | | | | | | | | | | | Pull from upstream | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |