aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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)
* | | | Merge pull request #770 from pafcu/appsRedMatrix2014-12-296-3/+2
|\ \ \ \ | | | | | | | | | | More work on app icons
| * | | | New icons for profile, random profile and profile photoStefan Parviainen2014-12-274-2/+2
| | | | |
| * | | | Show bug reporting app to visitorsStefan Parviainen2014-12-271-1/+0
| | | | |
| * | | | New icon for language selectionStefan Parviainen2014-12-271-0/+0
| | | | |
* | | | | Merge pull request #769 from pafcu/profilesRedMatrix2014-12-291-4/+14
|\ \ \ \ \ | | | | | | | | | | | | Redirect /profiles to default profile when multi_profiles is off. Fixes ...
| * | | | | Redirect /profiles to default profile when multi_profiles is off. Fixes #768Stefan Parviainen2014-12-271-4/+14
| | |/ / / | |/| | |
* | | | | more files css fixesmarijus2014-12-283-3/+9
| | | | |
* | | | | files css fixesmarijus2014-12-282-3/+6
| | | | |
* | | | | more work on filesmarijus2014-12-285-66/+97
| | | | |
* | | | | Merge pull request #781 from pafcu/docfixpafcu2014-12-281-0/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | Document photo_cache_time setting
| * | | | Document photo_cache_time settingStefan Parviainen2014-12-281-0/+3
|/ / / /
* | | | Merge pull request #779 from pafcu/audiopafcu2014-12-281-2/+2
|\ \ \ \ | | | | | | | | | | Make spaces work in [audio] and [video]. Fixes #774
| * | | | Fix typoStefan Parviainen2014-12-281-1/+1
| | | | |
| * | | | Make spaces work in [audio] and [video]. Fixes #774Stefan Parviainen2014-12-281-2/+2
| | |_|/ | |/| |
* | | | issue #777, make photo cache time configurable, read the comments.friendica2014-12-272-4/+17
| | | |
* | | | revupfriendica2014-12-271-1/+1
| | | |
* | | | some more mime-type -> icon for filebrowsermarijus2014-12-271-2/+13
|/ / /
* | | more work on filesmarijus2014-12-275-48/+96
| | |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-12-2624-5/+1
|\ \ \
| * \ \ Merge pull request #767 from pafcu/appsRedMatrix2014-12-2722-0/+0
| |\ \ \ | | | |/ | | |/| Use Tango-based app icons
| | * | Make poke icon hand non-transparentStefan Parviainen2014-12-261-0/+0
| | | |
| | * | Use Tango-based app iconsStefan Parviainen2014-12-2622-0/+0
| | |/
| * | Merge pull request #766 from pafcu/autocompleteRedMatrix2014-12-271-2/+1
| |\ \ | | |/ | |/| Fix regex in contact autocomplete
| | * Fix regex in contact autocompleteStefan Parviainen2014-12-241-2/+1
| | |
| * | Cruft left over from stuff we don't have anymore.Thomas Willingham2014-12-261-3/+0
| | |
* | | doc updatefriendica2014-12-2635-655/+732
| | |
* | | change PERMS_CONTACTS to PERMS_SPECIFIC in permission roles so that ↵friendica2014-12-261-53/+53
|/ / | | | | | | individual connections can be revoked instead of this being inherited and un-changeable
* | document the new inline map codesfriendica2014-12-231-0/+8
| |
* | cleanup bb2diaspora - was getting cruftyfriendica2014-12-232-21/+1
| |
* | diaspora formatting improvements (getting too many xx-large posts)friendica2014-12-221-4/+6
| |
* | some improvements in api direct messagesfriendica2014-12-221-4/+9
| |