Commit graph

7973 commits

Author SHA1 Message Date
friendica
d8ef1417fb poll stuff 2013-08-21 01:33:20 -07:00
friendica
5d35d21100 network-wide poll voting structure 2013-08-20 20:39:00 -07:00
friendica
c4f1431215 Merge https://github.com/friendica/red into zpull 2013-08-20 19:52:30 -07:00
friendica
02a3694868 fix superblock for comments 2013-08-20 19:51:58 -07:00
Paolo T
f3ba283613 Merge pull request #1 from friendica/master
Test update of my branched Red
2013-08-20 08:01:30 -07:00
friendica
25fdc269be Merge pull request #101 from tuscanhobbit/master
Italian translation (Thanks!)
2013-08-20 05:07:54 -07:00
p.tacconi
add03b6498 First version of Italian translation 2013-08-20 11:20:16 +02:00
p.tacconi
a53a092b44 First version of Italian translation 2013-08-20 10:13:50 +02:00
friendica
cd5fdbcb48 email attachments (and fix email photos) 2013-08-19 21:19:39 -07:00
friendica
b9314935e6 localize_item() thinks all likes on posts are likes on comments because we didn't pass any info in the activity object to distinguish them from each other. 2013-08-19 19:05:11 -07:00
friendica
2e14dc242e if changing primary hub during an import operation - remove the old xchan and create a fresh xchan pointing at this instance. Also a minor edit to increase the default photo upload limit for new sites. There aren't many cameras left that will take photos < 800k in size. 2013-08-19 17:18:13 -07:00
friendica
20f3d09708 some sane permission defaults. 2013-08-18 20:20:03 -07:00
friendica
e094c23f11 Merge pull request #100 from cvogeley/master
More steps for mobile theme toggling + dash elimination
2013-08-18 16:24:29 -07:00
Christian Vogeley
5c0220df09 More steps for mobile theme toggling + dash elimination 2013-08-19 01:08:15 +02:00
friendica
8bac352b1c item_store logging to discover where object is getting quote mangled. 2013-08-18 05:04:37 -07:00
friendica
9fb2a87c9a Another try at issue #61 and #62 - an earlier fix was partially working but the issue persisted - this extends it a bit. 2013-08-18 00:04:38 -07:00
Thomas Willingham
353ccaac05 Issue #99 2013-08-18 05:03:04 +01:00
friendica
b5efa1a63a issue #82, posted order not working - also doc update 2013-08-17 06:30:09 -07:00
friendica
a8dd7280b3 get rid of more variables with dashes in the names - use underscore *except* in CSS. These were probably already here, but if you see any - please keep them out of PHP and MySQL where they sometimes get interpreted as a subtraction operation and are a bugger to find. 2013-08-15 22:52:19 -07:00
friendica
fc0a9c78a9 Merge https://github.com/friendica/red into zpull 2013-08-15 22:42:36 -07:00
friendica
1c1449cd82 we only want to maintain one INSTALL.txt - and it is in the directory 'install' where it belongs. 2013-08-15 22:41:34 -07:00
friendica
b3070cf496 Merge pull request #98 from cvogeley/master
Partial fix for Issue #97
2013-08-15 22:31:32 -07:00
friendica
d0951777c0 fix import from file 2013-08-15 19:21:22 -07:00
friendica
764e0201ce don't include archived contacts in public posts, unless specifically requested 2013-08-15 17:43:19 -07:00
Christian Vogeley
40204ad6e3 Do it like normal themes 2013-08-16 02:38:30 +02:00
friendica
d46436dc9c issues marking for death 2013-08-15 17:36:00 -07:00
Christian Vogeley
bdfd0aa917 Fix Load mobile theme 2013-08-16 02:30:55 +02:00
friendica
ef414ba94c fix homebase variable 2013-08-15 05:20:23 -07:00
friendica
92747366af move js from matrix page 2013-08-15 05:09:19 -07:00
friendica
c17f7124f3 not able to drop pending connections 2013-08-15 01:32:09 -07:00
friendica
efb730cedc show main menu page even if no menus exist 2013-08-14 21:24:40 -07:00
friendica
00c9995766 Merge https://github.com/friendica/red into zpull 2013-08-14 20:51:55 -07:00
friendica
7d0b1506a8 Merge pull request #96 from beardy-unixer/master
Webpages
2013-08-14 20:56:49 -07:00
friendica
258d8e3189 util/pconfig - if you understand util/config you'll understand this; if you don't you won't 2013-08-14 20:47:04 -07:00
friendica
ac541a7d32 most of expire is now ported from friendica, but the protocol bits to push out the delete notifications for the entire batch to all recipients of the original post are not complete and will take quite a bit more work. As a consequence, expire has been completely disabled until it is fully implmented since it could result in completely un-removable posts reminiscent of the infamous "Bonnie Nadri" incident at Diaspora which we do not wish to re-live. 2013-08-14 20:09:02 -07:00
Thomas Willingham
608e04c65e More progress on pages - extend writepages widget, add pagelist widget 2013-08-14 20:46:48 +01:00
Thomas Willingham
a0dfd44f91 Merge remote-tracking branch 'upstream/master' 2013-08-14 20:44:17 +01:00
friendica
de4e4c5ebd typo 2013-08-14 05:29:01 -07:00
friendica
f287ff596c fix expire so it actually should expire stuff; and mostly the correct stuff - though it DOESN'T currently send out notifications to connections 2013-08-14 05:26:17 -07:00
friendica
6da4e41031 ru strings updated 2013-08-14 05:03:18 -07:00
friendica
499241c245 Merge pull request #95 from pixelroot/master
modified:   view/ru/messages.po
2013-08-14 05:06:20 -07:00
friendica
4888ab4d0f primitive cms functionality - provide a custom menu below your profile vcard 2013-08-13 22:14:01 -07:00
friendica
17e405cfa9 helps to include the new templates... 2013-08-13 21:01:34 -07:00
friendica
9508967c73 menu management is now functional with the exception of acl's (and of course a way to display the menus you create, and probably a bit more input sanity checking) 2013-08-13 20:57:03 -07:00
friendica
680baff73d menu management complete (as opposed to menu *content* management, which is not). As usual, this means functionally complete - as theming and presentation have been left for those more suited to the task. 2013-08-13 18:10:03 -07:00
friendica
d6c6a2b144 debugging issue #58 - seems to work but needs (more) theming 2013-08-13 02:29:10 -07:00
friendica
b9a8b73392 untested patch for issue #58 - will require theming if it works 2013-08-13 02:06:05 -07:00
friendica
55cb322489 a bit more work on menus 2013-08-13 01:24:02 -07:00
friendica
04f8de184e block content-type (called ITEM_BUILDBLOCK to avoid confusion with content that is blocked) 2013-08-12 17:42:52 -07:00
pixelroot
b860188f71 modified: view/ru/messages.po 2013-08-12 15:46:01 +02:00