redmatrix
95cf1aafa0
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-09-01 21:04:57 -07:00
redmatrix
f72a3113f5
add the baseurl so we can easily relocate objects
2015-09-01 21:03:55 -07:00
redmatrix
3c29b46c42
use different obj export output format for hubzilla compatibility
2015-09-01 20:57:53 -07:00
redmatrix
515f3bf111
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/identity.php
install/update.php
2015-09-01 17:08:59 -07:00
redmatrix
1447499776
don't log the mundane - especially at normal levels.
2015-08-31 22:41:48 -07:00
redmatrix
69dc1b03c3
typo in sql
2015-08-31 21:01:47 -07:00
redmatrix
d7089ab471
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/identity.php
install/update.php
util/messages.po
view/nl/messages.po
2015-08-31 21:00:28 -07:00
redmatrix
039f56f390
mostly doc tweaks, some import/export work
2015-08-31 20:58:05 -07:00
redmatrix
d7cf7316be
change the likes db structure to make it more easily importable/exportable
2015-08-31 20:55:25 -07:00
redmatrix
5fe9021375
rename 'register_account' hook to 'create_identity'.
2015-08-31 16:26:29 -07:00
redmatrix
9763c46b7e
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/identity.php
2015-08-17 22:23:23 -07:00
redmatrix
f682325924
provide ability to export by month as well as by year
2015-08-17 22:20:10 -07:00
redmatrix
ea331b043c
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-08-17 21:41:14 -07:00
redmatrix
1982fc807f
add item_id to yearly dump files
2015-08-17 21:38:43 -07:00
redmatrix
c90f14c066
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
doc/to_do_code.bb
2015-07-21 17:13:48 -07:00
Mario Vavti
4d45bc9da1
Fixes regarding the new default profile photo size. The default profile photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format.
2015-07-20 21:01:11 +02:00
redmatrix
15b6e8faa4
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/identity.php
include/widgets.php
util/messages.po
view/it/messages.po
view/it/strings.php
2015-07-19 21:08:34 -07:00
redmatrix
3c60a0c22c
provide any single year of exported items
2015-07-16 20:20:42 -07:00
redmatrix
ec249d465b
provide a way to export a single year of items (to potentially keep from exhausting resources either on export or import)
2015-07-16 20:19:20 -07:00
redmatrix
86b12ea750
lots of work on clone/import from redmatrix to hubzilla (won't go back the other way)
2015-06-30 20:18:48 -07:00
redmatrix
6ab20eb1b5
lots of work on merging photo and file albums/folders
2015-06-17 17:44:31 -07:00
redmatrix
859a2ac8ef
DB changes for some channel flags
2015-06-15 17:28:52 -07:00
redmatrix
be0459a98b
convert the abook fields
2015-06-14 21:08:00 -07:00
redmatrix
e838647e3a
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-11 22:48:01 -07:00
redmatrix
485b19958e
don't provide a connect button on the sys channel profile sidebar
2015-06-11 22:46:37 -07:00
redmatrix
b381ec5734
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/impel.php
2015-05-27 19:27:38 -07:00
redmatrix
9a0264f5d2
some work on issue #329
2015-05-25 19:17:35 -07:00
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
475dc7b686
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
boot.php
include/api.php
include/enotify.php
2015-05-13 17:07:12 -07:00
redmatrix
d6f98e6511
product was a bad string to use because we may require it for e-commerce, and RED_PLATFORM is equally problematic for other reasons.
2015-05-13 16:01:00 -07:00
redmatrix
25b599a4bd
convert ITEM_WALL from bitfield to standalone
2015-05-06 21:03:33 -07:00
redmatrix
5b5f0666f9
second pass name change
2015-05-05 03:59:51 -07:00
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
Klaus Weidenbach
d0361582b0
Correcting reported Doxygen syntax warnings.
...
Fixed wrong Doxygen syntax and add some of the available FIXME to
Doxygen documentation.
Updated Doxygen configuration to add also all capital letter tags.
Adding some more Doxygen documentation.
2015-03-29 22:23:00 +02:00
friendica
3d60008842
provide a site-wide expiration policy without loopholes - still need work to reduce the impact of expiration queries.
2015-03-24 15:53:55 -07:00
friendica
480dac1af2
add reddress to profile - but all is not as it seems. Copy to clipboard is blocked because it isn't really a reddress and won't work if you copy it and try and use it somewhere. We should really convert the symbol back to '@' on copy and allow it to be copied, but this isn't as easy as it sounds and is left as an exercise for the community. If we just allow it to be copied we'll get a lot of bugs that making friends doesn't work. It does, but that isn't a legitimate reddress and even if we made allowances for it, Diaspora and Friendica and other webfinger based services wouldn't and would just say it can't be found or it's an illegal address. So if we block copy we'll just get bugs that it can't be copied. Eventually somebody will see this checkin and take it on themselves to figure out how to fix the address when copied to clipboard and then allow it to be copied. And there will be joy.
2015-03-07 23:35:56 -08:00
friendica
11df605c2e
support rel=me on channel "homepage" url
2015-02-24 00:45:03 -08:00
friendica
4b348d2489
Merge branch 'master' into tres
...
Conflicts:
view/css/mod_events.css
view/theme/redbasic/css/style.css
2015-02-05 19:38:43 -08:00
friendica
561bab4ece
remote rating and addition of rate-me to channel profile sidebar
2015-02-04 17:32:29 -08:00
friendica
3988948516
first cut at rating widget. The flaw is that it is limited because it requires local_channel() (formerly local_user()). We need to extend this to take you home like rpost does if you're logged in as remote_channel() - and/or we need zot to send the rating message to the source channel and target in addition to the directories.
2015-02-04 15:48:39 -08: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
e157371c39
remote_user => remote_channel
2015-01-28 20:58:59 -08:00
friendica
a496036066
local_user => local_channel
2015-01-28 20:56:04 -08:00
friendica
4c2a1e572a
start on item_restrict conversion
2015-01-22 21:04:54 -08:00
friendica
e46eba1258
heavy lifting converting item flag bits
2015-01-22 17:41:16 -08:00
friendica
51848c6190
working through the xchan table to remove bitfields, mostly complete except for updating the updater
2015-01-20 19:33:19 -08:00
friendica
ee3eee425c
that should take care of the bitfields in hubloc
2015-01-20 16:13:18 -08:00
Stefan Parviainen
93735df2c7
Allow tags in mail, many profile fields, and admin info
2015-01-13 17:54:40 +01:00
Christian Vogeley
f0c7612bcd
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
doc/html/classRedmatrix_1_1Import_1_1Import-members.html
doc/html/classRedmatrix_1_1Import_1_1Import.js
2015-01-11 16:22:59 +01:00
Christian Vogeley
43f143a211
Fix for issue #763 Error creating new channel within the limits of the
...
subscription plan
2015-01-11 16:12:36 +01:00
