Commit Graph

2659 Commits

Author SHA1 Message Date
Thomas Willingham
49cfca4b4c Make $kw configurable. 2013-09-20 02:38:59 +01:00
friendica
9f237f7dba Merge https://github.com/friendica/red into zpull 2013-09-19 17:41:08 -07:00
friendica
ef88ba11ba prefill private mail recip from $_REQUEST['to'] if it's there. 2013-09-19 17:40:17 -07:00
Thomas Willingham
2eaea80195 Add tiered access option. 2013-09-19 22:36:25 +01:00
friendica
e4d2e2200e add "tiered" access policy, add tagcloud to directory pages 2013-09-18 17:47:26 -07:00
friendica
9d49f2a47b make collections work again 2013-09-18 04:06:44 -07:00
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
9d718ac529 sync photo permissions with the attached item whenever they change. 2013-09-17 17:38:43 -07:00
friendica
8452535467 Merge pull request #142 from dsp1986/master
Thanks!

fix include paths
2013-09-17 01:46:53 -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
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
f72cc77e46 spurious blank lines 2013-09-15 22:33:47 -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
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
44ed6b0adc no longer used 2013-09-14 16:45:14 -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
friendica
037fd43fbd more remote error reporting for zot 2013-09-12 16:52:58 -07:00
Michael Meer
2c06a2c163 implement tip from Mike, corrected the sql statement 2013-09-11 15:24:26 +02:00
Michael Meer
2228264772 flag failed auth attempts in DB table hubloc 2013-09-11 13:59:45 +02:00
friendica
de777d2f9c remove old debugging cruft 2013-09-10 21:17:33 -07:00
friendica
3e5414cf35 provide detailed error to remote site for the myriad of things that can go wrong inside item_store(), !! this changes the return of item_store !! 2013-09-10 19:06:06 -07:00
Olaf Conradi
517baa86a3 No need to add name_updated twice in zfinger response 2013-09-11 00:29:27 +02:00
marijus
fec0c71445 make /channel respect "Maximum number of conversations to load at any time" setting like /network does. 2013-09-10 21:52:13 +02:00
friendica
9994ab2c5d Merge https://github.com/friendica/red into zpull 2013-09-09 13:46:14 -07:00
friendica
75dfcf9c4f quick fix to directory 2013-09-09 13:45:51 -07:00
cvogeley
a4d455c48b Merge pull request #125 from cvogeley/master
usage message showed wrong number of channels
2013-09-09 13:04:20 -07:00
Christian Vogeley
e92233e39e usage message showed wrong number of channels 2013-09-09 22:00:39 +02:00
friendica
2c90a73695 change from refresh_all to a directory update - which does a refresh_all and also updates the directory. 2013-09-08 21:12:23 -07:00
friendica
a09829a1ee perform a refresh_all when an import has completed so that all your connections get a fresh update. 2013-09-08 21:05:39 -07:00
friendica
f8c709830f Merge https://github.com/friendica/red into zpull 2013-09-08 19:12:46 -07:00
friendica
135c188732 description of the chanman module and what it will need to do. 2013-09-08 19:12:23 -07:00
Thomas Willingham
256ee236ad Kill logger 2013-09-09 02:11:26 +01:00
Thomas Willingham
d2b4ba7be6 Quick and dirty file storage module. 2013-09-09 02:06:21 +01:00
Christian Vogeley
b4a2361efc . 2013-09-08 21:52:05 +02:00
Christian Vogeley
a73f8291c3 retrun check 2013-09-08 21:45:35 +02:00
Christian Vogeley
e70c9b3613 Merge service class
//service class configure in .htconfig.php:
$a->config['system']['default_service_class']='standard';  // this is
the default service class that is attached to every new account
$a->config['service_class']['standard'] =
array('photo_upload_limit'=>20000000, // total photo storage limit per
channel (here 20MB)
 'total_identities' =>5, // number of channels an account can create
'total_items' =>2000, // number of top level posts a channel can
create. Applies only to top level posts of the user, other posts and
comments are unaffected
'total_pages' =>10, // number of pages a channel can create
 'total_channels' =>500, // number of channels the user can add, other
users can still add this channel, even if the limit is reached
 'attach_upload_limit' =>20000000); // total attachment storage limit
per channel (here 20MB)
2013-09-08 18:03:26 +02:00
Christian Vogeley
f4dfb90dbc Service class items
Items / webpages /attachment message
2013-09-08 17:19:09 +02:00
Christian Vogeley
94fb9c2406 Service class
identity, follow, photo upload, att upload
2013-09-08 00:21:42 +02:00