Commit graph

12546 commits

Author SHA1 Message Date
Andrew Manning
c49b521884 Added url tag around image for inserted links 2014-12-30 16:16:57 -06:00
anaqreon
b78a545a10 Merge pull request #1 from friendica/master
Pull from upstream
2014-12-30 16:06:35 -06:00
pafcu
43671a0a32 Merge pull request #792 from pafcu/cssrefactor
Make redbasic css more modular
2014-12-30 22:42:34 +02:00
pafcu
0623b47237 Merge pull request #793 from pafcu/filestorageurlfix
Encode URL offered in filestorage. Fixes #780
2014-12-30 22:40:53 +02:00
pafcu
3096ae43c3 Merge pull request #790 from pafcu/sortnotifications
Sort notifications
2014-12-30 22:39:31 +02:00
Stefan Parviainen
2444a3f9d9 Don't show links to edit alternate profiles if multi_profiles is disabled 2014-12-30 21:33:20 +01:00
marijus
4edc9a696b design fixes for photos, files and random fixes 2014-12-30 21:04:48 +01:00
Stefan Parviainen
b54bbf0fb8 Update function doc, return language code if language is not recognized 2014-12-30 20:34:26 +01:00
Stefan Parviainen
9cab8ae58a Language names via intl library. Fixes #773 2014-12-30 20:29:31 +01:00
Stefan Parviainen
f6b16e1d5a Encode URL offered in filestorage. Fixes #780 2014-12-30 18:11:45 +01:00
Stefan Parviainen
e6a3ea2c95 Make showing wall posts, intros and private messages under Notices optional 2014-12-30 15:27:33 +01:00
Stefan Parviainen
2710510392 Sort notifications 2014-12-30 15:21:29 +01:00
Stefan Parviainen
12e6d98659 Remove some old, unused templates 2014-12-30 14:11:27 +01:00
marijus
8e034a3b6b fix recursive file permissions 2014-12-30 13:56:27 +01:00
marijus
6cbbe854d5 css fixes 2014-12-30 12:12:55 +01:00
Stefan Parviainen
6501c4d93e Make redbasic css more modular 2014-12-30 11:32:00 +01:00
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
de338b3dd7 Show some notification badges in red to indicate they are about you 2014-12-29 20:43:24 +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
Christian Vogeley
4a0150026b merge 2014-12-27 22:37:10 +01:00
marijus
cafc1b64b0 some more mime-type -> icon for filebrowser 2014-12-27 14:28:02 +01:00