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
b9fd8b4614
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/zot.php
2015-07-15 18:41:50 -07:00
redmatrix
6046fe9c9e
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-07-15 17:50:24 -07:00
Mario Vavti
ca1f6f8c5b
provide info text for automatic permissions
2015-07-15 14:14:10 +02:00
Mario Vavti
5fcf1256bd
whitespace
2015-07-15 14:07:35 +02:00
Mario Vavti
0c77a127f2
show inherited state in Connection Default Permissions
2015-07-15 14:03:34 +02:00
redmatrix
0d1a541e88
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/import.php
2015-07-14 22:40:22 -07:00
redmatrix
9b15dbde1c
group fixes to import
2015-07-14 22:38:04 -07:00
redmatrix
5487b22dd7
fix import of group members
2015-07-14 22:19:21 -07:00
redmatrix
89fbfd2bf8
more stuff to resume failed imports
2015-07-14 22:04:07 -07:00
redmatrix
a87e318403
log the import progress
2015-07-14 21:30:13 -07:00
redmatrix
caaf7192ff
provide resumable imports if things go wrong
2015-07-14 21:02:54 -07:00
redmatrix
e8f19c1e15
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/connedit.php
2015-07-14 17:10:13 -07:00
redmatrix
3687fef53c
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-07-14 16:55:58 -07:00
redmatrix
a5989b0f31
coverup and ignore the illegal string offset message that some sites have been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled.
2015-07-14 16:54:16 -07:00
Mario Vavti
104cbcab72
make strings translateable
2015-07-14 21:32:18 +02:00
Mario Vavti
dd57864867
revert provide inherited perms for connection default permissions
2015-07-14 13:46:22 +02:00
Mario Vavti
d8edb66287
remove dbg
2015-07-14 13:21:39 +02:00
Mario Vavti
711dd1468d
provide inherited perms for connection default permissions
2015-07-14 13:16:08 +02:00
Mario Vavti
7f71297383
cleanup connedit
2015-07-14 12:46:40 +02:00
redmatrix
da5cec24e0
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-07-13 17:48:54 -07:00
redmatrix
6916c1076c
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-07-13 17:43:10 -07:00
redmatrix
3ec2dc81f2
allow sys editing of menu
2015-07-11 16:30:06 -07:00
Mario Vavti
04c794da10
whitespace and comment out info again
2015-07-12 01:12:20 +02:00
Mario Vavti
f81874ca49
fix sys channel menu in a morre standard way
2015-07-12 01:04:57 +02:00
Mario Vavti
6ca4240d96
menu_id is still needed
2015-07-12 00:49:03 +02:00
Mario Vavti
d8f03450e7
make menu creation for sys channel work
2015-07-12 00:40:12 +02:00
Mario Vavti
54bb2651f5
merge
2015-07-11 11:58:53 +02:00
redmatrix
a497d8ee66
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/editpost.php
util/messages.po
view/nl/messages.po
view/nl/strings.php
2015-07-10 14:27:41 -07:00
Mario Vavti
b6f28900e6
show status editor in /display on share action.
2015-07-10 21:48:24 +02:00
Mario Vavti
b1f926ba89
merge redmatrix fixes
2015-07-10 20:46:46 +02:00
Mario Vavti
fee607db56
more webpages - generic-content-wrapper fixes
2015-07-10 13:16:45 +02:00
Mario Vavti
1554b5a2ee
add generic content wrapper to post/webpage editor and make editpost render correctly
2015-07-10 12:46:20 +02:00
Mario Vavti
c7b55f7753
revert
...
do not show status editor in /display - we most probably want to read the thread or comment.
2015-07-09 22:31:21 +02:00
Mario Vavti
0bec45e570
do not show status editor in /display - we most probably want to read the thread or comment.
2015-07-09 21:03:10 +02:00
Mario Vavti
efa55437d4
increase width of the aside area and make default profile image size 300x300
2015-07-09 13:59:16 +02:00
redmatrix
43354ab385
inconsistent naming of block item types
2015-07-08 18:05:38 -07:00
redmatrix
6b41074396
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-07-07 16:50:25 -07:00
Mario Vavti
f6cf992aee
fix sorting of channel suggestions
2015-07-07 22:48:01 +02:00
Mario Vavti
f67d9d59af
rename function get_directory_settings => get_directory_setting and move sort options to directory title bar
2015-07-07 22:29:27 +02:00
redmatrix
75469a61bf
Merge pull request #4 from git-marijus/master
...
abook_pending should probably be 1 in this place
2015-07-08 06:19:48 +10:00
Mario Vavti
9c577e0422
make public forums only setting sticky and simplify function to get directory settings
2015-07-07 21:41:37 +02:00
redmatrix
7cfaae8d4f
ok that's wretchedly inefficient but provides a basic relevance search for strings in doc files.
2015-07-06 20:21:41 -07:00
Mario Vavti
53f4b260cf
abook_pending should probably be 1 in this place
2015-07-06 22:48:12 +02:00
redmatrix
4abb114474
very crude but working doc search
2015-07-05 21:09:04 -07:00
redmatrix
f20933e1e0
more work on db storage of doco
2015-07-05 19:52:41 -07:00
redmatrix
df8f6e45e2
mod/help: read doc files from the database if present and newer than the copy in the filesystem.
2015-07-04 14:46:40 -07:00
redmatrix
90a31f4ad5
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/zot.php
2015-07-02 22:00:15 -07:00
redmatrix
065a50c920
a few clone sync fixes as well as some work on hubzilla clone sync back to redmatrix
2015-07-02 21:55:36 -07:00
redmatrix
9369e521bb
a bit of cleanup and explanatory text on mod/pconfig
2015-07-02 20:57:06 -07:00
redmatrix
f6fae2ebd9
web version of util/pconfig
2015-07-02 19:54:22 -07:00
redmatrix
75560b0496
turn attached audio/video into audio/video elements as well as providing an attachment link
2015-07-01 16:23:25 -07:00
redmatrix
d5c085a3c6
cleanup of import to allow cross-product import going one way. Note - items/content are not yet importable
2015-06-30 20:21:09 -07:00
redmatrix
1e3dffc29d
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-30 20:19:50 -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
22cb09f537
warn if export data file is from an incompatible project or if the DB version differs significantly from the current DB. This is to avoid people cloning a hubzilla channel back to red and potentially stuffing up the works. Hopefully we can migrate upwards someday. Downwards is always going to be an issue.
2015-06-29 22:37:18 -07:00
redmatrix
97e8275dc2
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-29 22:19:44 -07:00
redmatrix
0b347ccc14
turn the connection filter into a feature.
2015-06-29 20:35:56 -07:00
redmatrix
6e8ad5089e
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
view/nl/messages.po
view/nl/strings.php
2015-06-29 18:01:51 -07:00
Mario Vavti
7ef4397634
fix directory location
2015-06-29 14:25:04 +02:00
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
090dae46e5
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-06-28 21:19:28 -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
Alexandre Hannud Abdo
7fafcbb6ef
simply 'post' is a better default term than 'status'
2015-06-27 18:10:18 -03:00
redmatrix
a3d7e8456a
undo the disabling of browser_prefetch and for the time being revert the HTML cache until we can isolate all the zid and observer calls. Also get rid of youtube and vimeo bbcode tags which we should not be using any more.
2015-06-25 20:07:10 -07:00
redmatrix
70975dda4a
remove all QR-code stuff from core - now in qrator addon
2015-06-25 19:05:49 -07:00
redmatrix
5f3edabd45
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
doc/de/features.bb
view/de/messages.po
view/de/strings.php
2015-06-24 16:34:52 -07:00
Mario Vavti
f707f4d49a
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-24 12:33:53 +02:00
Mario Vavti
201ba411ba
Reflect in directory title if we watch the local or the global directory
2015-06-24 12:33:37 +02:00
redmatrix
1a0655f34e
more work on mail flags
2015-06-23 21:01:59 -07:00
redmatrix
cb76fb8b9b
item flag fixes discovered after a few merges
2015-06-23 19:45:39 -07:00
redmatrix
833098e346
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/items.php
mod/item.php
2015-06-23 17:30:35 -07:00
redmatrix
7975bc828f
typo
2015-06-23 16:22:21 -07:00
Mario Vavti
30ba2803e7
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-23 13:06:40 +02:00
Mario Vavti
b6c4601d8f
some work on directory
2015-06-23 13:06:22 +02:00
redmatrix
45d66657d7
Merge pull request #356 from solstag/signature_edit_fix
...
properly trims edited posts before signing so signature verification …
2015-06-23 14:47:59 +10:00
Alexandre Hannud Abdo
a189fc0872
properly trims edited posts before signing so signature verification works
2015-06-23 01:08:02 -03:00
redmatrix
d46f5467b3
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-06-22 16:09:36 -07:00
redmatrix
9879cf3c6c
ensure we always sign a trimmed item body.
2015-06-22 16:09:02 -07:00
Mario Vavti
a4775aab9b
Bring /help in line with the rest of the app
2015-06-22 14:02:14 +02:00
redmatrix
ae6612025d
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/items.php
util/messages.po
2015-06-21 20:51:07 -07:00
redmatrix
0ad71b3efa
import: Improve the descriptive text for this feature
2015-06-21 19:11:07 -07:00
redmatrix
68534fd5dc
some diaspora import issues uncovered during dry-run tests
2015-06-21 17:30:23 -07:00
redmatrix
a6b9d1595e
automatically gunzip Diaspora export files if we're on a *nix system
2015-06-19 17:18:01 -07:00
redmatrix
6bd90816dd
very early attempt diaspora import from diaspora export file. Currently the json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later.
2015-06-19 16:39:03 -07:00
redmatrix
6aa159e2ac
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-18 19:15:01 -07:00
redmatrix
25e134dd9c
set return url from apps page
2015-06-18 17:53:26 -07:00
redmatrix
2963be60e5
more photos work
2015-06-17 18:26:56 -07:00
redmatrix
6ab20eb1b5
lots of work on merging photo and file albums/folders
2015-06-17 17:44:31 -07:00
redmatrix
65661b7ec3
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/photos.php
mod/siteinfo.php
2015-06-16 18:43:03 -07:00
redmatrix
ec54111e6b
Merge pull request #349 from git-marijus/master
...
make photo upload work for remote channels with perms
2015-06-17 11:14:18 +10:00
redmatrix
d84b3cfc3c
remove file/attachments when their associated photos are removed
2015-06-16 17:50:15 -07:00
jeroenpraat
24befa2197
Small fix in siteinfo
2015-06-16 13:24:10 +02:00
Mario Vavti
93f48cd8bb
make photo upload work for remote channels with perms
2015-06-16 12:18:50 +02:00
redmatrix
bc72d3fd26
move profile photos to new methods
2015-06-15 23:37:51 -07:00
redmatrix
bdedda7c6b
fix attachment permissions when they also contain an image.
2015-06-15 20:43:49 -07:00
redmatrix
2adc7a51ad
photo upload: pass in the contact_allow and resource_id via include/attach.php
2015-06-15 19:52:17 -07:00
redmatrix
8c7472c6c3
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
view/nl/messages.po
view/nl/strings.php
2015-06-15 17:30:08 -07:00
redmatrix
859a2ac8ef
DB changes for some channel flags
2015-06-15 17:28:52 -07:00
Mario Vavti
905cd1da5b
do not allow/show acl button on photo edit if not owner
2015-06-15 13:04:16 +02:00
redmatrix
d2178e43f6
sql errors after last major edit adventure
2015-06-14 21:19:13 -07:00
redmatrix
be0459a98b
convert the abook fields
2015-06-14 21:08:00 -07:00
redmatrix
9642728e7d
first cut at merging files and photos, not yet well integrated but they are integrated
2015-06-14 16:50:24 -07:00
redmatrix
23f7f60bf7
make new os_storage flag work
2015-06-14 15:59:11 -07:00
redmatrix
5733491ac8
more work on items
...
and
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
view/it/messages.po
view/it/strings.php
2015-06-11 17:56:56 -07:00
redmatrix
b2c5020af7
diaspora disallowed by default
2015-06-10 18:51:39 -07:00
redmatrix
bc1b7afc85
start to partition the dav
2015-06-10 18:11:15 -07:00
redmatrix
a14d2de1f0
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-10 17:58:02 -07:00
redmatrix
04551ac32b
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-06-10 17:45:04 -07:00
redmatrix
9a5d9fb8c5
put block_public back where it is needed, which is in mod_public and not mod_home
2015-06-10 17:44:04 -07:00
redmatrix
ca870dbf31
more work on item table optimisation
2015-06-10 16:59:04 -07:00
redmatrix
2128d5a256
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-10 15:47:23 -07:00
Alexandre Hannud Abdo
a31fdd3fbb
correctly fix attachment permissions from private mentions
...
by postponing code that removes the attachment tag from the body
2015-06-10 15:37:10 -03:00
Mario Vavti
edd2d1e8d4
show login without checking for block_public, local or remote channel
2015-06-10 13:24:16 +02:00
Mario Vavti
20a317b5b7
really show login form if it is enabled
2015-06-10 11:58:45 +02:00
redmatrix
eb6a1f8387
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-09 19:39:21 -07:00
redmatrix
9592f7f3e6
put mirror_frontpage setting into admin/site
2015-06-09 19:37:12 -07:00
redmatrix
d08c43d80c
toggle diaspora protocol on a per-channel level in addition to the existing per site setting. Default is enabled if the site setting is enabled.
2015-06-09 18:50:11 -07:00
redmatrix
faa7f97c25
s/broder/border/
2015-06-09 16:52:53 -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
805e2a28ee
add nomadic identities as webfinger aliases
2015-06-09 16:29:51 -07:00
redmatrix
54b61f817d
provide a mechanism for loading the frontpage without redirecting.
2015-06-08 21:19:05 -07:00
redmatrix
507e10fa45
remove debugging
2015-06-08 16:57:30 -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
5b482c1daf
magic auth issues on dreamhost
2015-06-07 23:04:46 -07:00
redmatrix
9823541c4b
make sure these are included
2015-06-07 21:36:50 -07:00
redmatrix
3c5a5a9ebf
more frontpage tweaks
2015-06-07 18:59:14 -07:00
redmatrix
60cfea5d1f
reverse logic of homepage login setting
2015-06-07 18:27:05 -07:00
redmatrix
0537ff1e4a
frontpage tweaks
2015-06-07 18:15:26 -07:00
redmatrix
65bea5e02c
frontpage changes
2015-06-07 16:19:59 -07:00
redmatrix
ec1dcb8f2e
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
util/messages.po
2015-06-06 17:31:22 -07:00
jeroenpraat
93237f8d0a
Added translatable strings to the Display Settings page and refreshed util/messages.po.
2015-06-06 19:49:30 +02:00
Mario Vavti
d84f77bbc6
use the right webpage layout for an installed webpage if it exists
2015-06-04 23:04:58 +02:00
redmatrix
7cbc504874
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-02 17:47:47 -07:00
Mario Vavti
6277fb76dd
update help link
2015-06-02 11:09:57 +02:00
redmatrix
e3606ec56f
move the photo and attachment permission syncing past the tag replacement so that attachments get the correct permissions when private mentions are used.
2015-06-01 16:26:12 -07:00
redmatrix
84c085dcd7
bare bones ASLD
2015-05-31 22:16:14 -07:00
redmatrix
f3b95f591a
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-31 19:26:00 -07:00
Habeas Codice
0df0fb4b46
fix unable to crop profile pic on postgres
2015-05-30 19:49:32 -07:00
redmatrix
cd3284d081
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-30 15:04:11 -07:00
redmatrix
edd228decb
strip images from directory text entries
2015-05-30 15:03:44 -07:00
Mario Vavti
8516b3259f
whitespace
2015-05-29 16:14:54 +02:00
Mario Vavti
d11d130021
add some yes/no labels and minor template fixes
2015-05-29 15:23:51 +02:00
Mario Vavti
b8d3280763
some fixes to make menu sharing work and expose it in the ui.
2015-05-29 13:08:01 +02:00
Mario Vavti
5f1ae2930b
show created/edited dates for menus
2015-05-29 11:07:57 +02:00
redmatrix
3c82156d63
untested menu element import, be aware that the menu api does not over-write on duplicate name - it just fails. We'll need to sort this out eventually. Also it was planned to offer a choice of whether to preserve links from the source site or change the baseurl to the local one. Currently we convert them all to local links.
2015-05-28 20:50:29 -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
1a86e3321b
catch a window that wasn't yet saved when the last checkin occurred
2015-05-27 21:46:36 -07:00
redmatrix
12c17f1265
menu encoding for sharing/exchange
2015-05-27 21:09:21 -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
2dd02cc166
missing row in sql query which is used further down
2015-05-27 19:26:42 -07:00
redmatrix
11301d51a5
some high-level stuff we may need for shareable menus. Also make the client register function do the right thing even though I refuse to make it work. If **you** want service federation with things like pumpio and openid connect, it's time for **you** to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks.
2015-05-27 17:30:36 -07:00
redmatrix
9a0264f5d2
some work on issue #329
2015-05-25 19:17:35 -07:00
redmatrix
675aa96f22
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-25 17:01:02 -07:00
redmatrix
23abfb0a5b
add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle the censor flag from that page.
2015-05-25 16:56:28 -07:00
redmatrix
dfa4984089
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-24 20:21:30 -07:00
redmatrix
1828771557
timezone setting not saved issue #336
2015-05-24 18:09:41 -07:00
redmatrix
d537fc854b
typo and update to rfc7033 (webfinger) as well as webfinger diagnostic page
2015-05-24 17:59:31 -07:00
redmatrix
27137e48eb
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-24 17:16:12 -07:00
redmatrix
d9061fd09e
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-24 15:59:03 -07:00
redmatrix
52e38d7c24
search result heading not translatable
2015-05-24 15:57:59 -07:00
redmatrix
851f2f64df
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
index.php
mod/setup.php
2015-05-24 15:50:05 -07:00
redmatrix
a332dfcf6b
Merge pull request #331 from solstag/jqueryprop
...
Fix accepting contacts by using correct jquery calls.
2015-05-24 12:50:43 +10:00
Klaus Weidenbach
e90c331bf6
Add PHP's xml module check and upload limits to setup.
...
And some documentation.
2015-05-24 02:58:52 +02:00
Alexandre Hannud Abdo
d37c51ef2e
Fix accepting contacts by using correct jquery calls.
...
Not sure what the operation on disabled is supposed to do, but
it also seemed to requier prop instead of attr.
See for reference:
http://api.jquery.com/prop/
"""
The checked attribute value does not change with the state of the checkbox,
while the checked property does.
"""
2015-05-22 10:15:29 -03:00
redmatrix
5795e2a58b
more migration of page types
2015-05-21 22:17:17 -07:00
redmatrix
25bd332aab
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-21 20:39:10 -07:00
redmatrix
81d94dae2c
preserve lock on edited comments
2015-05-21 02:03:44 -07:00
redmatrix
3763f74a10
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/items.php
include/text.php
mod/item.php
view/nl/messages.po
2015-05-20 20:49:06 -07:00
redmatrix
0689816772
check for success before updating remote id
2015-05-20 19:27:05 -07:00
redmatrix
6466774b6e
PRIVACY: possible privacy leakage under a defined set of circumstances
2015-05-20 18:46:23 -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
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
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
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
91d7b0f7eb
more work isolating the projectname from core.
2015-05-17 16:28:16 -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
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
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
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
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
c3c202d650
issue #187
2015-05-12 22:57:55 -07:00
redmatrix
018e702281
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/mitem.php
view/nl/strings.php
2015-05-12 19:00:54 -07:00
redmatrix
aeb69dcbbe
let the site admin import a record directly from the probe diagnostic
2015-05-11 19:36:07 -07:00
redmatrix
cddcf9d3ab
missing translation
2015-05-11 17:50:17 -07:00
redmatrix
5386686a1e
missing merge conflict
2015-05-11 17:46:58 -07:00
redmatrix
0a644a2f41
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/mitem.php
view/de/messages.po
view/de/strings.php
2015-05-10 13:26:44 -07:00
Mario Vavti
ca36fce9a7
provide drop down submenu suggestions in edit mode
2015-05-10 21:17:37 +02:00
Mario Vavti
616338c17e
provide ability to create submenus
2015-05-10 15:00:18 +02:00
redmatrix
90591bcbc9
missed one...
2015-05-06 22:56:08 -07:00
redmatrix
25b599a4bd
convert ITEM_WALL from bitfield to standalone
2015-05-06 21:03:33 -07:00
redmatrix
75b8bfc07a
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-06 18:39:12 -07:00
Mario Vavti
257c670d5c
avoid double slash after editing layout
2015-05-06 12:16:53 +02:00
redmatrix
c9ec4f46b6
for hubzilla we won't be obscuring items, only private mail, this will allow us to search and cache private posts
2015-05-05 18:36:05 -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
friendica
c4221f3273
Merge branch 'master' into tres
...
Conflicts:
include/notifier.php
2015-04-29 21:49:43 -07:00
Mario Vavti
310d122901
disable voting in blocks, layouts and webpages
2015-04-29 21:36:53 +02:00
Mario Vavti
e56b8fdfaf
fix $noloc state in mod editwebpages
2015-04-29 16:45:05 +02:00
Mario Vavti
f987fc3e6f
adjust placeholder naming
2015-04-29 16:33:03 +02:00
Mario Vavti
31b5b06e42
Provide webpage layout description
2015-04-25 22:35:24 +02:00
friendica
e01873b4cf
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-24 15:01:59 -07:00
Mario Vavti
b7f6cceaea
provide block titles in blocklist
2015-04-24 22:37:22 +02:00
Mario Vavti
2583cab469
add title to element array
2015-04-24 14:14:33 +02:00
Mario Vavti
da0875a015
there is no key named term in this array
2015-04-24 12:43:41 +02:00
Mario Vavti
9894a7b2d0
copy/paste typo
2015-04-24 12:37:13 +02:00
Mario Vavti
c6a75f407d
webpages layout fixes
2015-04-24 11:36:49 +02:00
friendica
98b3d7d6ff
reset route
2015-04-24 00:59:02 -07:00
friendica
b3ac1cd993
mod/branchtopic - move an off-topic comment to its own thread as a fresh wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains.
2015-04-24 00:56:06 -07:00
friendica
ca305f5421
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-23 21:29:27 -07:00
friendica
5ac177391b
disconnect
2015-04-23 21:13:59 -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
Mario Vavti
c696860cc5
webpages blocks fixes
2015-04-23 21:04:01 +02:00
Mario Vavti
29061b3ee3
do not show acl button if not owner
2015-04-22 12:31:30 +02:00
Mario Vavti
dfc88a41df
fix webpages profile_tabs
2015-04-22 12:21:33 +02:00
Mario Vavti
9e490d022b
fix webpage perms
2015-04-22 12:00:15 +02:00
Mario Vavti
b4dff3a9ff
provide headings for blocks and layouts
2015-04-22 10:31:36 +02:00
Mario Vavti
e58e8f3f75
bring lockstate to webpages
2015-04-21 23:08:54 +02:00
Mario Vavti
21704ecb93
bring lockview to menu items, slightly change the way /lockview is called
2015-04-21 22:45:54 +02:00
Mario Vavti
0bd9fe0b11
rework and hopefully improve webpage menu creation workflow
2015-04-21 10:05:26 +02:00
friendica
53339d19a3
issue #176 , sender copy of item not obscured if using private mention
2015-04-20 20:14:07 -07:00
friendica
a707e9b9f5
issue #178 , searching for words such as 'data' would return private items regardless of their unobscured content.
2015-04-19 23:16:17 -07:00
friendica
9cc8b44579
issue #157 , provide default directory sort order
2015-04-19 23:04:14 -07:00
Michael Johnston
dadcfd3ff6
switch from IMG_XXX constants to IMAGETYPE_XXX constants
2015-04-19 18:06:42 -04:00
friendica
0883512e30
log this since we may need it to track down failures
2015-04-18 17:40:44 -07:00
Mario Vavti
61e4ee753d
allow jot to be displayed expanded, remove deprected datetimepicker js and some random fixes
2015-04-17 11:20:22 +02:00
Mario Vavti
10cc643f65
wording and css fixes
2015-04-16 23:46:12 +02:00
Mario Vavti
9addc4581e
provide a separate input field for rpost attachments
2015-04-16 23:26:11 +02:00
Mario Vavti
90d3a6c02d
make rpost respect default post permissions
2015-04-16 11:15:04 +02:00
Mario Vavti
b42bb09635
whitespace
2015-04-16 10:46:59 +02:00
Mario Vavti
86ac9c0d6b
move share webpage element from editwebpage to webpages and make it shareable with rpost
2015-04-16 10:43:14 +02:00
mrjive
a597c74b97
Update viewsrc.php
...
Adding the item ID to the item source view
2015-04-15 12:26:03 +02:00
friendica
2c8394a4b9
funny I should mention comanche preview (yesterday) as clicking the view link on a layout does nothing interesting at all. So I've made it do a crude but useable preview with page content of 'Lorem Ipsum'.
2015-04-14 21:48:42 -07:00
friendica
89536ff88b
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-14 16:22:59 -07:00
friendica
3a45206b99
default perms not being set in some cases
2015-04-14 16:22:33 -07:00
Mario Vavti
953819e7da
css fixes and remove expert mode for block page content type
2015-04-14 12:52:31 +02:00
Mario Vavti
79b5fb5b58
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-04-14 11:50:34 +02:00
Mario Vavti
bf2a97147e
some more on webpages
2015-04-14 11:50:21 +02:00
Habeas Codice
213ca7f8b5
unquote binary
2015-04-13 16:18:11 -07:00
friendica
d3bc721138
item_check_service_class wasn't returning correct results
2015-04-13 16:03:09 -07:00
Mario Vavti
865b602cf8
webpages appearence
2015-04-13 23:38:36 +02:00
Mario Vavti
7c8b9397ae
reverse file activity logic
2015-04-12 13:13:22 +02:00
friendica
3fd2e4b716
program the affinity slider labels
2015-04-09 19:51:58 -07:00
friendica
2619b60721
make sure we redirect to a sane place after deleting a webpage element
2015-04-09 15:45:08 -07:00
friendica
7bec4b313a
system channel always has allow_code privileges
2015-04-08 23:05:36 -07:00
friendica
37afc81847
update features, allow sys account page deletion
2015-04-08 17:54:52 -07:00
friendica
dc2830755d
add common connection count to suggestions
2015-04-07 18:13:10 -07:00
friendica
558246257c
separate the hub query since it changes the logic default and cannot easily be grouped
2015-04-07 13:51:51 -07:00
friendica
5bc7c0e798
add endless scroll to viewconnections module
2015-04-06 22:36:46 -07:00
friendica
3a3563a4b1
commit 59828593c
broke some important poco stuff, looks like the cat might have climbed over the keyboard and deleted something that wasn't intended to be deleted.
2015-04-06 19:00:13 -07:00
friendica
821bbd41e1
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-06 16:14:58 -07:00
friendica
04959a095f
make the findpeople widget honour the local/global directory setting
2015-04-06 16:14:12 -07:00
Klaus Weidenbach
754ac2cff7
Fix Design Tool navigation for sys channel.
...
Fix creating menu for sys channel.
2015-04-06 23:52:13 +02:00
friendica
f1e73abd21
issue #226
2015-04-05 21:32:54 -07:00
friendica
649ada7100
provide ability to have randomised homepage content from a set of pages name home-*
2015-04-02 13:22:48 -07:00
friendica
d599ebe742
update resource links
2015-04-01 15:52:02 -07:00
friendica
6f78d7a85d
fix regdir
2015-03-31 21:06:48 -07:00
friendica
7f6ba91dfa
allow webpage for home to use its own layout file
2015-03-31 17:52:03 -07:00
friendica
cbaa2a9b84
don't included any deleted posts in the self query
2015-03-30 21:06:41 -07:00
friendica
d3c064cc34
title of preview button incorrect, fix ability to upload to webpages
2015-03-30 19:41:42 -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
47292c612c
provide ways to over-ride the datetime pickers
2015-03-26 18:03:39 -07:00
friendica
f1a1660709
item_check_service_class - the join is totally unnecessary
2015-03-25 19:13:53 -07:00
friendica
296c4c38bc
improve description of that setting
2015-03-25 17:46:38 -07:00
friendica
75f3f4a808
admin config for default expiration
2015-03-25 17:43:02 -07:00
friendica
022305fe83
also allow service classes to set post expiration. These take priority over the site default.
2015-03-24 20:38:53 -07:00
friendica
c2acab21d4
improve performance of the zotfeed queries
2015-03-23 19:56:10 -07:00
friendica
0f8fdf1a3e
Merge https://github.com/friendica/red into pending_merge
2015-03-23 15:37:13 -07:00
friendica
f2127d4ba7
limit notification detail queries for items and events
2015-03-23 15:36:17 -07:00
Mario Vavti
dd930f180e
sql in -> IN
2015-03-23 11:06:13 +01:00
Mario Vavti
d6ad74c649
indicate new or updated items
2015-03-23 10:59:54 +01:00
friendica
62b2fa6ac7
operation snakebite, cont.
2015-03-22 20:30:23 -07:00
friendica
2bd19e6b51
$simple_update isn't so simple any more. Make sure we don't re-itnroduce the bug that session['loadtime'] was created to fix. It's questionable whether we still need to even look for item_unseen but I won't make that call today. We can also eliminate the restriction on not doing live updates from the discover tab since we aren't relying completely on item_unseen (which can only be set by the owner and won't work on a page with virtual owners).
2015-03-22 15:00:41 -07:00
friendica
f5f194c92b
allow complete undo of a vote, not just a change of vote
2015-03-22 14:55:41 -07:00
friendica
b198cf69cd
Merge https://github.com/friendica/red into pending_merge
2015-03-22 12:56:08 -07:00
friendica
6631540d20
provide visual feedback when deleting a like by liking it again.
2015-03-22 12:55:13 -07:00
Mario Vavti
e345d6793d
move the maintenance part to include/sharedwithme.php
2015-03-22 16:29:57 +01:00
friendica
1b17b0193e
fix multiple vote issues
2015-03-21 17:14:12 -07:00
friendica
b298bc8834
Merge https://github.com/friendica/red into pending_merge
2015-03-21 16:47:46 -07:00
friendica
a2e3ca6fd8
add loadtime search to channel and fix it for home. display and search need further investigation
2015-03-21 16:46:28 -07:00
Mario Vavti
5a1c388d4a
Merge branch 'master' of https://github.com/friendica/red
2015-03-21 15:17:59 +01:00
Mario Vavti
9980645ab8
fix acl for if we have an cid in /network and make $bang better visible
2015-03-21 13:37:55 +01:00
friendica
96afe7bf42
set to empty string so it doesn't get mis-handled as a null
2015-03-20 16:49:49 -07:00
friendica
07f8e7049a
Merge https://github.com/friendica/red into pending_merge
2015-03-20 16:47:38 -07:00
friendica
01716dea3d
config to hide version tag from siteinfo - on my site it's meaningless.
2015-03-20 16:46:07 -07:00
Mario Vavti
ead45292e1
some tabs title statuseditor restructuring
2015-03-21 00:06:18 +01:00
Mario Vavti
9a2ef38267
need the cloudpath before creating the object
2015-03-20 18:04:22 +01:00
Mario Vavti
6698d7b03a
possible improvement regarding deletion
2015-03-20 17:37:01 +01:00
friendica
274a30f2db
call parse_url from rpost and add the result to the content body if invoked with a url argument
2015-03-19 16:41:41 -07:00
friendica
b1fd6c53a5
tweaks to directory registrations which don't seem to be happening, also downgrade any directory that claims to be a primary directory for RED_GLOBAL.
2015-03-19 15:56:30 -07:00
friendica
63683734a2
make the channel item query match recent changes to network item query (and some slightly older changes in display item query), and allow '@' in linkified urls.
2015-03-18 19:06:05 -07:00
friendica
629f6bec74
ok it has to be owner.
2015-03-17 15:45:08 -07:00
friendica
7af012b1f9
The random bad signatures are because something somewhere is trimming the body text. It could be any one of hundreds of functions that touch the message body. We really want to trim the body text, so I'm putting back all the trim statements - in mod/item and item_store and item_store_update. The last fix for random bad sigs noted that one of the trims wasn't there, so the others were removed. The correct fix is for all the trims to be there. We will probably have a few (quite a few) bad sigs during the transition back to trimmed text but this should nail it for anybody on recent code and with new content.
2015-03-17 00:13:47 -07:00
friendica
bc22df9057
display a map for photos if allowed. Note: there is a bug in that if the map div starts with display:none one needs to reload the frame or zoom in or they end up at minimum resolution. Still trying to sort this out.
2015-03-16 22:06:03 -07:00
friendica
178b768e3c
openid cleanup
2015-03-16 17:08:50 -07:00
friendica
ccf4734f7b
make sure this sucker is quiet
2015-03-16 15:50:45 -07:00
friendica
52374bcd6e
phase one of the great file storage unification - use one button for uploads of any type (image or attachment). We'll sort out which one it is and deal with it appropriately.
2015-03-16 15:33:08 -07:00
friendica
6da40fc559
mod_id: load profile so the sidebar profile will work
2015-03-15 16:48:45 -07:00
friendica
6537a65053
mysql schema typo, do the install check for store before chcking smarty, as that is where the dir is created, change install doc to point to install/schema_xxxxx.sql instead of database.sql
2015-03-15 15:36:01 -07:00
friendica
cc2c7bbcd8
revert the revert - that is working. My test was bad.
2015-03-14 01:03:37 -07:00
friendica
88167718ba
revert and rethink
2015-03-14 00:51:16 -07:00
friendica
b76cdf82d2
create terms for Diaspora mention tags - which in Diaspora are handled differently than other tag links and have to be done separately; they aren't processed by linkify_tags which handles all of our other tag processing. Also move the abook_channel clause in mod_network to the join statement. This works fine in mysql and achievies the desired result. I hope postgres can handle an expression as a join clause.
2015-03-13 19:24:17 -07:00
zottel
e732fbe8e8
fix posts not showing up in network if author is not in connections
2015-03-14 00:22:47 +01:00
friendica
7d5efe88e0
use local_channel() connnections to match the abook against when joining the abook on the discover tab.
2015-03-13 15:39:19 -07:00
friendica
c412e6e640
revert that
2015-03-12 20:51:36 -07:00
friendica
93caead072
try to allow translation of ax regs
2015-03-12 20:43:53 -07:00
friendica
d60cb14c2f
support a fair number of the common AX regs
2015-03-12 20:05:43 -07:00
friendica
f2d84608af
Add some AX vars to openid server.
2015-03-12 18:48:32 -07:00
friendica
02a58dc5b0
more JS=1 weirdness
2015-03-12 16:20:29 -07:00
friendica
71f2a797cb
try and add some regs
2015-03-12 15:19:54 -07:00
Mario Vavti
d11bec6f58
add generic_addon_settings template and minor fixes
2015-03-12 22:22:52 +01:00
Mario Vavti
0905180385
Merge branch 'master' of https://github.com/friendica/red
2015-03-12 10:20:21 +01:00
Mario Vavti
8113ee1c4a
some work on feature/addon settings
2015-03-12 10:19:56 +01:00
Habeas Codice
1578c49976
substr() is a mysql alias for substring(). substring() is in the SQL standard and is supported by both
...
databases.
2015-03-12 00:28:49 -07:00
friendica
76fedfe1f8
openid stuff
2015-03-11 21:49:29 -07:00
friendica
64ae17aa6a
Merge branch 'master' into openid
2015-03-11 19:35:23 -07:00
friendica
b3a9a6c802
remove the now redundant audio/video buttons and label the editor text style buttons which didn't have them. Unused editor buttons were commented in case we need to bring them back. If things go smoothly we can remove them. Use the link icon going forward - for all links.
2015-03-11 18:56:28 -07:00
friendica
d6ce32ef78
parse_url changes for oembed/zvideo/etc.
2015-03-11 17:31:15 -07:00
friendica
a40c19d19d
Merge branch 'master' into openid
2015-03-11 01:03:30 -07:00
friendica
bfd123c59a
openid server
2015-03-11 01:03:14 -07:00
friendica
844b2ae587
cleanup of old delegation stuff
2015-03-10 20:19:17 -07:00
friendica
9d1df58759
sql optimisation for affinity searches. A new index was added which wasn't added retro-actively to existing DBs as an update. It isn't clear if this helps sites any more than just restricting the abook table to certain channel_id's is (and this field is already indexed).
2015-03-10 18:55:56 -07:00
friendica
5b35f1e6c4
Change logic of "don't create a status post for this photo upload" and turn it into a bona-fide on/off toggle. This takes up one more vertical line, but we have it to spare, and the single button (while concise visually) provided no feedback of the current state, or indicate whether a second click toggled it. Some addons use this setting so addons will need to be pulled when this is pulled in order to remain in sync.
2015-03-10 15:43:15 -07:00
friendica
3466547784
missing include
2015-03-10 02:27:10 -07:00
friendica
98dffd77ef
channel delegation
2015-03-10 02:23:14 -07:00
friendica
0134a41015
more work on queue optimisations
2015-03-09 19:57:35 -07:00
Habeas Codice
a611eed172
Whoops... should've actually checked the pg manual before merging #920 :-)
...
replace if(cond,val,val) with case when cond then val else val end, works on
both DBs
2015-03-09 17:54:14 -07:00
friendica
26a414fe4b
make network page default options work more or less universally instead of just from the navbar, and fix some saved-search weirdness related to the delete-term icon
2015-03-09 16:27:12 -07:00
friendica
16bcca6aab
up the count of directory tags
2015-03-09 15:24:05 -07:00
friendica
e7d3244276
Allow site to over-ride directory options. Bugger off.
2015-03-09 15:16:52 -07:00
friendica
aff7588832
fix comanche regions after comanche refactor a few days ago
2015-03-09 00:44:58 -07:00
habeascodice
f7d1fb9c5a
Merge pull request #920 from dawnbreak/master
...
Add alert to admin page about old PHP version. Fixing (un)blocking accounts in admin.
2015-03-08 16:51:42 -07:00
Klaus Weidenbach
c6d45858bb
Fixing (un)blocking accounts in /admin/users.
...
When I look at the instructions in sql_conventions about setting bit
flags I don't understand how this could have worked before. Changed the
behavior for (un)blocking so that it should work now.
2015-03-08 22:22:45 +01:00
Klaus Weidenbach
23ea974615
Add alert to admin page about old PHP version.
...
Add an alert message to admin summary page when a PHP version < 5.4 was
detected as this has reached EOL and will not be supported with the new
SabreDAV library.
Some styleguide optimisation.
Add NULL_DATE example to doc/sql_conventions.bb.
Display a "0" when no plugins active in summary page.
Added some more numbers to summary admin page, expired accounts,
channels. Hope I interpreted them right. I have no idea how to get
blocked accounts.
2015-03-08 17:51:58 +01:00
friendica
1351f9c81a
Merge https://github.com/friendica/red into pending_merge
2015-03-07 15:22:00 -08:00
friendica
aac4affe65
directory: fix public forum listing
2015-03-07 15:21:23 -08:00
Mario Vavti
9cd7546be5
hopefully fix #919
2015-03-07 15:56:28 +01:00