a2629258ae
Merge branch 'master' of https://github.com/tuscanhobbit/red
2014-06-25 11:58:28 +02:00
378aaf4a61
Display quota and translatable strings
2014-06-25 11:54:10 +02:00
a6403905ef
Set backlink to the parent folder, not cloud's root.
...
If you edit a file and click on the backlink you always returned to
the root folder of your cloud. This patch sets the correct parent
folder as backlink.
Bit messy, but looks like it works.
2014-06-24 21:05:00 +02:00
4c78c3bdee
Oops I left some debug stuff around
2014-06-24 12:13:54 +02:00
cc4001fce7
Fixes to links and forward URLs in filestorage
2014-06-24 12:05:11 +02:00
b2feb26492
clean up the awful descriptive text on thing input
2014-06-23 17:05:03 -07:00
0cfcb02311
ability to like things
2014-06-23 05:19:28 -07:00
c4c1c37bd3
profile likes
2014-06-22 22:16:26 -07:00
eb31d61a26
when an admin censors a channel, we only need to notify the directory and not all the connections.
2014-06-22 17:26:05 -07:00
1dacfb375e
honour the admin censored flag in the directory, and some slow progress on extended likes
2014-06-22 17:15:42 -07:00
2504d4c2a2
Add HTML5 datalist to edit photo album field.
...
This patch provides a datalist for the edit photo album field.
This makes it easier to move a picture to another existing folder in
the way that it provides a list of all available albums as values for
the album field.
2014-06-22 01:33:13 +02:00
5968bc7f86
moods not working in other languages + doc updates
2014-06-21 16:04:00 -07:00
525daa7475
fix space around brackets changing.
2014-06-19 20:38:38 -07:00
00904d4994
cleanup
2014-06-19 16:09:02 -07:00
b20887995a
Implements a new permission level PERMS_PENDING
...
With this a user can allow some action to any user which connects
to them, even before they've connected back.
Ref.
https://mobiliza.org.br/display/478d9e71eaf55748dc646d3990651d6d34cfb7db5c38360538ec730ca3ccf908@zothub.com
Also some code cleanup and an alternative logic for handling
notifications of permission changes in zot.php.
This assumes that private posts are still restricted to people in
your addressbook. Regardless of your global permissions, a
pending channel won't get private posts, even if the post
only has a deny clause not matching the pending channel.
2014-06-19 15:13:32 -03:00
c16b403cf7
oh this is nice... http://kmkeen.com/jshon - this is what we need to make shred -- well "shred". I also had to change the photos album list API a bit to fix any imagined and/or real parsing issues and also fixed shred so it can find its auxiliary files.
2014-06-18 16:26:27 -07:00
476675e211
get rid of some old crap
2014-06-17 21:51:20 -07:00
6c1304c000
Merge https://github.com/friendica/red into pending_merge
2014-06-17 17:36:58 -07:00
dafd3a9e43
sync profiles to nomadic clones
2014-06-17 17:34:51 -07:00
8b747d8178
Merge pull request #497 from git-marijus/master
...
make maximum load average setting work again
2014-06-17 10:52:14 +10:00
a868da6c07
project homepage tweaks
2014-06-16 15:55:20 -07:00
e6a655bde4
make maximum load average setting work again
2014-06-16 22:52:23 +02:00
e1ec1e7c5f
sort out the unobscure mess
2014-06-15 19:21:32 -07:00
72f00d6e04
issues with editing webpage permissions
2014-06-15 18:58:02 -07:00
2d6a1795b7
ensure item_private tracks acl fields on edit
2014-06-15 02:32:12 -07:00
0f6c321e3f
only show jotnets when posting conversation items
2014-06-14 20:16:40 -07:00
b67c8ec8b9
webpage permissions weirdness
2014-06-14 16:35:38 -07:00
c80cf61a9b
no need to have this twice
2014-06-14 23:10:48 +02:00
b7b8303f8d
fix active state
2014-06-14 15:49:57 +02:00
3dfcfbf85c
issue #433
2014-06-10 22:35:15 -07:00
13ba9ef003
merge the app menus
2014-06-10 21:21:50 -07:00
059ccae278
remote install app (untested)
2014-06-10 16:34:21 -07:00
0fb8234693
allow rpost to take a channel argument (the channel nickname) and change channel to that if it's valid
2014-06-09 16:57:01 -07:00
376a51f8d8
doc updates
2014-06-06 23:56:52 -07:00
c4fc9a9cf6
move hexit to addons where it belongs
2014-06-05 17:42:48 -07:00
41904545ad
hex converter - could've been a plugin and perhaps should have been but this was quick. No translations or templates. Just a converter.
2014-06-04 21:18:10 -07:00
4fa3b420ab
duplicate birthday events showing up
2014-06-04 21:02:57 -07:00
d84f03d59b
if photo import failed during channel import, reset the xchan_photo_date so it will automatically fix itself.
2014-06-04 01:37:50 -07:00
97a4479513
don't provide a second (actually third counting the navbar) search box on the search page if you've got saved searches turned on. This should solve some problems with duplicate html id's (and save wasn't working anyway). If you don't have saved search ability (which will provide a saved search widget in the sidebar), provide a simple search box in the main content region but without save ability.
2014-06-03 18:19:27 -07:00
04cd60a0e3
add sys channel (discover) posts to "anonymous" search. They will by default be public.
2014-06-03 17:17:26 -07:00
49abe9d334
issue #479 - tag escaping not needed here.
2014-06-02 19:05:24 -07:00
2386bc4d00
bring back birthdays
2014-06-02 17:49:19 -07:00
61ed6ea273
issue #476
2014-05-31 16:10:31 -07:00
33cf83175d
use consistent capitalisation in the item actions menu
2014-05-29 21:34:08 -07:00
832cbbec15
testing new event code
2014-05-29 21:25:19 -07:00
22ed5b1d03
newevent: front end functions
2014-05-29 20:09:21 -07:00
a3487efd57
start to tie in the new event logic
2014-05-29 17:09:14 -07:00
9b5eabf108
Merge branch 'master' into newevent
...
Conflicts:
include/zot.php
2014-05-29 16:14:10 -07:00
2a6d7b6a07
cleanup dead directory entries. This was a real b#tch, so keep your eye out for issues - which you shouldn't see until next weekend when this is scheduled to run. We're only setting flags, so if anything goes wrong we should be able to recover without too much pain.
2014-05-28 21:42:46 -07:00
30eb1b494a
moods: simplify 'xyz is tired' rather than 'xyz is currently tired'. This is possible now that we have translation contexts, as before '$1 is $2' was ambiguous without a context - in this case 'mood'.
2014-05-28 17:58:49 -07:00
Paolo Tacconi
Klaus Weidenbach
tuscanhobbit
friendica
Alexandre Hannud Abdo
marijus