friendica
|
912be23e16
|
Merge branch 'master' into tres
Conflicts:
include/group.php
include/text.php
mod/acl.php
mod/channel.php
mod/connections.php
mod/display.php
mod/group.php
mod/item.php
mod/locs.php
mod/network.php
mod/photos.php
mod/ping.php
mod/starred.php
mod/viewsrc.php
|
2015-01-29 15:09:35 -08:00 |
|
friendica
|
a496036066
|
local_user => local_channel
|
2015-01-28 20:56:04 -08:00 |
|
friendica
|
29436081a8
|
slow progress removing bitfields on item table
|
2015-01-21 16:06:25 -08:00 |
|
marijus
|
978d78b953
|
basic changes for file activity
|
2015-01-09 15:18:45 +01:00 |
|
friendica
|
5968bc7f86
|
moods not working in other languages + doc updates
|
2014-06-21 16:04:00 -07:00 |
|
friendica
|
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 |
|
friendica
|
db8ebc9f37
|
some minor cleanup on plinks for some very subtle permissions issues
|
2014-01-09 15:45:17 -08: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 |
|
friendica
|
222fe08420
|
ensure that no unencrypted content leaks through item_store which is private - we typically do this in mod/item, but some functions
bypass mod/item to create private posts
|
2013-08-01 18:50:36 -07:00 |
|
friendica
|
7e6890832b
|
turn all Red links into zrls (not the old zrls, the new bbcode zrl which means we can zidify them)
|
2013-04-15 03:00:08 -07:00 |
|
friendica
|
ddf5bf8968
|
rename 'uri' (and parent_uri) to 'mid' (and parent_mid) since these no longer remotely resemble uri's and are actually message_id's. This change is potentially destabilising because it touches a lot of code and structure. But it has to get done and there's no better time than the present.
|
2013-03-21 18:25:41 -07:00 |
|
friendica
|
6ac5e048b3
|
cleanup
|
2012-11-13 20:53:33 -08:00 |
|
friendica
|
aa88165383
|
mood mostly working
|
2012-11-13 19:32:59 -08:00 |
|
friendica
|
e124c9fa5c
|
Can't see any posts currently - after the big shakeup, but we can now post top level activities and store them.
|
2012-10-03 22:28:19 -07:00 |
|
friendica
|
2456174cc9
|
back to identity creation form
|
2012-08-23 20:00:10 -07:00 |
|