Commit graph

9637 commits

Author SHA1 Message Date
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
friendica
66ecd3f8cd Merge pull request #315 from dawnbreak/master
Fix call to asset icons in RedBrowser.
2014-02-16 07:58:46 +11:00
Klaus
53d6d4c655 Fix call to asset icons in RedBrowser.
RedBrowser was not displaying asset icons correctly, because the URL was wrong.
2014-02-15 21:48:40 +01:00
zottel
54727d3a66 Merge remote-tracking branch 'upstream/master' 2014-02-15 00:52:25 +01:00
friendica
d9e4f63466 preserve attachments when editing a post 2014-02-14 13:15:02 -08:00
friendica
eadf5121d0 rev update and a minor fix (missing param) to force_refresh 2014-02-14 12:39:15 -08:00
friendica
064962ff82 doc and assets update. There is what seems to be a controversial powerpoint in this checkin. The powerpoint is of course *open source* even if powerpoint itself is not. The source file is available for your examination and revision. 2014-02-14 12:25:27 -08:00
zottel
7a6fcd9ea4 make sure the user can't inadvertently send a post with @!-tags to an
unintended audience because he had browsed the Matrix by collection or
by contact
2014-02-14 11:08:05 +01:00
friendica
b00f24ad75 fix tag delivery default permissions (use channel_allow_cid rather than allow_cid etc.) 2014-02-13 14:20:23 -08:00
friendica
43e879bc7b Merge https://github.com/friendica/red into zpull 2014-02-13 13:43:16 -08:00
friendica
ff7c717067 Merge pull request #313 from git-marijus/master
This makes advanced privacy settings adjustable in expert mode only. Als...
2014-02-14 08:42:02 +11:00
marijus
d7546c7a63 This makes advanced privacy settings adjustable in expert mode only. Also they are hidden behind a button. This is a design hotfix should probably come up with something better someday... 2014-02-13 19:29:06 +01:00
friendica
213c03c606 more debugging dav in windows, windows never forgets your dav credentials even if you get them wrong and even if you remove them from the credential vault. This makes it very difficult to manage two or more channels with file resources. 2014-02-13 03:52:16 -08:00
friendica
5cedc324eb reddav - disable assets 2014-02-13 03:06:48 -08:00
friendica
99c19b307e don't fix the height of the archive widget - fix the maximum height 2014-02-13 02:55:16 -08:00
friendica
ec99cac9e8 very simple scheme 2014-02-13 00:52:54 -08:00
friendica
d4d44f9878 oops - still using the !@#$ youtube bbcodes 2014-02-12 19:59:24 -08:00
friendica
bff92e7a21 remove some obsolete bbcode tags 2014-02-12 19:57:22 -08:00
friendica
c7dda0c4c1 return the expected array 2014-02-12 15:12:42 -08:00
friendica
11e6530d7f Merge pull request #312 from git-marijus/master
dont show onlinestatus if block_public is on
2014-02-13 10:08:20 +11:00
friendica
2c1b366fdf make activities optional for profile things, clean up the forms 2014-02-12 14:44:27 -08:00
marijus
8e68ecc68b dont show onlinestatus if block_public is on 2014-02-12 23:41:08 +01:00
friendica
1ca85abf83 Merge https://github.com/friendica/red into zpull 2014-02-12 13:46:25 -08:00
friendica
7c0101899d another bbcode addition for the demo, however this one is potentially useful for other purposes 2014-02-12 13:45:11 -08:00
friendica
a14df3ab72 Merge pull request #311 from git-marijus/master
make chatrooms in /chat/channel visible to observers aswell
2014-02-13 08:43:20 +11:00
marijus
18b2ff9c24 whitespace 2014-02-12 21:36:20 +01:00
marijus
e06d9e97c5 make chatrooms in /chat/channel visible to observers aswell 2014-02-12 21:31:11 +01:00
friendica
e47035f85a bbcode element of where you are on a site. perhaps this is less than generally useful but I plan to use it in a demo video where there is no other way to accomplish this 2014-02-12 11:42:33 -08:00
friendica
ba360b4347 ui improvements on the manage page 2014-02-12 03:05:55 -08:00
friendica
2fefbfdea3 Merge https://github.com/friendica/red into zpull 2014-02-12 00:05:29 -08:00