redmatrix
|
a6cb90c81c
|
Merge branch 'master' into tres
Conflicts:
include/Import/refimport.php
include/activities.php
include/attach.php
include/event.php
include/externals.php
include/identity.php
include/items.php
include/notifier.php
include/photos.php
include/taxonomy.php
include/zot.php
mod/channel.php
mod/connedit.php
mod/events.php
mod/item.php
mod/like.php
mod/manage.php
mod/mood.php
mod/ping.php
mod/poke.php
mod/subthread.php
mod/tagger.php
mod/thing.php
|
2015-05-14 18:02:29 -07:00 |
|
redmatrix
|
25b599a4bd
|
convert ITEM_WALL from bitfield to standalone
|
2015-05-06 21:03:33 -07: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
|
29436081a8
|
slow progress removing bitfields on item table
|
2015-01-21 16:06:25 -08:00 |
|
friendica
|
ade8174750
|
private pokes - perhaps a little *too* private.
|
2013-07-19 01:20:51 -07:00 |
|
friendica
|
e99b9376a0
|
poke doco and cleanup
|
2013-04-17 22:44:53 -07:00 |
|
friendica
|
c2fe3fd8fe
|
poke bugfix
|
2013-04-17 22:15:38 -07:00 |
|
friendica
|
5f27e29bb8
|
basic poke working
|
2013-04-17 21:40:40 -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
|
ceeb4db6e3
|
Give the UI a little love after all the backend mods
|
2012-10-24 19:13:29 -07: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 |
|
friendica
|
f7c6a6ff90
|
item table rename parent-uri, target-type, object-type (more to come later)
|
2012-08-15 22:33:37 -07:00 |
|
friendica
|
dcbc0c0c95
|
major theme re-org, only duepuntozero and slackr working atm
|
2012-08-01 05:02:43 -07:00 |
|
friendica
|
6e08f39820
|
simplify
|
2012-07-21 03:48:59 -07:00 |
|
friendica
|
bf38674904
|
sync
|
2012-07-19 21:09:40 -07:00 |
|
friendica
|
49c0e0de9b
|
sync changes
|
2012-07-19 18:53:26 -07:00 |
|