aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Checkboxify yesno-fields, but use CSS to show them as switches in RedbasicStefan Parviainen2015-01-0113-35/+120
|
* 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
| |
* | Merge pull request #798 from friendica/revert-794-langRedMatrix2014-12-31994-498717/+7
|\ \ | | | | | | Revert "Language names via intl library."
| * | Revert "Language names via intl library."RedMatrix2014-12-31994-498717/+7
|/ /
* | Merge pull request #797 from anaqreon/imagelinkRedMatrix2014-12-316-116/+163
|\ \ | | | | | | Imagelink
| * | Added url tag around image for inserted linksAndrew Manning2014-12-306-116/+163
| | |
| * | Merge pull request #1 from friendica/masteranaqreon2014-12-30471-23780/+36276
| |\ \ | | | | | | | | Pull from upstream
* | \ \ Merge pull request #796 from pafcu/profeditfixRedMatrix2014-12-311-1/+4
|\ \ \ \ | | | | | | | | | | Don't show links to edit alternate profiles if multi_profiles is disable...
| * | | | 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 templates
| * | | | | Remove some old, unused templatesStefan Parviainen2014-12-3017-201/+0
| | | | | |
* | | | | | Merge pull request #794 from pafcu/langRedMatrix2014-12-31994-7/+498717
|\ \ \ \ \ \ | | | | | | | | | | | | | | Language names via intl library.
| * | | | | | 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
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Improved notifications
| * | | | | Make showing wall posts, intros and private messages under Notices optionalStefan Parviainen2014-12-303-2/+22
| | | | | |
| * | | | | Show some notification badges in red to indicate they are about youStefan Parviainen2014-12-291-0/+14
| | | | | |
* | | | | | Merge pull request #792 from pafcu/cssrefactorpafcu2014-12-306-144/+146
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | Make redbasic css more modular
| * | | | | Make redbasic css more modularStefan Parviainen2014-12-306-144/+146
| | |_|/ / | |/| | |
* | | | | Merge pull request #793 from pafcu/filestorageurlfixpafcu2014-12-301-1/+5
|\ \ \ \ \ | | | | | | | | | | | | Encode URL offered in filestorage. Fixes #780
| * | | | | Encode URL offered in filestorage. Fixes #780Stefan Parviainen2014-12-301-1/+5
| | |_|/ / | |/| | |
* | | | | Merge pull request #790 from pafcu/sortnotificationspafcu2014-12-301-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Sort notifications
| * | | | | Sort notificationsStefan Parviainen2014-12-301-2/+2
| |/ / / /
* / / / / design fixes for photos, files and random fixesmarijus2014-12-303-33/+51
|/ / / /
* | | | fix recursive file permissionsmarijus2014-12-302-2/+2
| | | |
* | | | css fixesmarijus2014-12-304-7/+9
| | | |
* | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-12-2915-4624/+4621
|\ \ \ \
| * \ \ \ Merge pull request #789 from pafcu/chanmanRedMatrix2014-12-304-35/+14
| |\ \ \ \ | | | | | | | | | | | | Don't show current channel separately in channel manager, highlight it i...
| | * | | | Don't show current channel separately in channel manager, highlight it insteadStefan Parviainen2014-12-294-35/+14
| | | | | |
| * | | | | Merge pull request #787 from pafcu/mainjsfixRedMatrix2014-12-301-5/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | Only call autotime() on the correct elements
| | * | | | | Only call autotime() on the correct elementsStefan Parviainen2014-12-291-5/+5
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #786 from f03el/masterRedMatrix2014-12-301-5/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | Don't trim escaped quotes
| | * | | | | Don't trim escaped quotesErik Lundin2014-12-291-5/+13
| | | | | | |
| * | | | | | some work on cloud actionspanel and minor cleanupmarijus2014-12-295-30/+15
| | | | | | |
| * | | | | | css fixes and remove sloppy photos setting since it is not supported anymore ↵marijus2014-12-292-5/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | in redbasic
| * | | / / Remove link to hubloc status in admin panel. This is a potentially useful tool,Thomas Willingham2014-12-291-1/+0
| | |_|/ / | |/| | | | | | | | | | | | | but plain doesn't work at the moment.
| * | | | Merge pull request #784 from tuscanhobbit/devPaolo T2014-12-292-4543/+4571
| |\ \ \ \ | | | | | | | | | | | | Italian localization
| | * | | | Italian localizationPaolo Tacconi2014-12-292-4543/+4571
| |/ / / /
* / / / / revupfriendica2014-12-291-1/+1
|/ / / /
* | | | filter posts you author from unseen notifications - note there are other ↵friendica2014-12-283-5/+12
| | | | | | | | | | | | | | | | ways to do this, but involve some code complexity. This is easier to implement but may have a slight impact on the ping query performance. It's not horrid, just mentioning for the record.
* | | | Merge pull request #778 from pafcu/loginredirRedMatrix2014-12-291-1/+1
|\ \ \ \ | | | | | | | | | | Redirect to login page on failed login. Fixes #628
| * | | | Redirect to login page on failed login. Fixes #628Stefan Parviainen2014-12-281-1/+1
| | | | |
* | | | | Merge pull request #772 from pafcu/chanmanRedMatrix2014-12-292-4/+11
|\ \ \ \ \ | | |_|/ / | |/| | | Some work on the channel manager
| * | | | Allow quick access to mail and connections from Channel ManagerStefan Parviainen2014-12-272-3/+8
| | | | |
| * | | | Fix #771, add tooltips to mail and intros count in channel manager, always ↵Stefan Parviainen2014-12-272-2/+4
| | | | | | | | | | | | | | | | | | | | show counts (even when 0, makes it easier to understand what the icons are)