Commit Graph

Select branches

Hide Pull Requests

3.6RC

CAPTHA

develop

japanese

master

origin

0.10

0.11

0.8

0.9

1.0

1.1

1.10

1.12

1.14

1.14.2

1.2

1.3

1.3.1

1.4

1.6

1.8

2.0

2.2

2.4

2.4.2

2.6

2.6.1

2.6.2

2.6.3

2.8

2.8.1

3.0

3.0.1

3.2

3.2.1

3.2.2

3.4

3.4.1

3.4.2

3.6

3.6.1

Mono Color

• e1338f5a7f make redmatrix focus scheme default for hubzilla Mario Vavti 2015-09-10 22:19:51 +02:00
• 672143d3a2 update Spanish strings jeroenpraat 2015-09-10 13:18:24 +02:00
• 2d94a038a5 ensure connections have a name redmatrix 2015-09-10 01:21:18 -07:00
• 174d55cf3d Merge remote-tracking branch 'upstream/master' zottel 2015-09-10 08:32:33 +02:00
• f2889d24e6 decentralise likes of things so they can be cloned redmatrix 2015-09-09 22:03:23 -07:00
• db58b62235 don't auto-open the editor in forum mode. Save the forum selection text until we open it. redmatrix 2015-09-09 19:54:16 -07:00
• f3b560b453 fix the lock state when using forum mode redmatrix 2015-09-09 18:57:06 -07:00
• 43e064749c major changes to "forum mode" on the network/matrix page redmatrix 2015-09-09 18:50:15 -07:00
• 4af339da63 slight hack to improve public forum detection in the forum widget redmatrix 2015-09-09 18:18:27 -07:00
• 4cd6e7ec91 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-09-09 17:00:02 -07:00
• 197b5de9da update bug reporting doco redmatrix 2015-09-09 16:59:26 -07:00
• cdfddc0fc5 Merge pull request #37 from MicMee/master redmatrix 2015-09-10 06:26:07 +10:00
• f4d3ec908d typo Michael Meer 2015-09-09 17:08:53 +02:00
• 918aaa64e2 profile photo issues #36 redmatrix 2015-09-09 03:40:53 -07:00
• 2417396a93 Merge remote-tracking branch 'upstream/master' zottel 2015-09-09 09:53:51 +02:00
• 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. redmatrix 2015-09-08 22:46:34 -07:00
• d702133ded move mod_admin to Comanche finally redmatrix 2015-09-08 20:48:35 -07:00
• 2aaee311f3 differentiate Community Server from Enterprise Server redmatrix 2015-09-08 19:57:07 -07:00
• e8d431c2f6 issues with "use this photo for profile photo" #36 redmatrix 2015-09-08 19:51:52 -07:00
• 0f4c012321 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-08 19:16:07 -07:00
• f13a8f725c export TERM_FILE when mirroring redmatrix 2015-09-08 19:14:29 -07:00
• e6690c818d export TERM_FILE when mirroring redmatrix 2015-09-08 19:13:43 -07:00
• 5d32aa94d9 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-08 18:46:15 -07:00
• d413b6eba8 merge conflicts redmatrix 2015-09-08 18:45:58 -07:00
• f0847e6f32 debugging menu sync redmatrix 2015-09-08 18:40:56 -07:00
• 50d7554ccd add sync packets for menus redmatrix 2015-09-08 18:40:19 -07:00
• b28d3015fe Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-08 17:53:43 -07:00
• 75d521d42a menu import and sync redmatrix 2015-09-08 17:51:48 -07:00
• 1ebaacfd5e menu export redmatrix 2015-09-08 17:50:24 -07:00
• 52cd8652bb Merge remote-tracking branch 'upstream/master' zottel 2015-09-08 08:39:37 +02:00
• c6bdf7e891 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-07 22:55:42 -07:00
• 11e19a06b7 export events redmatrix 2015-09-07 22:54:43 -07:00
• 880ca35681 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-07 21:02:05 -07:00
• 650e98b2a9 work on event sync redmatrix 2015-09-07 21:01:49 -07:00
• f84946c135 minor fix to event sync redmatrix 2015-09-07 21:00:54 -07:00
• 508969a183 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-07 20:29:13 -07:00
• c39e3613a8 create event sync packets redmatrix 2015-09-07 20:28:02 -07:00
• 4eec9a2fba Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-07 18:20:47 -07:00
• 6d1b64065a consolidate import_items/sync_items redmatrix 2015-09-07 18:14:30 -07:00
• 5751437c93 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-07 18:13:17 -07:00
• 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. redmatrix 2015-09-07 18:11:30 -07:00
• 6711ceb662 fix postgres zotfeed Habeas Codice 2015-09-07 16:28:42 -07:00
• dc7677f5fa Merge pull request #391 from tuscanhobbit/master Wave 2015-09-07 17:29:13 +02:00
• 78fb6f55ed Updated Italian strings Paolo Tacconi 2015-09-07 17:24:43 +02:00
• c5981cbc9a Merge remote-tracking branch 'upstream/master' zottel 2015-09-07 13:18:55 +02:00
• 2f52b6c164 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-07 04:06:27 -07:00
• 5d59462e49 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-07 04:04:15 -07:00
• 1b09c64856 PRIVACY: item_private seems to have been removed from permissions_sql checking with an observer. redmatrix 2015-09-07 03:59:38 -07:00
• 24b90b475b Merge remote-tracking branch 'upstream/master' zottel 2015-09-07 08:51:34 +02:00
• 2312f03eac Always open rpost editor on document ready redmatrix 2015-09-06 20:50:31 -07:00
• 1d09e4b620 use conversation defaults for /public page instead of collapsed list mode, but allow over-ride redmatrix 2015-09-06 16:42:50 -07:00
• 6ea1cf71b5 Update dav_windows.bb jeroenpraat 2015-09-06 23:36:26 +02:00
• 302fe94705 Update dav_nemo.bb jeroenpraat 2015-09-06 23:35:35 +02:00
• 38ea8d1d86 Update dav_mount.bb jeroenpraat 2015-09-06 23:32:14 +02:00
• 67ed7e40be Update dav_mount.bb jeroenpraat 2015-09-06 23:30:25 +02:00
• 20f211b70a Update dav_dolphin.bb jeroenpraat 2015-09-06 23:27:55 +02:00
• ebb07def7e Update dav_nautilus.bb jeroenpraat 2015-09-06 23:26:28 +02:00
• 55ab968edf make js_upload work with hubzilla. It still needs a rewrite. redmatrix 2015-09-05 17:35:00 -07:00
• 3f6d6745de syntax redmatrix 2015-09-05 15:33:09 -07:00
• d1daae1b59 Merge pull request #26 from anaqreon/logo-in-readme redmatrix 2015-09-05 07:18:42 +10:00
• 350ea2bf28 Merge pull request #35 from redmatrix/jeroenpraat-patch-1 redmatrix 2015-09-05 07:18:01 +10:00
• 2f73d24ab1 Removed old poller Haakon Meland Eriksen 2015-09-04 21:42:27 +02:00
• 1a05696a84 Updating OpenShift deploy script Haakon Meland Eriksen 2015-09-04 20:05:15 +02:00
• fc804751a2 Fix for PHP Fatal error: Function name must be a string in /var/www/hubzilla/include/items.php on line 3325 jeroenpraat 2015-09-04 12:39:47 +02:00
• 938ef930d4 Merge remote-tracking branch 'upstream/master' zottel 2015-09-04 12:24:52 +02:00
• ee21d87d1b uexport template fixes Mario Vavti 2015-09-04 09:33:34 +02:00
• b1888afa10 fix typos before pushing 0.9 redmatrix 2015-09-03 18:47:03 -07:00
• 856cc7d6b8 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-03 18:45:00 -07:00
• d79e81a069 import and sync chatrooms redmatrix 2015-09-03 18:44:40 -07:00
• f7d9523c7d export chatrooms redmatrix 2015-09-03 18:43:44 -07:00
• d93e1c84ac Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-03 17:28:51 -07:00
• 2a7ff3018b channel export - don't include linked resource items (photos, events). These items will need to be provided with those objects so that they can be re-linked. redmatrix 2015-09-03 17:21:20 -07:00
• c83da012ff profile import error #34 redmatrix 2015-09-03 16:19:59 -07:00
• 46e9c4299e Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-03 15:48:52 -07:00
• e1af81ea55 in this case no results is not an error redmatrix 2015-09-03 15:48:01 -07:00
• 99848ab3bb Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-03 13:11:25 -07:00
• 90d48d60d8 revision update redmatrix 2015-09-03 13:10:03 -07:00
• 48c0efd20e Merge pull request #390 from zzottel/master redmatrix 2015-09-04 06:09:26 +10:00
• adfc748bfa Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-09-03 18:12:02 +02:00
• 5cef672f9a fix update 1148 zottel 2015-09-03 13:55:47 +02:00
• 015c7243b9 Merge remote-tracking branch 'upstream/master' zottel 2015-09-03 12:51:08 +02:00
• d1480d9f56 bug reporting doc redmatrix 2015-09-03 01:55:07 -07:00
• f3cb17ac3b app sync redmatrix 2015-09-02 23:09:51 -07:00
• fb2d2c5585 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-02 21:59:44 -07:00
• 945ba5d788 more adjustment to apps containers redmatrix 2015-09-02 21:46:19 -07:00
• 3e7edf504d sort out some app display weirdness redmatrix 2015-09-02 21:35:49 -07:00
• 3285c71995 increase height of app-container so edit controls aren't shadowed redmatrix 2015-09-02 21:17:23 -07:00
• 669e111118 add timestamps for syncing apps redmatrix 2015-09-02 21:07:24 -07:00
• 360fda15e9 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-02 20:54:00 -07:00
• 2018b88093 dummy update redmatrix 2015-09-02 20:53:26 -07:00
• 837b9224cc Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-02 20:33:58 -07:00
• c22da3da1c start to modularise the clone import and sync functions redmatrix 2015-09-02 20:12:40 -07:00
• 470915a55b sync "things" (obj elements) redmatrix 2015-09-02 20:07:15 -07:00
• d9a67d64b1 Update the credits redmatrix 2015-09-02 18:04:22 -07:00
• 2a26c898ca protect from sql injection redmatrix 2015-09-02 15:52:54 -07:00
• 69fc10d5ad Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-02 15:49:50 -07:00
• 3647b74d33 Merge pull request #389 from zzottel/master redmatrix 2015-09-03 06:12:54 +10:00
• 441946b9d3 really fix post filtering zottel 2015-09-02 15:49:07 +02:00
• d376d2a590 really fix post filtering zottel 2015-09-02 15:46:31 +02:00
• 9328edfdcd obscure mail subject in conversation structure redmatrix 2015-09-01 22:59:06 -07:00