Mario Vavti
|
578d21120a
|
make design elements translateable
|
2015-05-20 08:34:40 +02:00 |
|
redmatrix
|
e68a00d381
|
more db structure
|
2015-05-19 22:43:24 -07:00 |
|
redmatrix
|
507dfb9f85
|
add rot47 to the mix. This shouldn't affect the speed to any measurable degree.
|
2015-05-19 21:51:48 -07:00 |
|
redmatrix
|
acc8e10a45
|
merge redmatrix fix
|
2015-05-19 18:28:52 -07:00 |
|
redmatrix
|
d63bcde6e2
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-05-19 18:26:46 -07:00 |
|
redmatrix
|
fe00d29047
|
issue with deleting imported design elements and re-installing them
|
2015-05-19 18:25:27 -07:00 |
|
redmatrix
|
c78869e437
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/nl/messages.po
view/nl/strings.php
|
2015-05-19 17:36:11 -07:00 |
|
redmatrix
|
e54198e5b8
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-05-19 17:17:04 -07:00 |
|
redmatrix
|
d84c2835cd
|
version update
|
2015-05-19 17:16:46 -07:00 |
|
redmatrix
|
9485e917c6
|
Merge pull request #327 from solstag/help
Document php-xml requirement for webdav and widget creation.
|
2015-05-20 10:14:35 +10:00 |
|
Mario Vavti
|
3471e98989
|
remove dbg code
|
2015-05-19 21:09:35 +02:00 |
|
Mario Vavti
|
5641d81f03
|
be verbose about what type of element (block, layout, webpage) is beeing installed
|
2015-05-19 21:07:43 +02:00 |
|
Alexandre Hannud Abdo
|
a2696bea19
|
Document widget creation.
|
2015-05-19 16:59:28 +00:00 |
|
Alexandre Hannud Abdo
|
2c7b786907
|
Document php-xml requirement for webdav.
|
2015-05-19 16:46:15 +00:00 |
|
jeroenpraat
|
5e87bd8843
|
New update Dutch
|
2015-05-19 12:12:16 +02:00 |
|
redmatrix
|
77e2ef45f0
|
mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution cipher would be adequate for our requirements.
|
2015-05-19 02:16:12 -07:00 |
|
redmatrix
|
c11b1f8b0d
|
vsprintf error
|
2015-05-18 22:07:38 -07:00 |
|
redmatrix
|
e521da05da
|
consensus items not working correctly and make the collections widget abide by the corresponding feature setting. This needs to be backported as it is borken in redmatrix. Also provide the ability to change the number of most recent expanded comments to conversations on a site-wide basis, increase it to 3 by default. We may also want this as a personal setting.
|
2015-05-18 21:32:55 -07:00 |
|
redmatrix
|
b7ae85e89a
|
get rid of photo_flags in the code
|
2015-05-18 20:10:44 -07:00 |
|
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 |
|