zottel
b223b52f83
Merge remote-tracking branch 'upstream/master'
2014-02-20 08:42:40 +01:00
marijus
5939da8b09
Merge branch 'master' of https://github.com/friendica/red
2014-02-20 08:33:55 +01:00
friendica
c219451702
Merge pull request #324 from tonybaldwin/master
...
Do not view remote profiles in frames. (changed description for display->settings), in ALL relevant files
2014-02-20 15:26:17 +11:00
friendica
a29b71547a
use a "fullscreen" icon for chanview full screen mode; add channel_menu selection and setting to the settings page.
2014-02-19 20:19:56 -08:00
tony baldwin
9715176a56
s/View remote profiles as webpages/Do not view remote profiles in
...
frames/g
2014-02-19 22:56:52 -05:00
friendica
40dbd34405
Merge pull request #322 from dawnbreak/master
...
Doxygen include/attach.php
2014-02-20 14:08:47 +11:00
friendica
5ae05e32e5
Merge pull request #321 from git-marijus/master
...
bootstrapify the nav
2014-02-20 14:06:00 +11:00
marijus
225ad00b0e
Merge branch 'master' of https://github.com/friendica/red
2014-02-20 00:29:33 +01:00
Paolo T
eae1063663
Merge pull request #323 from tuscanhobbit/master
...
IT: update to the strings
2014-02-19 22:03:48 +01:00
tuscanhobbit
c82970c6bb
IT: update to the strings
2014-02-19 21:57:37 +01:00
Klaus
d755fb83a7
Doxygen include/attach.php
...
Some Doxygen as far as I understood and some styleguides.
2014-02-19 21:04:20 +01:00
marijus
82b028173c
another correction
2014-02-19 20:08:02 +01:00
marijus
31d9bf0417
Merge branch 'master' of https://github.com/friendica/red
2014-02-19 19:31:29 +01:00
marijus
3a6760f6d1
one pixel to much...
2014-02-19 18:55:24 +01:00
marijus
c09087262c
bootstrapify the nav
2014-02-19 18:42:37 +01:00
zottel
79d3dae7fa
Merge remote-tracking branch 'upstream/master'
2014-02-19 08:30:14 +01:00
friendica
24d119b8c4
introduce a new privacy level "PERMS_AUTHED" to indicate somebody that is able to successfully authenticate (but is not necessarily in this network).
2014-02-18 20:59:25 -08:00
friendica
6ac81c9360
fix zrl bookmarks which broke with this checkin: c9192991c9
...
It was documented that:
Issues: Currently the order of HTML parameters in the text is somewhat rigid and inflexible.
but as that was in a different function it was easy to overlook.
2014-02-18 19:47:13 -08:00
friendica
a258c8b98b
Merge https://github.com/friendica/red into zpull
2014-02-18 19:17:45 -08:00
friendica
87bb568d67
change edit/delete to icons on filestorage page
2014-02-18 19:17:11 -08:00
friendica
2e305742fa
Merge pull request #320 from dawnbreak/master
...
Let user cancel the red_encrypt dialogue
2014-02-19 12:01:34 +11:00
friendica
5747e20e50
some more snakebite and fix up include/account - forgot about that inline array stuff
2014-02-18 16:59:31 -08:00
friendica
7d4916ec71
service class downgrade to the default service class on account expiration if using a non-default service class and account has expired.
2014-02-18 15:17:18 -08:00
friendica
9a51f8ce65
edit bookmarks
2014-02-18 14:26:23 -08:00
Klaus
aa44d3abab
Let user cancel the red_encrypt dialogue
...
If the user press cancel on the prompt also cancel the encryption. Maybe should also add this to passhint promt.
2014-02-18 17:41:59 +01:00
friendica
0b4aa5a39c
get_theme_uid() - if no uid, look for a system channel and use that. This allows default theme/scheme tweaks at the server level.
2014-02-17 20:38:30 -08:00
friendica
309ae2d1e4
update the donation link
2014-02-17 20:33:52 -08:00
friendica
d5c55250f9
remove the exit clause
2014-02-17 20:24:34 -08:00
friendica
ea709361f6
snakebite, cont. magic-auth via openid is now possible, with the caveat that one needs a hand-crafted xchan at the moment to make use of it and if you wish to do so, there will be no assistance or help provided. The risk of system instability and mangled DBs now and going forward is significant if you try this.
2014-02-17 20:10:43 -08:00
friendica
d6ab975b18
operation snakebite continued. openid now works for local accounts using the rmagic module and after storing your openid in pconfig. This is just an interesting but trivial (in the bigger scheme of things) side effect of snakebite. The snake hasn't even waken up yet.
2014-02-17 19:48:05 -08:00
friendica
7fc292831c
update openid for snakebite
2014-02-17 18:50:24 -08:00
friendica
d3120264cb
more snakebite stuff
2014-02-17 18:23:01 -08:00
friendica
9b0ae023ff
Merge https://github.com/friendica/red into zpull
2014-02-17 16:00:39 -08:00
friendica
b3ce1cd87b
project "snakebite"
2014-02-17 16:00:17 -08:00
friendica
2de0bb4981
Merge pull request #319 from dawnbreak/master
...
Commenting language.php and some changes
2014-02-18 10:30:09 +11:00
Klaus
bee287f859
Commenting language.php and some changes
...
Some commenting for Doxygen, simplified detect_language() a bit, added a new function get_language_name() that I will use soon or can be used in general to display localized language names from language codes.
2014-02-18 00:14:07 +01:00
friendica
08b571c9d0
project "snakebite"
2014-02-17 14:30:02 -08:00
zottel
2bca219911
Merge remote-tracking branch 'upstream/master'
2014-02-17 08:17:47 +01:00
friendica
f38ab09041
Merge pull request #316 from dawnbreak/master
...
Make asset icons work in subdir installs as well.
2014-02-17 15:11:05 +11:00
friendica
df22a78936
Merge pull request #314 from zzottel/master
...
Make @!-tags safer
2014-02-17 15:09:11 +11:00
friendica
70526915c8
several things were not working correctly w/r/t community tagging. The preference vanished from settings at some point, and we also weren't updating the original post timestamp so that the changed taxonomy would propagate correctly as an edit.
2014-02-16 16:04:46 -08:00
friendica
16cd9e2a7e
don't include deleted channels in number of channels service class checks
2014-02-16 14:48:07 -08:00
friendica
663dd39015
don't show deleted channels on admin account summary page
2014-02-16 14:39:27 -08:00
friendica
0f5ebb9b5a
Merge https://github.com/friendica/red into zpull
2014-02-16 14:14:50 -08:00
friendica
ebd52368bb
strip hard-wired zids from posted links as they will have the wrong identity when somebody tries to view the link
2014-02-16 14:13:26 -08:00
Thomas Willingham
e40cdb2047
Windows hack for proc_run() from Marshall
2014-02-16 21:53:07 +00:00
Klaus
29f6a1ee33
removed unused function posted_date_widget
...
This functions seems not to be used anywhere. include/widgets.php contains widget_archive($arr) which has the same functionality.
2014-02-16 10:25:32 +01:00
tobiasd
8080fdf558
Merge pull request #318 from tobiasd/20140216
...
DE: update to the strings
2014-02-16 08:20:07 +01:00
Tobias Diekershoff
06680e504a
DE: update to the strings
2014-02-16 08:18:43 +01:00
Klaus
01f31c2f20
Make asset icons work in subdir installs as well.
...
This should be the right way I guess, especially if red# is installed in a subdirectory. (untested)
2014-02-15 22:25:14 +01:00