Commit graph

8105 commits

Author SHA1 Message Date
friendica
f7acc94bfe provide the back-end for a directory tag cloud 2013-09-17 22:52:46 -07:00
friendica
d3aa31be4d site sellpage links 2013-09-17 22:27:51 -07:00
friendica
ff2ada207a Pieces we'll need to tie together chanman and account/channel deletion and directory sync. Please do not mess with any of this.
Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this.

OK? Understood?
2013-09-17 20:50:09 -07:00
Thomas Willingham
7f4b865c2b Didn't git add again after fixing typo... 2013-09-18 02:49:14 +01:00
Thomas Willingham
8542127274 Filestorage perms (no ACL), fix nav for browsers that can't handle PCSS, put content wrapper back now JS is fixed for features page. 2013-09-18 02:45:49 +01:00
friendica
4fa68c7f3d missing verb on items linked to photos 2013-09-17 17:53:44 -07:00
friendica
9d718ac529 sync photo permissions with the attached item whenever they change. 2013-09-17 17:38:43 -07:00
friendica
6a9e86e540 bumped the capslock 2013-09-17 02:30:28 -07:00
friendica
44a4997cf7 Merge https://github.com/friendica/red into zpull 2013-09-17 02:27:34 -07:00
friendica
56de8aa05b SEO: add keywords to appropriate channel pages 2013-09-17 02:26:34 -07:00
friendica
8452535467 Merge pull request #142 from dsp1986/master
Thanks!

fix include paths
2013-09-17 01:46:53 -07:00
friendica
a27ba2195c Merge pull request #141 from MicMee/master
Preparation for server / hubloc handling
2013-09-17 01:34:17 -07:00
friendica
3354abfd42 add -C cfgfile option to shred to allow multiple configurations. I just added the option for multiple configs, I didn't make it work as it requires quite a bit of change to the shred program flow; which tries to load the default config before doing anything at all. 2013-09-17 01:31:46 -07:00
Michael Meer
4f55d154d4 removed logger statement 2013-09-17 10:14:52 +02:00
Michael Meer
d330df05f2 extend admin page for hubloc / server key management 2013-09-17 10:11:22 +02:00
dsp1986
ff56e95c6e fix include paths 2013-09-17 09:41:48 +02:00
friendica
4335ef68d6 assuming permissions are correct, unobscure photo comments. Should probably make sure permissions are correct and figure out why some photo comments on public photos are getting stored with privacy. This probably requires that whenever we change photo permissions for linked photos/items we change the item permissions to match. They might be out of sync. 2013-09-16 22:56:36 -07:00
friendica
a78b76d393 more work on viewing obscured api posts 2013-09-16 22:51:39 -07:00
friendica
c6d6c01fb6 use prepare_body in api calls to properly render content, add 'mode' to conversation templates so that themes can use the module context to suppress or show comments as desired 2013-09-16 22:40:53 -07:00
friendica
1c5d56eedc Merge https://github.com/friendica/red into zpull 2013-09-16 21:37:34 -07:00
friendica
9bff739d96 several oauth fixes - shred doesn't completely work yet, but it also doesn't completely NOT work, so at least there's some improvement 2013-09-16 21:35:52 -07:00
Thomas Willingham
8411fb2bf9 Merge pull request #139 from tazmandevil/master
fixed link to wiki
2013-09-16 20:11:41 -07:00
Tazman DeVille
6c308a2d72 fixed link to wiki 2013-09-17 04:52:36 +02:00
friendica
4b5d91ccb5 found it 2013-09-15 23:02:18 -07:00
friendica
f72cc77e46 spurious blank lines 2013-09-15 22:33:47 -07:00
friendica
9a2293df91 Merge https://github.com/friendica/red into zpull 2013-09-15 22:21:17 -07:00
friendica
4decbacda1 more logging 2013-09-15 22:19:24 -07:00
Thomas Willingham
3554bab83a Content wrapper breaks feature settings. Get rid of it as a quick fix until I get a chance to work out why it works everywhere except there. 2013-09-16 05:01:25 +01:00
friendica
603319bf63 Merge https://github.com/friendica/red into zpull 2013-09-15 19:09:21 -07:00
friendica
b3575484c7 don't create a directory sync notification (entry in the updates table) if the site record was updated - without checking first to see if anything changed. This is causing lots of sync entries when nothing changed to warrant it. 2013-09-15 19:04:11 -07:00
Thomas Willingham
9442f2fa71 Merge pull request #137 from unary/fbrowser
fix photo file browser
2013-09-15 11:45:15 -07:00
Michael Johnston
e1133ec1d0 fix photo file browser 2013-09-15 14:36:54 -04:00
friendica
033a9f67e7 Merge https://github.com/friendica/red into zpull 2013-09-15 03:52:37 -07:00
friendica
129a119c84 implement what I hope will now be the server side of directory sync, add viewsrc to item_photo_menu, and log what changed in import_xchan update objects so we can find out why there are so many updates when nothing _obvious_ has changed that should trigger it. 2013-09-15 03:48:43 -07:00
friendica
a7cd3f7dfe Merge pull request #136 from cvogeley/master
Search by date
2013-09-14 18:33:14 -07:00
Christian Vogeley
4132d1cd8e Upstream merge 2013-09-15 03:21:19 +02:00
Christian Vogeley
496f869157 Search by date
Search by date (archive) works a bit now
2013-09-15 03:18:18 +02:00
friendica
aefb0f8233 fix the missing brace before pushing 2013-09-14 17:21:39 -07:00
friendica
053893b067 some fixes to directory keyword searches 2013-09-14 17:20:24 -07:00
friendica
7a3d415267 Merge https://github.com/friendica/red into zpull 2013-09-14 16:45:27 -07:00
friendica
44ed6b0adc no longer used 2013-09-14 16:45:14 -07:00
friendica
d9f3073b60 Merge pull request #135 from unary/menuedit
allow update of menu_desc, fix bug in duplicate menu_name check
2013-09-14 16:25:18 -07:00
friendica
05c8a08ee5 Merge https://github.com/friendica/red into zpull 2013-09-14 16:12:05 -07:00
friendica
a36cc949a1 this might fix "find channels" but I can't test the keyword search until this is running on a production site. 2013-09-14 16:11:15 -07:00
Michael Johnston
ec7b462b18 set menu_channel_id before we use it in a query 2013-09-14 18:16:54 -04:00
Michael Johnston
0c4857e1a9 let me edit menu_desc even if menu_name has not changed 2013-09-14 17:59:44 -04:00
Olaf Conradi
1dd2a65210 Merge pull request #132 from pixelroot/master
modified:   view/ru/messages.po
2013-09-14 14:52:17 -07:00
Olaf Conradi
05649fa33a Revert broken commit 2013-09-14 23:39:40 +02:00
mrjive
095939f0d8 First try to tell a comment from a like/dislike in notification system 2013-09-14 20:28:56 +02:00
friendica
94417eecba import_xchan - check every known hubloc/location field and create a new hubloc if anything at all changed anywhere. 2013-09-14 01:56:25 -07:00