redmatrix
|
0a051ff2cd
|
preserve code blocks on item import if channel has code rights. When importing the channel itself,
turn code access off unless this is the admin.
|
2015-09-08 22:46:34 -07:00 |
|
redmatrix
|
d702133ded
|
move mod_admin to Comanche finally
|
2015-09-08 20:48:35 -07:00 |
|
redmatrix
|
2aaee311f3
|
differentiate Community Server from Enterprise Server
|
2015-09-08 19:57:07 -07:00 |
|
redmatrix
|
e8d431c2f6
|
issues with "use this photo for profile photo" #36
|
2015-09-08 19:51:52 -07:00 |
|
redmatrix
|
0f4c012321
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/items.php
mod/menu.php
|
2015-09-08 19:16:07 -07:00 |
|
redmatrix
|
f13a8f725c
|
export TERM_FILE when mirroring
|
2015-09-08 19:14:29 -07:00 |
|
redmatrix
|
e6690c818d
|
export TERM_FILE when mirroring
|
2015-09-08 19:13:43 -07:00 |
|
redmatrix
|
5d32aa94d9
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/menu.php
mod/menu.php
mod/mitem.php
|
2015-09-08 18:46:15 -07:00 |
|
redmatrix
|
d413b6eba8
|
merge conflicts
|
2015-09-08 18:45:58 -07:00 |
|
redmatrix
|
f0847e6f32
|
debugging menu sync
|
2015-09-08 18:40:56 -07:00 |
|
redmatrix
|
50d7554ccd
|
add sync packets for menus
|
2015-09-08 18:40:19 -07:00 |
|
redmatrix
|
b28d3015fe
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
|
2015-09-08 17:53:43 -07:00 |
|
redmatrix
|
75d521d42a
|
menu import and sync
|
2015-09-08 17:52:39 -07:00 |
|
redmatrix
|
1ebaacfd5e
|
menu export
|
2015-09-08 17:50:24 -07:00 |
|
redmatrix
|
c6bdf7e891
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-07 22:55:42 -07:00 |
|
redmatrix
|
11e19a06b7
|
export events
|
2015-09-07 22:54:43 -07:00 |
|
redmatrix
|
880ca35681
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-07 21:02:05 -07:00 |
|
redmatrix
|
650e98b2a9
|
work on event sync
|
2015-09-07 21:01:49 -07:00 |
|
redmatrix
|
f84946c135
|
minor fix to event sync
|
2015-09-07 21:00:54 -07:00 |
|
redmatrix
|
508969a183
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-07 20:29:13 -07:00 |
|
redmatrix
|
c39e3613a8
|
create event sync packets
|
2015-09-07 20:28:02 -07:00 |
|
redmatrix
|
4eec9a2fba
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/items.php
view/it/messages.po
view/it/strings.php
|
2015-09-07 18:20:47 -07:00 |
|
redmatrix
|
6d1b64065a
|
consolidate import_items/sync_items
|
2015-09-07 18:14:30 -07:00 |
|
redmatrix
|
5751437c93
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-07 18:13:17 -07:00 |
|
redmatrix
|
9fa0490c44
|
sync posted top level items rather than deliver them (actually we do both, but sync comes first). This way we get the ACL transferred.
|
2015-09-07 18:11:30 -07:00 |
|
Habeas Codice
|
6711ceb662
|
fix postgres zotfeed
|
2015-09-07 16:28:42 -07:00 |
|
Wave
|
dc7677f5fa
|
Merge pull request #391 from tuscanhobbit/master
Updated Italian strings
|
2015-09-07 17:29:13 +02:00 |
|
Paolo Tacconi
|
78fb6f55ed
|
Updated Italian strings
|
2015-09-07 17:24:43 +02:00 |
|
redmatrix
|
2f52b6c164
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
util/messages.po
|
2015-09-07 04:06:27 -07:00 |
|
redmatrix
|
5d59462e49
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-07 04:04:15 -07:00 |
|
redmatrix
|
1b09c64856
|
PRIVACY: item_private seems to have been removed from permissions_sql checking with an observer.
|
2015-09-07 03:59:38 -07:00 |
|
redmatrix
|
2312f03eac
|
Always open rpost editor on document ready
|
2015-09-06 20:50:31 -07:00 |
|
redmatrix
|
1d09e4b620
|
use conversation defaults for /public page instead of collapsed list mode, but allow over-ride
|
2015-09-06 16:42:50 -07:00 |
|
jeroenpraat
|
6ea1cf71b5
|
Update dav_windows.bb
|
2015-09-06 23:36:26 +02:00 |
|
jeroenpraat
|
302fe94705
|
Update dav_nemo.bb
|
2015-09-06 23:35:35 +02:00 |
|
jeroenpraat
|
38ea8d1d86
|
Update dav_mount.bb
|
2015-09-06 23:32:14 +02:00 |
|
jeroenpraat
|
67ed7e40be
|
Update dav_mount.bb
|
2015-09-06 23:30:25 +02:00 |
|
jeroenpraat
|
20f211b70a
|
Update dav_dolphin.bb
|
2015-09-06 23:27:55 +02:00 |
|
jeroenpraat
|
ebb07def7e
|
Update dav_nautilus.bb
|
2015-09-06 23:26:28 +02:00 |
|
redmatrix
|
55ab968edf
|
make js_upload work with hubzilla. It still needs a rewrite.
|
2015-09-05 17:35:00 -07:00 |
|
redmatrix
|
3f6d6745de
|
syntax
|
2015-09-05 15:33:09 -07:00 |
|
redmatrix
|
d1daae1b59
|
Merge pull request #26 from anaqreon/logo-in-readme
Updating logo icon in Readme file and change markup heading
|
2015-09-05 07:18:42 +10:00 |
|
redmatrix
|
350ea2bf28
|
Merge pull request #35 from redmatrix/jeroenpraat-patch-1
Fix for PHP Fatal error: Function name must be a string in /var/www/…
|
2015-09-05 07:18:01 +10:00 |
|
jeroenpraat
|
fc804751a2
|
Fix for PHP Fatal error: Function name must be a string in /var/www/hubzilla/include/items.php on line 3325
Please review if this is correct?
|
2015-09-04 12:39:47 +02:00 |
|
Mario Vavti
|
ee21d87d1b
|
uexport template fixes
|
2015-09-04 09:33:34 +02:00 |
|
redmatrix
|
b1888afa10
|
fix typos before pushing
|
2015-09-03 18:47:03 -07:00 |
|
redmatrix
|
856cc7d6b8
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-03 18:45:00 -07:00 |
|
redmatrix
|
d79e81a069
|
import and sync chatrooms
|
2015-09-03 18:44:40 -07:00 |
|
redmatrix
|
f7d9523c7d
|
export chatrooms
|
2015-09-03 18:43:44 -07:00 |
|
redmatrix
|
d93e1c84ac
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
|
2015-09-03 17:28:51 -07:00 |
|