Commit graph

12278 commits

Author SHA1 Message Date
friendica
2f650b74d3 Merge branch 'master' into trinidad 2014-12-29 23:58:14 -08:00
friendica
9b2c71a5dc Merge https://github.com/friendica/red into pending_merge 2014-12-29 23:57:33 -08:00
friendica
5cfe051139 initial trinidad checkin 2014-12-29 23:48:04 -08:00
friendica
20356217c5 revup 2014-12-29 23:41:37 -08:00
RedMatrix
619733e297 Merge pull request #789 from pafcu/chanman
Don't show current channel separately in channel manager, highlight it i...
2014-12-30 08:57:37 +11:00
RedMatrix
d1d4cec932 Merge pull request #787 from pafcu/mainjsfix
Only call autotime() on the correct elements
2014-12-30 08:57:08 +11:00
RedMatrix
ca8b31b989 Merge pull request #786 from f03el/master
Don't trim escaped quotes
2014-12-30 08:56:50 +11:00
marijus
f2bfdf0c76 some work on cloud actionspanel and minor cleanup 2014-12-29 22:45:07 +01:00
Stefan Parviainen
e69e59d260 Don't show current channel separately in channel manager, highlight it instead 2014-12-29 22:07:40 +01:00
marijus
d801c361d6 css fixes and remove sloppy photos setting since it is not supported anymore in redbasic 2014-12-29 21:53:00 +01:00
Stefan Parviainen
345943d48f Only call autotime() on the correct elements 2014-12-29 20:02:56 +01:00
Erik Lundin
d029d3a9f9 Don't trim escaped quotes 2014-12-29 17:24:53 +01:00
Thomas Willingham
a70e42edac Remove link to hubloc status in admin panel. This is a potentially useful tool,
but plain doesn't work at the moment.
2014-12-29 14:47:41 +00:00
Paolo T
ca182d7024 Merge pull request #784 from tuscanhobbit/dev
Italian localization
2014-12-29 09:11:25 +01:00
Paolo Tacconi
bcbfc83376 Italian localization 2014-12-29 09:09:51 +01:00
friendica
3065650683 filter posts you author from unseen notifications - note there are other 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. 2014-12-28 23:21:49 -08:00
RedMatrix
b7d2b9c1ef Merge pull request #778 from pafcu/loginredir
Redirect to login page on failed login. Fixes #628
2014-12-29 09:29:23 +11:00
RedMatrix
7b98a6fcb0 Merge pull request #772 from pafcu/chanman
Some work on the channel manager
2014-12-29 09:29:12 +11:00
RedMatrix
6cdd5d1c48 Merge pull request #770 from pafcu/apps
More work on app icons
2014-12-29 09:29:00 +11:00
RedMatrix
8d144396b1 Merge pull request #769 from pafcu/profiles
Redirect /profiles to default profile when multi_profiles is off. Fixes ...
2014-12-29 09:28:47 +11:00
marijus
fa23439b9c more files css fixes 2014-12-28 20:46:16 +01:00
marijus
1ab23061df files css fixes 2014-12-28 20:34:12 +01:00
marijus
801ab709ad more work on files 2014-12-28 18:16:27 +01:00
pafcu
0e0a4e4999 Merge pull request #781 from pafcu/docfix
Document photo_cache_time setting
2014-12-28 12:44:49 +02:00
Stefan Parviainen
69aeb5d205 Document photo_cache_time setting 2014-12-28 11:43:54 +01:00
pafcu
0b79445b57 Merge pull request #779 from pafcu/audio
Make spaces work in [audio] and [video]. Fixes #774
2014-12-28 12:30:20 +02:00
Stefan Parviainen
fffc7dffba Fix typo 2014-12-28 11:28:54 +01:00
Stefan Parviainen
f08ee3bab9 Make spaces work in [audio] and [video]. Fixes #774 2014-12-28 11:22:58 +01:00
Stefan Parviainen
426ac22e12 Redirect to login page on failed login. Fixes #628 2014-12-28 09:26:30 +01:00
friendica
50943f439c issue #777, make photo cache time configurable, read the comments. 2014-12-27 18:19:51 -08:00
friendica
096956ff78 revup 2014-12-27 14:04:13 -08:00
marijus
cafc1b64b0 some more mime-type -> icon for filebrowser 2014-12-27 14:28:02 +01:00
Stefan Parviainen
40a327b68f Allow quick access to mail and connections from Channel Manager 2014-12-27 14:06:09 +01:00
Stefan Parviainen
6a679d26ce Fix #771, add tooltips to mail and intros count in channel manager, always show counts (even when 0, makes it easier to understand what the icons are) 2014-12-27 13:36:05 +01:00
Stefan Parviainen
754fec9a54 Redirect /profiles to default profile when multi_profiles is off. Fixes #768 2014-12-27 12:46:59 +01:00
Stefan Parviainen
cdab20f1fe New icons for profile, random profile and profile photo 2014-12-27 12:07:20 +01:00
Stefan Parviainen
2a49c3ff72 Show bug reporting app to visitors 2014-12-27 11:20:41 +01:00
Stefan Parviainen
a8d5cf56e3 New icon for language selection 2014-12-27 11:16:11 +01:00
marijus
0cb0c2b1bf more work on files 2014-12-27 10:10:56 +01:00
friendica
82d3c2a7e0 Merge https://github.com/friendica/red into pending_merge 2014-12-26 15:45:50 -08:00
RedMatrix
e08226f432 Merge pull request #767 from pafcu/apps
Use Tango-based app icons
2014-12-27 10:44:00 +11:00
Stefan Parviainen
5395bb5dee Make poke icon hand non-transparent 2014-12-26 23:38:40 +01:00
Stefan Parviainen
bb2c68cba3 Use Tango-based app icons 2014-12-26 23:24:50 +01:00
RedMatrix
bfc0b00d93 Merge pull request #766 from pafcu/autocomplete
Fix regex in contact autocomplete
2014-12-27 09:24:47 +11:00
Thomas Willingham
0130fb077f Cruft left over from stuff we don't have anymore. 2014-12-26 16:59:52 +00:00
friendica
7ba92feabf doc update 2014-12-26 00:13:22 -08:00
friendica
ca0c310b65 change PERMS_CONTACTS to PERMS_SPECIFIC in permission roles so that individual connections can be revoked instead of this being inherited and un-changeable 2014-12-26 00:09:34 -08:00
Stefan Parviainen
a02d155f79 Fix regex in contact autocomplete 2014-12-24 08:30:35 +01:00
friendica
d1273b17e5 document the new inline map codes 2014-12-23 14:47:34 -08:00
friendica
b171ea23e4 cleanup bb2diaspora - was getting crufty 2014-12-23 14:18:27 -08:00