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

• f40406514c Update hmessages.po kostikovandMario 2018-07-20 10:24:23 +02:00
• a68934f498 Merge branch 'patch-2' into 'dev' Mario 2018-07-21 11:29:09 +02:00
• 95ef78ab23 Merge branch 'patch-1' into 'dev' Mario 2018-07-21 11:27:49 +02:00
• 5be0743751 Merge branch 'dev' into 'dev' Mario 2018-07-21 11:26:43 +02:00
• 8fc7f2aca1 Update update_fail_eml.tpl kostikov 2018-07-20 19:28:45 +02:00
• 4db4ab9798 Create register_verify_member.tpl kostikov 2018-07-20 19:28:13 +02:00
• b6c2c8117e Update register_verify_eml.tpl kostikov 2018-07-20 19:27:29 +02:00
• 86a42aad16 Update register_open_eml.tpl kostikov 2018-07-20 19:26:54 +02:00
• 8e2e09bb16 Update passchanged_eml.tpl kostikov 2018-07-20 19:26:24 +02:00
• 3713aa210f Update lostpass_eml.tpl kostikov 2018-07-20 19:25:46 +02:00
• a65c23546b Add new file kostikov 2018-07-20 19:21:58 +02:00
• ed79bef51b prevent double file uploads when dropping files into jot Mario Vavti 2018-07-20 16:44:43 +02:00
• f6de91bf0f prevent double file uploads when dropping files into jot Mario Vavti 2018-07-20 16:44:43 +02:00
• 062633d312 Add var to respect current hstrings.php format kostikov 2018-07-20 16:40:35 +02:00
• 0cde7f9897 fix jot drag and drop Mario Vavti 2018-07-20 10:42:16 +02:00
• 4a54699c1f Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario Vavti 2018-07-20 10:42:45 +02:00
• c72f6e6ea8 fix jot drag and drop Mario Vavti 2018-07-20 10:42:16 +02:00
• 790a9155d4 Update hstrings.php kostikov 2018-07-20 10:25:03 +02:00
• f141b845fd Update hmessages.po kostikov 2018-07-20 10:24:23 +02:00
• a274c87cb3 Merge branch 'dev' into 'dev' Mario 2018-07-20 09:21:35 +02:00
• 85e21ce617 checkjs fix ($page not bin-hex in all cases) zotlabsandMario 2018-07-19 17:19:19 -07:00
• 157a9e895c fix the filtered query string so it can potentially be re-used as is. zotlabsandMario 2018-07-19 13:42:57 -07:00
• a94c9d2709 checkjs fix ($page not bin-hex in all cases) zotlabs 2018-07-19 17:19:19 -07:00
• f9b18aa62f Update php2po.php kostikov 2018-07-20 00:22:04 +02:00
• 0866cea72c Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge zotlabs 2018-07-19 13:45:30 -07:00
• 6adbb93f0a fix the filtered query string so it can potentially be re-used as is. zotlabs 2018-07-19 13:42:57 -07:00
• 7e2635adfe RC1 Mario Vavti 2018-07-19 12:27:43 +02:00
• b655d04b34 version 3.4.2 3.4.2 Mario 2018-07-19 11:57:35 +02:00
• 7f84933cab compatibility fix for future versions Mario 2018-07-19 11:52:12 +02:00
• 36220fdde8 typo zotlabsandMario 2018-07-18 17:51:10 -07:00
• 67848c03ed query filter was a bit greedy zotlabsandMario 2018-07-18 17:48:23 -07:00
• 685d05f98b Merge branch 'cherry-pick-5ce50d0a' into '3.6RC' Mario 2018-07-19 09:20:45 +02:00
• 931afe98b1 mangled urls on redirects zotlabsandMario 2018-07-18 17:05:38 -07:00
• fe0e00f8f8 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-07-19 09:12:33 +02:00
• 13d19d42cb Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge zotlabs 2018-07-18 19:14:21 -07:00
• ec852b0c8d typo zotlabs 2018-07-18 17:51:10 -07:00
• a05c8ff66b query filter was a bit greedy zotlabs 2018-07-18 17:48:23 -07:00
• 5ce50d0a2e mangled urls on redirects zotlabs 2018-07-18 17:05:38 -07:00
• dfbdeafa39 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-07-18 20:59:45 +02:00
• 4a6f775334 set the correct album name when moving photos Mario Vavti 2018-07-18 13:18:37 +02:00
• 5fa3e10701 set the correct album name when moving photos Mario Vavti 2018-07-18 13:18:37 +02:00
• eb322e8312 set the correct album name when moving photos Mario Vavti 2018-07-18 13:18:37 +02:00
• c2e819771f version 3.7 Mario Vavti 2018-07-18 11:56:26 +02:00
• 896d29d0c0 update composer autoload cache Mario Vavti 2018-07-18 11:52:42 +02:00
• 4c633a9fb8 update strings Mario Vavti 2018-07-18 11:49:32 +02:00
• 5fd1674d50 version 3.6RC Mario Vavti 2018-07-18 11:39:22 +02:00
• 67cbeaa3d4 Update hmessages.po kostikovandMario 2018-07-18 00:28:04 +02:00
• 23f3d554b8 Fix wrong plural function logic kostikovandMario 2018-07-17 21:27:08 +02:00
• 95355ddec0 Merge branch 'patch-1' into 'master' Mario 2018-07-18 08:27:21 +02:00
• cbab7d2150 Update hmessages.po kostikov 2018-07-18 00:28:04 +02:00
• 4284088611 Fix wrong plural function logic kostikov 2018-07-17 21:27:08 +02:00
• 744d548380 util/typo - perform php -l and then include the file. We'll catch a bunch more stuff. zotlabs 2018-07-17 05:01:22 -07:00
• 82a4bbd571 spellcheck zotlabs 2018-07-15 23:32:09 -07:00
• c187461985 update_addon_repo: scan the addon dir after updating and remove dead symlinks (which represent deprecated/removed addons). zotlabs 2018-07-15 21:34:06 -07:00
• cc91db55b7 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge zotlabs 2018-07-15 18:43:41 -07:00
• bb70223509 when calling timeago() from mod_mail.js it is called before the translations are applied - move the call to main.js and be more specific with the selector to not trigger calls for other modules (eg network) which is handled elsewhere to not be to much of an performance hog (to many dates at a time) Mario Vavti 2018-07-13 11:00:37 +02:00
• 98fb2ec639 let timeago render the date Mario Vavti 2018-07-13 10:16:07 +02:00
• a8cef79b1a let timeago render the date Mario Vavti 2018-07-13 10:13:11 +02:00
• 5076e38c1c update jquery.timeago lib Mario Vavti 2018-07-13 10:12:11 +02:00
• e000d98cc5 Merge branch 'hookableCSP-mr' into 'dev' Mario 2018-07-13 09:34:48 +02:00
• 38cc88c861 Hookable csp mr M. DentandMario 2018-07-13 09:34:48 +02:00
• d71e70bedf functions to support module and widget registration by plugins. These have identical construction to core modules and widgets and are registered just like hooks during addon load. Also additional Apps functions addon_app_installed() and system_app_installed() which will eventually replace feature_installed() for features which are converted to apps. The convention being used is that the module associated with the app calls the appropriate *_app_installed() function and if not present emits descriptive text about the app and exits. This allows one to click on an 'available' app and learn about it. Once installed, the app module behaves normally and may offer functionality or what once were addon settings on the settings/featured page. Refer to zap-addons in the zap repository for examples of how this is being used to eliminate the 'additional features' and 'addon settings' pages. zotlabs 2018-07-12 16:23:32 -07:00
• 48e74035f2 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-07-12 09:16:52 +02:00
• 38bccecc04 fix to cart behaviour zotlabs 2018-07-11 18:00:47 -07:00
• 3ebe35f7f7 Merge branch 'patch-1' into 'dev' Andrew Manning 2018-07-10 01:36:14 +02:00
• b81f1111d1 Update hstrings.php - spelling - Privatsphäre Heiko Förster 2018-07-08 16:48:37 +02:00
• ac8db6479e fix css regression Mario Vavti 2018-07-07 08:14:11 +02:00
• d903772831 this is messing with names containing a comma and is superfluous now Mario Vavti 2018-07-06 08:44:25 +02:00
• cc71e507cb don't provide manage apps button when viewing all available zotlabs 2018-07-05 22:03:41 -07:00
• fe44ebee93 change to import system apps at most once a day per person zotlabs 2018-07-05 21:55:03 -07:00
• c80e009cf3 app store fixes zotlabs 2018-07-05 21:46:34 -07:00
• f6e8ce5516 appstore changes zotlabs 2018-07-04 23:20:35 -07:00
• f808a2b5a1 issue syncing pageflags zotlabs 2018-07-04 19:51:16 -07:00
• 51a2e64a89 issue syncing pageflags zotlabs 2018-07-04 19:51:16 -07:00
• bf24a106ce Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2018-07-04 19:07:52 -07:00
• 1387b88ba4 remove manage group link from activity_filter, already in personal menu zotlabs 2018-07-04 19:04:12 -07:00
• d9ece80fda order nouveau by created instead of received since ordering by received returns unexpected results once old expired items get re-imported Mario Vavti 2018-07-04 10:55:38 +02:00
• b88a9c2627 Revert "add the missing link to manage privacy groups" Mario Vavti 2018-07-04 10:53:07 +02:00
• 18dbc490fe remove broken include path hack zotlabs 2018-07-03 18:26:34 -07:00
• d753492382 bad merge zotlabs 2018-07-01 22:48:05 -07:00
• 8c26db63dd some changes to support plume zotlabs 2018-07-01 19:12:45 -07:00
• 5d7d30f789 propagate expired posts to other networks zotlabs 2018-06-30 23:57:25 -07:00
• 63a3f5149a be very precise about what a url looks like zotlabs 2018-06-30 15:47:06 -07:00
• c28e27357a add the missing link to manage privacy groups zotlabs 2018-06-28 23:17:50 -07:00
• fa6e5e4d75 plugins -> addons zotlabs 2018-06-28 16:43:22 -07:00
• cae0a26ac0 String change to reflect the current forum tagging method zotlabs 2018-06-28 13:38:15 -07:00
• 156010050c imagick converter: -thumbnail doesn't preserve exif, -resize does zotlabs 2018-06-26 17:19:32 -07:00
• 524551a05c do not include system channels in directory results zotlabs 2018-06-25 23:20:02 -07:00
• b89387d608 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge zotlabs 2018-06-25 20:58:23 -07:00
• cef1c09db6 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-06-25 23:49:11 +02:00
• 712759ea4b disable log noise until it is needed zotlabs 2018-06-25 13:42:21 -07:00
• 66fc12c928 crc32 is potentially reversible zotlabs 2018-06-25 13:33:23 -07:00
• f66fb8e2a8 SECURITY: logging: hash the session_id in case somebody posts log snippets from active sessions; also provide a hashed process_id if using a daemon process (with no session) for easier tracking of related log events zotlabs 2018-06-25 13:20:12 -07:00
• bb786b1f61 version Mario Vavti 2018-06-25 14:30:52 +02:00
• 62610b5ec0 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario Vavti 2018-06-25 14:29:32 +02:00
• 2594178158 updates justified gallery lib to version 3.7 and minor fixes for full template Mario Vavti 2018-06-25 14:29:07 +02:00
• 4866ed5283 remove the white-space pre-wrap property on code blocks. This should probably be done with the word-break property instead zotlabs 2018-06-24 21:56:58 -07:00
• 86e93664d0 remote_self wasn't working correctly zotlabs 2018-06-24 16:56:23 -07:00
• 07f0043428 Merge branch 'dev' into 'dev' Mike Macgirvin 2018-06-20 07:50:06 +02:00
• e4f15c078a Merge branch 'patch-1' into 'dev' Mike Macgirvin 2018-06-20 07:49:43 +02:00