redmatrix
da7abbb089
bring the new photo schema into play
2015-05-18 19:43:53 -07:00
redmatrix
eae241df56
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-18 17:38:07 -07:00
redmatrix
c2ca2a09e7
this should fix undeletable blocks and layouts
2015-05-18 17:32:36 -07:00
redmatrix
4c319a98a8
fix some merge errors
2015-05-18 17:20:59 -07:00
redmatrix
71a2f2d773
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-18 17:00:04 -07:00
redmatrix
ad07d48d3c
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-18 16:30:55 -07:00
redmatrix
0340639cb1
fix po2php to handle projectname variables correctly
2015-05-18 16:30:00 -07:00
redmatrix
2dd0e7f6bd
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
view/nl/messages.po
view/nl/strings.php
2015-05-18 15:58:13 -07:00
Mario Vavti
d42d7d0532
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-18 22:29:34 +02:00
Mario Vavti
9b1e540880
if block title contains $content but $content title is empty do not show an empty <h3> tag
2015-05-18 22:29:13 +02:00
redmatrix
8962d0576b
Merge pull request #326 from sierracircle/patch-1
...
Create Primary-Directory
2015-05-19 06:25:24 +10:00
Mario Vavti
9b64301e0c
remove dbg code
2015-05-18 22:19:08 +02:00
Mario Vavti
4e3583ab45
allow block title to contain $content title
2015-05-18 22:18:01 +02:00
redmatrix
51db753638
Merge branch 'tres'
2015-05-18 13:14:34 -07:00
Adam Robertson
d50ff49f2a
Create Primary-Directory
...
Description and Instruction on using a Primary Directory for a series of Private Hubs
2015-05-18 08:26:45 -07:00
jeroenpraat
6ab7394565
Update Dutch (Projectname variable not translated yet, because of undefined variable)
2015-05-18 16:25:22 +02:00
redmatrix
e271035879
provide a warning
2015-05-17 23:06:00 -07:00
redmatrix
af27457da5
here's a fair chunk of the new schema - still a lot of bits missing and no migration tools, and only for mysql currently. Oh, and you still don't have the new code to make use of the new schema yet. That's on another branch that I'm not checking in yet because then you might get the idea that bits of it actually work and infect the rest of the matrix with unstable code and bring other sites down that have never even heard of hubzilla. Please do not use this code. Let me repeat, please do not use this code. One more time in case you didn't understand - please do not use this code.
2015-05-17 22:43:36 -07:00
redmatrix
048c745607
spelling
2015-05-17 22:08:53 -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
ac3b886cc4
missing $
2015-05-17 19:00:17 -07:00
redmatrix
f985c08d12
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-17 18:19:49 -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
redmatrix
7233967ad5
Merge pull request #322 from dawnbreak/master
...
Add functions to parse and get some values from php.ini.
2015-05-18 09:41:53 +10:00
redmatrix
1cca24dfdc
Merge pull request #323 from dawnbreak/docu
...
Add some more documentation to attach_store()
2015-05-18 09:41:32 +10:00
redmatrix
dd72f580dd
update readme
2015-05-17 16:40:42 -07:00
redmatrix
a7071b17c0
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-17 16:35:17 -07:00
redmatrix
9a67ec8bd4
new string file - isolating the projectname from translated strings so that translation files will work across multiple projects.
2015-05-17 16:33:43 -07:00
redmatrix
91d7b0f7eb
more work isolating the projectname from core.
2015-05-17 16:28:16 -07:00
Klaus
f987f4a049
Merge pull request #324 from Razlo/master
...
updated the templates to the {{$new_format}}, compared to $old_format
2015-05-17 11:51:44 +02:00
Razlo
fc1c188a7e
updated the templates to the {{}}, compared to
2015-05-17 02:40:51 +02:00
Klaus Weidenbach
6757e86e85
Add some more documentation to attach_store()
2015-05-17 01:24:47 +02:00
Klaus Weidenbach
e2980e871f
Add functions to parse and get some values from php.ini.
...
Get upload limits from php.ini. These functions will be used for checking
against upload limits and to give information in the frontend.
Wasn't sure in which file to put these functions, so I created a new
one include/environment.php.
2015-05-16 11:25:32 +02:00
Mario Vavti
70fa00c014
allow a block to contain $content
2015-05-15 22:20:45 +02:00
Mario Vavti
ed284fd4ea
preserve htmlhead in case somebody needs it
2015-05-15 20:33:38 +02:00
redmatrix
51b6d70996
update to_do
2015-05-14 22:42:48 -07: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
bceef58584
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-14 22:01:02 -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
9de88c49c3
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-14 20:10:45 -07:00
redmatrix
d5803cfd02
Merge pull request #320 from dawnbreak/master
...
Add sprintf.js v1.0.2.
2015-05-15 13:10:28 +10: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
Klaus Weidenbach
c62e75d789
Add sprintf.js v1.0.2.
...
This script provides sprintf() for JavaScript. It can be used for
example for translating strings used in JavaScript with variables.
It is licensed under BSD-3-Clause and can be found on GitHub:
https://github.com/alexei/sprintf.js
2015-05-14 10:39:56 +02:00
redmatrix
51b89f0ed8
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
doc/DerivedTheme1.md
doc/Developers.md
doc/Features.md
doc/Plugins.md
doc/Privacy.md
doc/README.md
doc/Remove-Account.md
doc/Translations.md
doc/about.bb
doc/account_basics.bb
doc/accounts_profiles_channels_basics.bb
doc/addons.bb
doc/addons_gnusocial.bb
doc/bbcode.html
doc/campaign.bb
doc/classRedmatrix_1_1Import_1_1Import-members.html
doc/classRedmatrix_1_1Import_1_1Import.html
doc/cloud.bb
doc/connecting_to_channels.bb
doc/connecting_to_channels.md
doc/credits.bb
doc/de/channels.bb
doc/de/features.bb
doc/de/main.bb
doc/de/registration.bb
doc/developers.bb
doc/encryption.bb
doc/external-resource-links.bb
doc/extra_features.bb
doc/faq_admins.bb
doc/faq_developers.bb
doc/faq_members.bb
doc/features.bb
doc/hidden_configs.bb
doc/history.md
doc/html/index.php
doc/main.bb
doc/permissions.bb
doc/plugins.bb
doc/problems-following-an-update.bb
doc/profiles.bb
doc/red2pi.bb
doc/registration.bb
doc/roadmap.bb
doc/sv/main.bb
doc/what_is_zot.bb
doc/zot.md
2015-05-13 19:23:13 -07:00
redmatrix
f866a42a42
not sure how these files ended up here, but they belong with doxygen stuff
2015-05-13 18:10:15 -07:00
redmatrix
364025e550
remove project name dependency from most of the doc files to ease project merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script.
2015-05-13 17:59:45 -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
c82082d2bb
restrict webpage list to undeleted items
2015-05-13 16:27:04 -07:00
redmatrix
Mario Vavti
Adam Robertson
jeroenpraat
Klaus
Razlo