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

• bd4a88cd3e fix help link TreerandGitHub 2016-06-26 03:17:10 +10:00
• 2dc1236dca Allow absolute links to css and js files Treer 2016-06-25 22:38:15 +10:00
• 2528d97f52 Merge branch 'dev' into sabre32 Mario Vavti 2016-06-25 13:58:24 +02:00
• 241b257556 Insert image links wherever cursor is in the editor Andrew Manning 2016-06-25 06:50:24 -05:00
• 83a42afddf Merge remote-tracking branch 'upstream/dev' into wiki Andrew Manning 2016-06-25 06:30:15 -05:00
• 780f83a118 Post generation about new wiki is optional, default is NOT to post. Fixed bug in wiki creation. Added embed image dialog and album browser. Andrew Manning 2016-06-25 06:27:14 -05:00
• ec3651d216 Improvements to help pages Alexandre Hannud Abdoandredmatrix 2016-06-24 23:58:43 +00:00
• 6154fc7686 Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge redmatrix 2016-06-25 04:11:03 -07:00
• 1924459abd media (e.g. video) files weren't being detected correctly in oembed, causing the stream to try and load large videos (and failing) redmatrix 2016-06-25 04:09:07 -07:00
• f66576f366 media (e.g. video) files weren't being detected correctly in oembed, causing the stream to try and load large videos (and failing) redmatrix 2016-06-25 04:09:07 -07:00
• 7470fc7f24 Merge pull request #437 from solstag/help hubzillaandGitHub 2016-06-25 20:24:28 +10:00
• 0e041a3b64 Improvements to help pages Alexandre Hannud Abdo 2016-06-24 23:58:43 +00:00
• 0406e3a7dd Merge remote-tracking branch 'upstream/dev' into dev zottel 2016-06-25 00:59:46 +02:00
• c8ae04a96a Merge branch 'dev' into sabre32 Mario Vavti 2016-06-24 11:25:20 +02:00
• c809b6f95e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-06-24 02:18:26 -07:00
• 1577efa25e fix pdledit list mode redmatrix 2016-06-24 02:17:25 -07:00
• fb93ae2128 fix pdledit "list layouts" redmatrix 2016-06-24 02:07:12 -07:00
• 25c9e9ef93 Merge pull request #435 from dissolve/microformats2 hubzillaandGitHub 2016-06-24 14:55:56 +10:00
• 812dc9e898 add url permalink mf2 markup Ben Roberts 2016-06-24 00:45:39 -04:00
• bf4b698573 Merge pull request #434 from dissolve/microformats2 hubzillaandGitHub 2016-06-24 13:58:01 +10:00
• 5162c55e5d p-author missing from embedded h-card in items Ben Roberts 2016-06-23 23:46:02 -04:00
• 096619dbbe make dropdown-caret invoke the dropdown redmatrix 2016-06-23 20:13:20 -07:00
• fa02a09107 SuperCurl to provide a re-usable curl options stack and just change options that are different from one call to the next redmatrix 2016-06-23 20:05:57 -07:00
• 51e2ef39c2 db update for abconfig transition redmatrix 2016-06-23 18:35:01 -07:00
• b19bbf5473 change AbConfig to use channel_id instead of channel_hash; which was a mistake in retrospect redmatrix 2016-06-23 18:12:26 -07:00
• e5c66d94f2 relocate the cache class redmatrix 2016-06-23 05:18:58 -07:00
• 2a32713dfc Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-06-23 01:18:17 -07:00
• acf26d5c63 code cleanup for profile_photos redmatrix 2016-06-23 01:17:44 -07:00
• 39b14b6b81 Merge branch 'dev' into sabre32 Mario Vavti 2016-06-23 10:14:13 +02:00
• ac81a3a5ef Merge pull request #433 from dissolve/microformats2 hubzillaandGitHub 2016-06-23 14:39:26 +10:00
• ab628eb2a3 microformats 2 for posts Ben Roberts 2016-06-22 23:59:27 -04:00
• b8c5a91940 set profile when "use existing photo" redmatrix 2016-06-22 20:46:44 -07:00
• f7d2c99a3a move revision up redmatrix 2016-06-22 20:18:29 -07:00
• 32408ed6a3 missing class selector when "use photo as profile photo" redmatrix 2016-06-22 20:17:19 -07:00
• 515b054a6e missing class selector when "use photo as profile photo" redmatrix 2016-06-22 20:17:19 -07:00
• cef77ce5bb the xchan_query wasn't fully optimised as we were comparing quoted and unquoted strings when looking for duplicates redmatrix 2016-06-22 19:22:59 -07:00
• 1267d995ef db statement debugging redmatrix 2016-06-22 19:08:59 -07:00
• ec8091a102 use the normal html escape for '@' in addresses rather than the high-plane unicode variant. This makes it copy-able, but not easily scrape-able. redmatrix 2016-06-22 18:00:18 -07:00
• 5536df51f5 erge branch 'dev' into sabre32 Mario Vavti 2016-06-22 09:58:55 +02:00
• f48b12ff52 provide a skeleton of the current CalDAVClient with lots of notes about how best to move forward just in case anybody is feeling ambitious or anxious. redmatrix 2016-06-21 20:44:55 -07:00
• 415a8d1e01 channel homepage not providing content when javascript disabled redmatrix 2016-06-21 19:42:08 -07:00
• 2a840460dd vcard spec changes redmatrix 2016-06-21 19:25:14 -07:00
• 12f114c4be Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-06-21 18:26:16 -07:00
• b593c3a9b9 1. provide automatic relocation of important links in items that are imported or synced to clones 2. provide framework for custom curl request bodies using custom/non-standard request methods. This was a real nightmare because curl doesn't actually let you specify a string to send as the request body (except when doing POST). You have to treat it as a file upload using a custom file handler function which provides the actual content in chunks as if it were buffered I/O. 3. item_store and item_store_update now return the item that was stored redmatrix 2016-06-21 18:18:06 -07:00
• 8fa26db1b3 1. provide automatic relocation of important links in items that are imported or synced to clones 2. provide framework for custom curl request bodies using custom/non-standard request methods. This was a real nightmare because curl doesn't actually let you specify a string to send as the request body (except when doing POST). You have to treat it as a file upload using a custom file handler function which provides the actual content in chunks as if it were buffered I/O. redmatrix 2016-06-21 18:18:06 -07:00
• ecae0b3d97 Merge branch 'dev' into sabre32 Mario Vavti 2016-06-21 10:08:49 +02:00
• 63423c8ee1 make sure the optimisations are reliable redmatrix 2016-06-20 20:56:58 -07:00
• ed16660867 code optimisation redmatrix 2016-06-20 20:34:19 -07:00
• 9c9d6363af update attach on import if exists redmatrix 2016-06-20 19:39:12 -07:00
• 3a43b1d85d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-06-20 13:43:36 -07:00
• 76f07a7f97 Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge redmatrix 2016-06-20 13:42:51 -07:00
• 4d219df04e fix siteinfo plugin list redmatrix 2016-06-20 13:42:04 -07:00
• 01bfadaeaa fix siteinfo plugin list redmatrix 2016-06-20 13:42:04 -07:00
• 670d12219b Merge pull request #429 from anaqreon/wiki hubzillaandGitHub 2016-06-21 06:23:58 +10:00
• da2c0a22f9 Merge branch 'dev' into sabre32 Mario Vavti 2016-06-20 22:05:03 +02:00
• 953ac6f3c7 last merge from master did reset the std_version to 1.8 - set it back to 1.9 for dev Mario Vavti 2016-06-20 22:03:39 +02:00
• 545219b839 Merge branch 'dev' into sabre32 Mario Vavti 2016-06-20 21:47:49 +02:00
• 985fb44424 Merge branch 'master' into dev Mario Vavti 2016-06-20 21:46:33 +02:00
• 17c5502330 missing backslash leading to wsod on xconfig changes Mario Vavti 2016-06-20 21:45:15 +02:00
• aa88837a31 Merge branch 'dev' into wiki Andrew Manning 2016-06-20 13:28:50 -04:00
• a3ec9f3940 Add formatted heading for revision comparison viewer Andrew Manning 2016-06-20 13:27:05 -04:00
• 8cd9a1e4fc Merge remote-tracking branch 'upstream/dev' into wiki Andrew Manning 2016-06-20 13:07:29 -04:00
• f4d9d34bbc Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Andrew Manning 2016-06-20 13:06:32 -04:00
• 20b4fc9198 Do not change active page commit until user reverts the page Andrew Manning 2016-06-20 13:05:18 -04:00
• e40112b40d Merge branch 'dev' into sabre32 Mario Vavti 2016-06-20 09:31:27 +02:00
• cc09f9a7a5 Added many of the recent schema changes to the database schema documentation redmatrix 2016-06-19 22:50:41 -07:00
• 4b505948f0 update the bbcode doc redmatrix 2016-06-19 22:04:08 -07:00
• 3cf6f1f79c merge conflict redmatrix 2016-06-19 21:47:04 -07:00
• 905374c86e experimental rtl support; this will probably require a fair bit of work. redmatrix 2016-06-19 21:10:57 -07:00
• 953ca2c21e zot_revision should be string, not float 1.8 redmatrix 2016-06-19 19:15:26 -07:00
• 8b42834c3f recreate link from the merge kerfuffle redmatrix 2016-06-19 19:13:23 -07:00
• fb61c4fb34 Merge branch '1.8RC' redmatrix 2016-06-19 19:12:33 -07:00
• 30841d9470 Don't use count() to check DB results redmatrix 2016-06-19 18:57:56 -07:00
• 7a4efcf67f return something so we can make a conclusion Mario Vavti 2016-06-19 20:34:38 +02:00
• 6e0eb532a5 Merge branch 'dev' into sabre32 Mario Vavti 2016-06-19 11:04:02 +02:00
• bfaabfb7b5 hebrew hstrings.php was empty redmatrix 2016-06-18 20:25:31 -07:00
• 4578649f75 hebrew hstrings.php was empty redmatrix 2016-06-18 20:25:31 -07:00
• b6324246ff hebrew hstrings.php was empty redmatrix 2016-06-18 20:25:31 -07:00
• 53e4713932 hebrew update redmatrix 2016-06-18 20:09:52 -07:00
• 76e11b46b7 hebrew translation rootandredmatrix 2016-06-18 13:57:40 +00:00
• 3dad4a9ff1 update the top level database doc, the individual schema pages are still out of date. redmatrix 2016-06-18 19:57:44 -07:00
• 310f370b55 Merge pull request #426 from eduoda/master hubzillaandGitHub 2016-06-19 12:45:47 +10:00
• 5b92922516 When picktime is false, close date selector on date select Oda 2016-06-18 23:03:06 -03:00
• dbb0a0283f schema changes needed for the caldav client bit redmatrix 2016-06-18 15:33:47 -07:00
• 08f108e6cf Merge pull request #424 from BlaBlaNet/master hubzillaandGitHub 2016-06-19 07:31:43 +10:00
• 5c947c7519 hebrew translation root 2016-06-18 13:57:40 +00:00
• 178b440f05 Merge branch 'dev' into sabre32 Mario Vavti 2016-06-18 11:10:40 +02:00
• 755dd67ec7 changelog update for 1.8 redmatrix 2016-06-17 22:41:45 -07:00
• 99e8499722 changelog update for 1.8 redmatrix 2016-06-17 22:41:45 -07:00
• 2e7606f569 the text link to a thing will take you to the local thing page, both as a link for editing and as a destination in case there is no thing photo. If there's a photo, the photo link will take you to the thing URL. redmatrix 2016-06-17 21:44:08 -07:00
• 22edd00211 "thing" always showing default url, not that supplied by the thing. redmatrix 2016-06-17 16:28:36 -07:00
• c81f6b9f6f "thing" always showing default url, not that supplied by the thing. redmatrix 2016-06-17 16:28:36 -07:00
• d0f0a99909 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-06-17 15:02:07 -07:00
• 2793086c0d 1. string update, 2. pretty print json blobs redmatrix 2016-06-17 14:58:03 -07:00
• 80d3a831f3 Merge remote-tracking branch 'upstream/dev' into wiki Andrew Manning 2016-06-17 06:36:09 -04:00
• 961539258b Wiki page revision comparison tool with diff displayed in modal dialog. Leverages Diff class from http://code.stephenmorley.org/php/diff-implementation with license CC0 1.0 universal http://creativecommons.org/publicdomain/zero/1.0/legalcode Andrew Manning 2016-06-17 06:33:39 -04:00
• 9749bbcedc Merge branch 'dev' into sabre32 Mario Vavti 2016-06-17 11:58:14 +02:00
• aa5ac9dc3f only use height: auto for week and day view Mario Vavti 2016-06-17 11:57:36 +02:00
• 0324bc5cf0 Merge branch 'dev' into sabre32 Mario Vavti 2016-06-17 10:04:27 +02:00
• f6d7628254 core changes to better support media migrations redmatrix 2016-06-16 20:16:39 -07:00