friendica
|
6679734135
|
Merge branch 'master' into tres
Conflicts:
include/Contact.php
include/ItemObject.php
include/api.php
include/attach.php
include/diaspora.php
include/dir_fns.php
include/enotify.php
include/event.php
include/expire.php
include/items.php
include/notifier.php
include/notify.php
include/photos.php
include/taxonomy.php
include/text.php
include/widgets.php
include/zot.php
mod/admin.php
mod/channel.php
mod/dirsearch.php
mod/display.php
mod/editwebpage.php
mod/events.php
mod/home.php
mod/item.php
mod/manage.php
mod/mood.php
mod/network.php
mod/page.php
mod/photos.php
mod/ping.php
mod/post.php
mod/thing.php
mod/viewsrc.php
view/css/mod_events.css
|
2015-04-23 19:49:41 -07:00 |
|
mrjive
|
a597c74b97
|
Update viewsrc.php
Adding the item ID to the item source view
|
2015-04-15 12:26:03 +02:00 |
|
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
|
6e0e3b2433
|
more expanding item flags
|
2015-01-22 18:41:10 -08:00 |
|
friendica
|
fb05919d90
|
make discover items interactive
|
2014-09-22 21:37:19 -07:00 |
|
friendica
|
9b524c9bc4
|
unobscure viewsrc items
|
2014-08-23 21:12:33 -07:00 |
|
friendica
|
15c8da101a
|
sometimes it gets confusing when using two trees with completely different structures
|
2012-11-13 15:04:25 -08:00 |
|
friendica
|
35a6dd1cae
|
provide json parameter to viewsrc to support end-to-end encryption
|
2012-11-13 14:49:03 -08:00 |
|
friendica
|
34f8b06d45
|
still a lot of files to bring up to date with new architecture - keep plugging away at them
|
2012-11-13 14:37:02 -08:00 |
|
friendica
|
eac29badb2
|
start on contacts/profiles
|
2012-08-30 18:17:38 -07:00 |
|
Alexander Kampmann
|
355c42cb30
|
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
|
2012-04-05 13:39:15 +02:00 |
|
Fabio Comuni
|
767245e9ff
|
viewsrc: return only body if page is requested via ajax
|
2012-03-28 11:42:04 +02:00 |
|
friendica
|
a76a497d92
|
implement "moderate" flag on items
|
2012-01-23 20:56:11 -08:00 |
|
friendica
|
8aa2552372
|
add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
|
2012-01-18 16:21:30 -08:00 |
|
Friendika
|
0eceade2fe
|
view source of item [bbcode] usage: viewsrc/nnn
|
2011-10-30 16:28:07 -07:00 |
|