harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 9c4c0e6d23 prevent mod/cloud looping (ping gets a new session on each call [wtf?] which triggers our "changed uid" detector) friendica 2014-02-22 03:38:23 -08:00
  • f63e220939 Merge https://github.com/friendica/red into zpull friendica 2014-02-21 23:52:20 -08:00
  • 9e2ea6b5d4 strings/version update friendica 2014-02-21 23:51:57 -08:00
  • 0501bab7dc doc update friendica 2014-02-21 23:51:43 -08:00
  • 07fb85fcc9 Merge pull request #332 from zzottel/master friendica 2014-02-22 09:01:48 +11:00
  • e43ffdaaf4 Merge pull request #331 from git-marijus/master friendica 2014-02-22 09:01:31 +11:00
  • a66e7d2999 changed old Friendica stuff to what we have now in Red zottel 2014-02-21 22:27:21 +01:00
  • fe6cd80285 small corrections zottel 2014-02-21 22:27:03 +01:00
  • d58068186b first few German help files zottel 2014-02-21 22:26:29 +01:00
  • 6249178b79 Merge remote-tracking branch 'upstream/master' zottel 2014-02-21 22:25:06 +01:00
  • 32d0189b56 remove some design fixes which got fixed in bootstrap 3.1.1 marijus 2014-02-21 14:38:21 +01:00
  • 8c37a01f74 dont allow bootstrap to mess with blockquote font-size marijus 2014-02-21 13:57:00 +01:00
  • 7b1cabdd58 quickfix for edit profile dropdown marijus 2014-02-21 13:26:13 +01:00
  • 593631d8f5 oups... to much cleaning... marijus 2014-02-21 13:03:32 +01:00
  • 9473ddd576 update to bootstrap version 3.1.1 which is now completely MIT licensed marijus 2014-02-21 12:47:19 +01:00
  • c128c6e84a Merge pull request #330 from git-marijus/master friendica 2014-02-21 22:44:49 +11:00
  • 052be3c92b cleanup style.css marijus 2014-02-21 12:16:26 +01:00
  • 8bd006bea8 Merge remote-tracking branch 'upstream/master' zottel 2014-02-21 08:54:46 +01:00
  • 44d7047fce SECURITY: do not automatically open an iframe which points into the local website. friendica 2014-02-20 21:15:35 -08:00
  • 9db40322ab move jgrowl (alert popup) out of the now taller navbar friendica 2014-02-20 18:51:35 -08:00
  • 8367a92214 fix login weirdness for accounts that need to be approved friendica 2014-02-20 18:38:52 -08:00
  • e12f6f1bd9 small changes to a couple of lookup functions which we need to use a bit more friendica 2014-02-20 17:20:24 -08:00
  • 057e6660ca Merge https://github.com/friendica/red into zpull friendica 2014-02-20 17:08:02 -08:00
  • e55170c00a code cleanup friendica 2014-02-20 17:07:43 -08:00
  • df8e8c3bc5 Merge pull request #327 from git-marijus/master friendica 2014-02-21 10:18:34 +11:00
  • 5c984aab66 Merge https://github.com/friendica/red into zpull friendica 2014-02-20 15:00:58 -08:00
  • 3bddaa9e04 title missing in private mention posts friendica 2014-02-20 15:00:29 -08:00
  • aa9ae54ee6 Merge pull request #328 from tuscanhobbit/master Paolo T 2014-02-20 23:40:21 +01:00
  • 34d30e4d7e PT-BR: update to the strings tuscanhobbit 2014-02-20 23:37:54 +01:00
  • e56abd1782 updated fr translation friendica 2014-02-20 14:15:57 -08:00
  • a3191996e7 fixes issue #326 initial scale to big marijus 2014-02-20 19:54:16 +01:00
  • 1f8360a832 reimplementing navbar colours that were undone by git-marjus tony baldwin 2014-02-20 07:05:55 -05:00
  • 4944070e79 vsprintf error on update friendica 2014-02-20 02:30:37 -08:00
  • 79c566bda3 Merge remote-tracking branch 'upstream/master' zottel 2014-02-20 11:17:07 +01:00
  • d8434bb480 use the medium size photo on the nav bar if that photo stays larger, as the small one usually looks awful when you scale it up. friendica 2014-02-20 01:49:40 -08:00
  • a7194bc79a fix the broken hublocs in an update friendica 2014-02-20 01:44:29 -08:00
  • 6eb971656e believe i found the issue which was causing hundreds/thousands of identical hublocs to be created friendica 2014-02-20 01:35:08 -08:00
  • b223b52f83 Merge remote-tracking branch 'upstream/master' zottel 2014-02-20 08:42:40 +01:00
  • 5939da8b09 Merge branch 'master' of https://github.com/friendica/red marijus 2014-02-20 08:33:55 +01:00
  • c219451702 Merge pull request #324 from tonybaldwin/master friendica 2014-02-20 15:26:17 +11:00
  • a29b71547a use a "fullscreen" icon for chanview full screen mode; add channel_menu selection and setting to the settings page. friendica 2014-02-19 20:19:56 -08:00
  • 9715176a56 s/View remote profiles as webpages/Do not view remote profiles in frames/g tony baldwin 2014-02-19 22:56:52 -05:00
  • 40dbd34405 Merge pull request #322 from dawnbreak/master friendica 2014-02-20 14:08:47 +11:00
  • 5ae05e32e5 Merge pull request #321 from git-marijus/master friendica 2014-02-20 14:06:00 +11:00
  • 225ad00b0e Merge branch 'master' of https://github.com/friendica/red marijus 2014-02-20 00:29:33 +01:00
  • eae1063663 Merge pull request #323 from tuscanhobbit/master Paolo T 2014-02-19 22:03:48 +01:00
  • c82970c6bb IT: update to the strings tuscanhobbit 2014-02-19 21:57:37 +01:00
  • d755fb83a7 Doxygen include/attach.php Klaus 2014-02-19 21:04:20 +01:00
  • 82b028173c another correction marijus 2014-02-19 20:08:02 +01:00
  • 31d9bf0417 Merge branch 'master' of https://github.com/friendica/red marijus 2014-02-19 19:31:29 +01:00
  • 3a6760f6d1 one pixel to much... marijus 2014-02-19 18:55:24 +01:00
  • c09087262c bootstrapify the nav marijus 2014-02-19 18:42:37 +01:00
  • 79d3dae7fa Merge remote-tracking branch 'upstream/master' zottel 2014-02-19 08:30:14 +01:00
  • 24d119b8c4 introduce a new privacy level "PERMS_AUTHED" to indicate somebody that is able to successfully authenticate (but is not necessarily in this network). friendica 2014-02-18 20:59:25 -08:00
  • 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. friendica 2014-02-18 19:47:13 -08:00
  • a258c8b98b Merge https://github.com/friendica/red into zpull friendica 2014-02-18 19:17:45 -08:00
  • 87bb568d67 change edit/delete to icons on filestorage page friendica 2014-02-18 19:17:11 -08:00
  • 2e305742fa Merge pull request #320 from dawnbreak/master friendica 2014-02-19 12:01:34 +11:00
  • 5747e20e50 some more snakebite and fix up include/account - forgot about that inline array stuff friendica 2014-02-18 16:59:31 -08:00
  • 7d4916ec71 service class downgrade to the default service class on account expiration if using a non-default service class and account has expired. friendica 2014-02-18 15:17:18 -08:00
  • 9a51f8ce65 edit bookmarks friendica 2014-02-18 14:26:23 -08:00
  • aa44d3abab Let user cancel the red_encrypt dialogue Klaus 2014-02-18 17:41:59 +01:00
  • 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. friendica 2014-02-17 20:38:30 -08:00
  • 309ae2d1e4 update the donation link friendica 2014-02-17 20:33:52 -08:00
  • d5c55250f9 remove the exit clause friendica 2014-02-17 20:24:34 -08:00
  • 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. friendica 2014-02-17 20:10:43 -08:00
  • 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. friendica 2014-02-17 19:48:05 -08:00
  • 7fc292831c update openid for snakebite friendica 2014-02-17 18:50:24 -08:00
  • d3120264cb more snakebite stuff friendica 2014-02-17 18:23:01 -08:00
  • 9b0ae023ff Merge https://github.com/friendica/red into zpull friendica 2014-02-17 16:00:39 -08:00
  • b3ce1cd87b project "snakebite" friendica 2014-02-17 16:00:17 -08:00
  • 2de0bb4981 Merge pull request #319 from dawnbreak/master friendica 2014-02-18 10:30:09 +11:00
  • bee287f859 Commenting language.php and some changes Klaus 2014-02-18 00:14:07 +01:00
  • 08b571c9d0 project "snakebite" friendica 2014-02-17 14:30:02 -08:00
  • 2bca219911 Merge remote-tracking branch 'upstream/master' zottel 2014-02-17 08:17:47 +01:00
  • f38ab09041 Merge pull request #316 from dawnbreak/master friendica 2014-02-17 15:11:05 +11:00
  • df22a78936 Merge pull request #314 from zzottel/master friendica 2014-02-17 15:09:11 +11:00
  • 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. friendica 2014-02-16 16:04:46 -08:00
  • 16cd9e2a7e don't include deleted channels in number of channels service class checks friendica 2014-02-16 14:48:07 -08:00
  • 663dd39015 don't show deleted channels on admin account summary page friendica 2014-02-16 14:39:27 -08:00
  • 0f5ebb9b5a Merge https://github.com/friendica/red into zpull friendica 2014-02-16 14:14:50 -08:00
  • ebd52368bb strip hard-wired zids from posted links as they will have the wrong identity when somebody tries to view the link friendica 2014-02-16 14:13:26 -08:00
  • e40cdb2047 Windows hack for proc_run() from Marshall Thomas Willingham 2014-02-16 21:53:07 +00:00
  • 29f6a1ee33 removed unused function posted_date_widget Klaus 2014-02-16 10:25:32 +01:00
  • 8080fdf558 Merge pull request #318 from tobiasd/20140216 tobiasd 2014-02-16 08:20:07 +01:00
  • 06680e504a DE: update to the strings Tobias Diekershoff 2014-02-16 08:18:43 +01:00
  • 01f31c2f20 Make asset icons work in subdir installs as well. Klaus 2014-02-15 22:25:14 +01:00
  • 66ecd3f8cd Merge pull request #315 from dawnbreak/master friendica 2014-02-16 07:58:46 +11:00
  • 53d6d4c655 Fix call to asset icons in RedBrowser. Klaus 2014-02-15 21:48:40 +01:00
  • 54727d3a66 Merge remote-tracking branch 'upstream/master' zottel 2014-02-15 00:52:25 +01:00
  • d9e4f63466 preserve attachments when editing a post friendica 2014-02-14 13:15:02 -08:00
  • eadf5121d0 rev update and a minor fix (missing param) to force_refresh friendica 2014-02-14 12:39:15 -08:00
  • 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. friendica 2014-02-14 12:25:27 -08:00
  • 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 zottel 2014-02-14 11:08:05 +01:00
  • b00f24ad75 fix tag delivery default permissions (use channel_allow_cid rather than allow_cid etc.) friendica 2014-02-13 14:20:23 -08:00
  • 43e879bc7b Merge https://github.com/friendica/red into zpull friendica 2014-02-13 13:43:16 -08:00
  • ff7c717067 Merge pull request #313 from git-marijus/master friendica 2014-02-14 08:42:02 +11:00
  • 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... marijus 2014-02-13 19:29:06 +01:00
  • 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. friendica 2014-02-13 03:52:16 -08:00
  • 5cedc324eb reddav - disable assets friendica 2014-02-13 03:06:48 -08:00