Commit Graph
24488 Commits
Author SHA1 Message Date
friendica f9c5cde38b Merge https://github.com/friendica/red into zpull 2013-12-04 15:39:53 -08:00
friendica ae5fb6a606 Merge pull request #222 from git-marijus/master
split conversation.css out of style.css
2013-12-04 15:43:17 -08:00
marijus 82388465e4 split conversation.css out of style.css 2013-12-04 23:32:49 +01:00
friendica d8903f09f5 include re-organisation and more doco, post_to_red fix ampersands in categories 2013-12-04 00:19:29 -08:00
friendica 7187c493e1 add hooks to zot-finger and import_xchan 2013-12-03 17:55:10 -08:00
friendica 657b842d64 more documentation work 2013-12-03 17:33:48 -08:00
friendica f57909d190 on successful magic-auth, put remote_service_class and remote_hub into the session 2013-12-03 16:31:05 -08:00
friendica 6c321be03c reorganise a few included functions - notably identity related functions 2013-12-03 15:35:13 -08:00
friendica cb17f8c2d1 rev update 2013-12-03 15:05:25 -08:00
friendica 8e1652c5f2 Merge pull request #221 from git-marijus/master
split out mod_message
2013-12-03 14:52:03 -08:00
marijus a03a198bc1 should fix typos the right way... 2013-12-03 23:35:31 +01:00
marijus 6d4a265ab2 this should remain in style.css 2013-12-03 23:26:21 +01:00
marijus 27e0f4e061 split out mod_message and a typo 2013-12-03 23:08:57 +01:00
marijus f49837d7ee Merge branch 'master' of https://github.com/friendica/red 2013-12-03 14:00:46 +01:00
friendica d96f5e2c08 undo last change to comment_email - these are checked for validity 2013-12-02 23:57:50 -08:00
friendica 9f2efb0291 ensure that every imported channel has a primary hubloc 2013-12-02 23:55:57 -08:00
friendica 061725b97a clear floats on the connect button 2013-12-02 19:26:57 -08:00
friendica 2475357e3c Merge https://github.com/friendica/red into zpull 2013-12-02 19:08:16 -08:00
friendica 645e897852 more work on magic-auth 2013-12-02 19:06:54 -08:00
friendica e0f4a76856 magic-auth re-factor 2013-12-02 17:35:44 -08:00
friendica d9f67876dc refactor magic-auth 2013-12-02 15:15:02 -08:00
marijus d525d1c26f Revert "update spin.js to latest version"
This reverts commit 51cad9cafe.
2013-12-02 12:27:12 +01:00
marijus ba895d6668 Revert "only show user-photo if not local user"
This reverts commit 6a1dfbb218.
2013-12-02 12:26:46 +01:00
marijus 0e7e5fa53d Revert "some jot tools structuring and styling"
This reverts commit 1ff69605be.
2013-12-02 12:26:07 +01:00
marijus fc8c34826e Merge branch 'master' of https://github.com/friendica/red 2013-12-02 11:30:02 +01:00
tobiasd f22302cbb6 Merge pull request #220 from tobiasd/20131202
DE: update to the strings
2013-12-02 00:27:28 -08:00
Tobias Diekershoff 91b06b67a6 DE: update to the strings 2013-12-02 09:24:24 +01:00
friendica 3fdc3515b5 some work on events permissions 2013-12-01 23:49:52 -08:00
friendica 55d8ed17a7 trimmed style.css by a few hundred lines. Needs many more such efforts 2013-12-01 21:11:47 -08:00
friendica 92f60ef51f get rid of deprecated post_url() function 2013-12-01 19:52:18 -08:00
friendica 194c1e7abc file corruption 2013-12-01 19:29:11 -08:00
friendica 71e67f6347 document the ping packet - and remove the ancient rusty brown square default profile photos. 2013-12-01 19:02:36 -08:00
friendica fa5366bb95 don't magic-auth against a deleted channel 2013-12-01 17:18:09 -08:00
friendica 77186fa7cd magic auth fix plus doco 2013-12-01 17:12:29 -08:00
friendica b1e775a7a1 zot documentation inline in the code where we need it most. 2013-12-01 16:11:18 -08:00
friendica 25f067c954 add categories and optional backlink to exported WP posts 2013-12-01 14:06:45 -08:00
friendica 4d583ab785 Merge https://github.com/friendica/red into zpull 2013-12-01 13:42:22 -08:00
friendica fefc44660f remove hook logging - too noisy 2013-12-01 13:41:51 -08:00
marijus 51cad9cafe update spin.js to latest version 2013-12-01 16:52:32 +01:00
marijus 6a1dfbb218 only show user-photo if not local user 2013-12-01 15:51:14 +01:00
Paolo T c298f6e9f7 Merge pull request #219 from tuscanhobbit/master
italian translation
2013-12-01 02:08:54 -08:00
tuscanhobbit dc7e9a92c9 italian translation 2013-12-01 11:06:10 +01:00
tuscanhobbit 57669c9216 italian translation 2013-12-01 11:02:50 +01:00
marijus 1ff69605be some jot tools structuring and styling 2013-12-01 10:55:39 +01:00
friendica d43118fdcf get rid of fetch_url - post_url will be a bit harder as several plugins need to be updated 2013-12-01 00:35:35 -08:00
friendica bd33e0486d deprecate a->get_curl_code() and $a->get_curl_headers() 2013-12-01 00:16:02 -08:00
friendica 3163731a3d hooks getting called twice 2013-11-30 03:40:25 -08:00
friendica 1c5f98440d quite a bit of work on default acl permissions and various acl quirks 2013-11-29 14:09:21 -08:00
friendica b707495b50 channel wasn't getting saved 2013-11-29 03:10:15 -08:00
friendica df66c510c9 allow zot-info to return results for address= with webbies or naked nicknames 2013-11-29 00:57:47 -08:00