redmatrix
63f2e9b412
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/zot.php
mod/connedit.php
util/messages.po
2015-06-28 22:33:13 -07:00
redmatrix
de13497333
no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.
2015-06-28 21:16:56 -07:00
redmatrix
86588bdd6c
more work on photos, including os_storage for the size '0' photo and numbering duplicate filenames
2015-06-23 22:46:39 -07:00
redmatrix
ca870dbf31
more work on item table optimisation
2015-06-10 16:59:04 -07:00
redmatrix
03357481f7
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
install/schema_mysql.sql
mod/home.php
mod/page.php
view/nl/messages.po
view/nl/strings.php
2015-06-09 16:52:00 -07:00
redmatrix
39f0e6fe62
add site_dead flag to prevent delivery to dead sites. Allow sys channel webpages to be viewed even if site is configured "block public".
2015-06-08 16:55:17 -07:00
redmatrix
8fe3daab21
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
install/schema_mysql.sql
mod/impel.php
view/pt-br/messages.po
view/pt-br/strings.php
2015-05-28 19:06:31 -07:00
redmatrix
0f09a4499b
add menu_created, menu_edited fields to DB
2015-05-28 16:59:56 -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
7c7a5cba8f
Merge branch 'master' into tres
2015-05-17 19:49:36 -07:00
redmatrix
76558df966
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/bb2diaspora.php
include/diaspora.php
include/enotify.php
mod/admin.php
mod/cloud.php
mod/dav.php
mod/home.php
mod/invite.php
mod/like.php
mod/mitem.php
mod/p.php
mod/pubsites.php
mod/setup.php
mod/siteinfo.php
util/messages.po
2015-05-17 19:48:57 -07:00
redmatrix
3b859aa9ef
Implement permission checking for OAuth clients using the xperm table. Currently 'all' permissions are applied to OAuth clients which gives them the same rights as the channel owner and full access to API functions as the channel owner. However, individual permissions can now be created. These mirror the permission names from the normal permission table (although it isn't required that they do so). Lack of an xp_perm entry for the specified permission and lack of an 'all' override indicates permission denied.
2015-05-17 18:14:50 -07:00
Mario Vavti
ed284fd4ea
preserve htmlhead in case somebody needs it
2015-05-15 20:33:38 +02:00
redmatrix
f0cb3cba12
Merge branch 'master' into tres
2015-05-14 22:12:56 -07:00
redmatrix
291f3beccf
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-14 22:12:37 -07:00
redmatrix
47564d4310
provide default permissions ('all') for existing and newly created OAuth app clients, which will be extended in the future to allow specific permissions.
2015-05-14 21:57:20 -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
5b5f0666f9
second pass name change
2015-05-05 03:59:51 -07:00
redmatrix
a3c37f1458
first pass name change
2015-05-05 03:56:10 -07:00
redmatrix
62f35ced47
change name
2015-05-05 00:51:08 -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
friendica
b546f8d702
Merge https://github.com/friendica/red into pending_merge
2015-03-29 16:05:24 -07:00
friendica
505e5e90b2
fix os_mkdir
2015-03-29 16:05:08 -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
0bb89778d3
add channel_lastpost timestamp to help optimise some outrageously expensive queries.
2015-03-26 19:55:52 -07:00
friendica
1d05f922f8
reduce the occurrence of duplicated notice() messages
2015-03-12 16:16:29 -07:00
friendica
98dffd77ef
channel delegation
2015-03-10 02:23:14 -07:00
friendica
22391a2437
straighten out some directory stuff, which required some Comanche structural changes
2015-03-05 18:24:49 -08:00
friendica
011ccd57f6
add queue priority
2015-03-04 17:56:07 -08:00
Mario Vavti
6e0b5b742c
login adjustment
2015-03-03 11:32:54 +01:00
friendica
37384c0b27
automated warning after a few days if poller is dead
2015-03-02 18:02:06 -08:00
friendica
36af426538
Nag hub admins with self-signed certs to fix them. Otherwise we'll just have to start
...
marking them as dead sites.
2015-03-01 20:14:42 -08:00
friendica
08f054130f
require access token to view, query, or join directories in private realms, if the realm is so configured.
2015-02-24 16:36:27 -08:00
Klaus Weidenbach
2fc61e780a
Updated doxygen docu about deperecated functions.
...
Corrected wrong return types in doxygen docu and add a deprecation log
entry.
2015-02-18 13:11:15 +01:00
friendica
1d1676094d
hub upgrade w/name change via Alex
2015-02-16 11:12:46 -08:00
jeroenpraat
05c2c50170
Patches from Thomas regarding offline status off whogotzot.com
2015-02-14 18:17:42 +01:00
friendica
da2349bb6a
provide relief to sites that are severely impacted by the slow ITEM_UNSEEN searches. This does not incorporate any other flag optimisations as that will require a major DB update and possibly involve significant downtime. This is just to bite off a little chunk now and provide some much needed relief.
2015-02-12 17:45:25 -08:00
friendica
81e7b47b76
more progress on event confirmations
2015-02-10 00:11:37 -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
fb6deb113b
improved directory registration - honour standalones and do the right thing
2015-02-02 17:32:54 -08:00
friendica
aafed50a0e
Merge branch 'master' into tres
2015-02-01 20:30:47 -08:00
friendica
b1a92d620e
two tracks proceeding in parallel - first adding the ability to store a digital signature with ratings so that directories can pass them around, second provide some directory registration functions so we can obtain a list of directories from somewhere (to pass ratings around between them). This gives the primary directory role some value as that is where you register your directory.
2015-02-01 15:10:52 -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
ff68ea6087
more message restrict conversions
2015-01-29 14:51:41 -08:00
friendica
74f9544ed4
provide compatibility functions so code breakage with customised setups or work in progress should be minor
2015-01-28 21:08:37 -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
a2cdd1499c
Merge branch 'master' into tres
...
Conflicts:
include/socgraph.php
2015-01-27 20:00:43 -08:00
