Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | 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 | 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 | 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) | 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 from... | friendica | 2015-01-01 | 1 | -3/+5 | |
| * | | 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 | |
| | |\ \ | ||||||
| | | * | | Update Swedish strings from Transifex | Erik Lundin | 2015-01-02 | 2 | -4947/+4991 | |
| | | * | | Swedish translation | Erik Lundin | 2015-01-02 | 1 | -1/+78 | |
| | * | | | Merge pull request #807 from pafcu/dblclicknewevent | RedMatrix | 2015-01-02 | 1 | -0/+5 | |
| | |\ \ \ | ||||||
| | | * | | | 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 | |
| | |\ \ \ | ||||||
| | | * | | | 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 | Stefan Parviainen | 2015-01-01 | 15 | -0/+1442 | |
| | | |/ / | ||||||
| | * | | | Merge pull request #803 from pafcu/checkboxes | RedMatrix | 2015-01-02 | 27 | -51/+146 | |
| | |\ \ \ | | | |/ / | | |/| | | ||||||
| | | * | | 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 | |
| |\ \ \ | | |/ / | |/| | | ||||||
| | * | | 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 | |
| * | | | Merge pull request #802 from friendica/revert-792-cssrefactor | pafcu | 2014-12-31 | 6 | -146/+144 | |
| |\ \ \ | ||||||
| | * | | | 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 contains ... | pafcu | 2014-12-31 | 2 | -41/+39 | |
| |/ / | ||||||
| * | | 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 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." | 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 | |
| |\ \ \ | ||||||
| | * | | | 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 | |
| | |\ \ \ | ||||||
| * | \ \ \ | Merge pull request #796 from pafcu/profeditfix | RedMatrix | 2014-12-31 | 1 | -1/+4 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Don't show links to edit alternate profiles if multi_profiles is disabled | Stefan Parviainen | 2014-12-30 | 1 | -1/+4 | |
| * | | | | | | Merge pull request #795 from pafcu/tplcleanup | RedMatrix | 2014-12-31 | 17 | -201/+0 | |
| |\ \ \ \ \ \ |