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

• 8083a86581 Add rudimentary unit test for z_mime_content_type. ken restivo 2015-10-27 19:53:27 -07:00
• b3528c314a Support files with names like foo.0.1.3.ogg ken restivo 2015-10-27 19:48:14 -07:00
• 65587be737 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-10-27 18:37:03 -07:00
• 9c24e1ccfb revision redmatrix 2015-10-27 18:36:50 -07:00
• 0147186565 Merge pull request #101 from kenrestivo/kens-fixes redmatrix 2015-10-28 12:28:34 +11:00
• 8924cb0960 Add yml file for travis, as an experiment. ken restivo 2015-10-27 17:36:25 -07:00
• 869735e4b5 Correct mime types via https://wiki.xiph.org/MIME_Types_and_File_Extensions ken restivo 2015-10-27 15:35:39 -07:00
• 605381f83d More fine tuning bluegrid schema. Extra generic-wrapper-styled. jeroenpraat 2015-10-27 22:52:54 +01:00
• 71f70b4377 css fixes Mario Vavti 2015-10-27 12:52:21 +01:00
• c6daf4d41c first the image than the body Mario Vavti 2015-10-27 11:26:48 +01:00
• 3f1dc22c0e fix sharing of photo items Mario Vavti 2015-10-27 11:07:40 +01:00
• 02527552fd Better -styled. jeroenpraat 2015-10-27 01:23:30 +01:00
• ac5b9f2382 Another .generic-content-wrapper jeroenpraat 2015-10-27 01:20:48 +01:00
• a2931cd17d Merge branch 'master' of https://github.com/redmatrix/hubzilla jeroenpraat 2015-10-27 01:12:09 +01:00
• fc65496d1d NEW: Redbasic schema, based on the Hubzilla project page layout. jeroenpraat 2015-10-27 01:11:50 +01:00
• be98466b0d Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-10-26 17:00:09 -07:00
• 0fd60d1e80 version redmatrix 2015-10-26 16:59:52 -07:00
• 35857931ef 2 more tpl files with generic-content-wrapper-styled jeroenpraat 2015-10-26 22:47:47 +01:00
• a4c3058f84 Merge pull request #7 from redmatrix/master mrjive 2015-10-26 21:55:47 +01:00
• 6cb7afcbc0 es+nl strings jeroenpraat 2015-10-26 16:35:44 +01:00
• 32a0f5b04a Merge branch 'master' of https://github.com/redmatrix/hubzilla jeroenpraat 2015-10-26 15:28:11 +01:00
• 3bc6190bdd Update Dark schema jeroenpraat 2015-10-26 15:27:47 +01:00
• 4fb9571136 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2015-10-26 14:20:06 +01:00
• e70bb371d9 bring back item transparency Mario Vavti 2015-10-26 14:19:46 +01:00
• 2099ac0615 Revert this one. This was hub specific. jeroenpraat 2015-10-26 14:16:05 +01:00
• 5e28b1216e Added a few generic-content-wrapper-styled classes and a button position fixed for lostpass. mod/search probably needs a .tpl in the future, but I don't know how to that. jeroenpraat 2015-10-26 14:05:45 +01:00
• e858ee811b Fixed connection page. Page was overcrowded on systems with larger fonts. jeroenpraat 2015-10-26 13:57:12 +01:00
• a498fc8e72 looks like there may be issues with the datetime picker if the local timezone isn't the same as your settings. redmatrix 2015-10-25 21:17:02 -07:00
• 7063b6cb6d Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-10-25 16:54:43 -07:00
• 917d0ced4a new feature: delayed posting redmatrix 2015-10-25 16:54:18 -07:00
• 969418ce73 Merge pull request #99 from HaakonME/master redmatrix 2015-10-26 09:40:54 +11:00
• 7f3df847a2 make use of http_host vs. server_name configurable in script_path() redmatrix 2015-10-25 15:37:09 -07:00
• e0424fe6cc Merge pull request #100 from StefanKrauth/master redmatrix 2015-10-26 09:32:03 +11:00
• b67397861c Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-10-25 14:33:57 -07:00
• de15a2ace1 version update redmatrix 2015-10-25 14:32:02 -07:00
• 4369ee2ca7 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-10-25 14:26:35 -07:00
• a1163b70a6 version and strings redmatrix 2015-10-25 14:26:02 -07:00
• 2030aea175 Better handling for SSL reverse proxy Stefan Krauth 2015-10-25 20:10:35 +01:00
• 969b66b315 Hubzilla on OpenShift - now with plugins and extra themes Haakon Meland Eriksen 2015-10-25 18:18:49 +01:00
• 4442da306a hubzilla compatibility: improve photo item object - we now provide the infos for all available photo sizes Mario Vavti 2015-10-25 18:02:45 +01:00
• 911fd6c654 improve photo item object - we now provide the infos for all available photo sizes Mario Vavti 2015-10-25 18:01:44 +01:00
• 9cee3dda1f Add DeadSuperHero Themes for Hubzilla to deploy Haakon Meland Eriksen 2015-10-25 17:56:32 +01:00
• cc0f026cec Adding Hubzilla addons to deploy script Haakon Meland Eriksen 2015-10-25 17:07:33 +01:00
• f1b5c333ff Adding Hubzilla addons to deploy script Haakon Meland Eriksen 2015-10-25 17:01:13 +01:00
• 123fe58c26 new line between photo and description Mario Vavti 2015-10-24 22:16:08 +02:00
• fd1e163bf4 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2015-10-24 21:44:45 +02:00
• ab8b4d5c36 another try to avoid dubble photo deletion. allow to set a photo caption and simple status body (if create status post is enabled) on upload Mario Vavti 2015-10-24 21:44:25 +02:00
• 4a044351a9 Merge pull request #97 from wave72/master Wave 2015-10-24 12:15:15 +02:00
• e0a2268b0e Italian strings updated wave72 2015-10-24 12:13:17 +02:00
• 3432771150 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-10-23 21:36:40 -07:00
• 768615f2f1 version and strings redmatrix 2015-10-23 21:36:18 -07:00
• 9ae215291f fix app.tpl missing </div> tag if not authenticated Mario Vavti 2015-10-23 10:20:01 +02:00
• 1cf206d764 update the to-do list redmatrix 2015-10-22 17:27:20 -07:00
• 4c406ec9c0 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-10-22 17:20:52 -07:00
• 500b896d50 revision redmatrix 2015-10-22 17:20:35 -07:00
• 18a239e808 Merge pull request #96 from mcnesium/master git-marijus 2015-10-22 13:54:52 +02:00
• 5aa07bda7c Merge pull request #1 from mcnesium/placeholder-font mcnesium 2015-10-22 13:45:34 +02:00
• 379fd33484 fix placeholder font-family mcnesium 2015-10-22 13:44:33 +02:00
• ed6629002f photo object fixes Mario Vavti 2015-10-22 13:01:33 +02:00
• bcb4ac7aae experiment: put the photo-item photo on top of the post Mario Vavti 2015-10-22 12:58:11 +02:00
• 5395b173aa implement the new anchor target behaviour Mario Vavti 2015-10-22 12:09:19 +02:00
• 735f9c7a45 define $photo Mario Vavti 2015-10-22 11:37:34 +02:00
• 9cbca24f7a photo object compatibility revamped Mario Vavti 2015-10-22 10:56:24 +02:00
• 6f8d29ad80 move photo object stuff from itemObject to prepare_body() so we can do more stuff with it Mario Vavti 2015-10-22 10:52:10 +02:00
• eb947acebe set link target window for many links that are included in posts, but not in rest of application redmatrix 2015-10-21 18:34:09 -07:00
• 01e84edd0a Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-10-21 15:02:32 -07:00
• b7538b6ada turn relative links in app_render() into absolute links, without affecting the install. redmatrix 2015-10-21 15:00:41 -07:00
• 232742a5e6 warn if quota exceeds 90% of storage limit Mario Vavti 2015-10-21 12:52:03 +02:00
• a33ddf373b move file storage quota display to upload section. add a warning if remaining space is less than 100MB and fix % calculation Mario Vavti 2015-10-21 12:40:09 +02:00
• b57e735199 old merge conflict redmatrix 2015-10-20 21:34:58 -07:00
• 38816d7e41 move quota display to where it's visible on a tablet redmatrix 2015-10-20 18:48:14 -07:00
• 3a89bb0db2 fix image path jeroenpraat 2015-10-20 17:25:44 +02:00
• 865c38995d some photos cant be deleted under certain circumstances - needs more investigation. revert this until a better fix is found. Mario Vavti 2015-10-20 13:43:35 +02:00
• beae28f2db add obj_type and object again Mario Vavti 2015-10-20 13:19:05 +02:00
• 81b2c5ac68 fix jot photo upload Mario Vavti 2015-10-20 13:03:28 +02:00
• 35b5f60f99 update large photo feature setting description Mario Vavti 2015-10-20 09:58:48 +02:00
• 13d0db5f9a css cleanup Mario Vavti 2015-10-20 09:47:30 +02:00
• 96f23758b4 hubzilla photo object compatibility Mario Vavti 2015-10-20 09:40:32 +02:00
• f7601756e9 create photo object if feature large photos is enabled and display those slightly different Mario Vavti 2015-10-20 09:36:15 +02:00
• 54059b2f15 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-10-19 20:36:22 -07:00
• f00887ea42 add project info to pubsite list redmatrix 2015-10-19 20:35:44 -07:00
• 08a5884c9f revert - we can't guarantee what project name the fallback directory server has and this could cause bugs later redmatrix 2015-10-19 17:03:34 -07:00
• 0f3b7dd6e9 update site on initial directory setup redmatrix 2015-10-19 17:01:59 -07:00
• bab73edcef extened the earlier fix redmatrix 2015-10-19 16:50:53 -07:00
• 42d26f01d6 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-10-19 16:20:20 -07:00
• 8aadc2837c typo redmatrix 2015-10-19 16:19:00 -07:00
• ea37882b95 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-10-19 16:18:04 -07:00
• 599a0c66b2 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-10-19 16:07:59 -07:00
• 57e0bfc5a9 add the project name to site info packet redmatrix 2015-10-19 16:07:14 -07:00
• 9f424bb208 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-10-19 14:56:02 -07:00
• 4e5b813aa8 syntax error redmatrix 2015-10-19 14:55:49 -07:00
• 6a2c32bd23 Merge pull request #93 from tuscanhobbit/master redmatrix 2015-10-20 06:54:56 +11:00
• febcb90ece fix typo in mod/connedit.php Mario Vavti 2015-10-19 15:33:19 +02:00
• 4b300f8274 fix typo in include/notifier.php Mario Vavti 2015-10-19 14:53:13 +02:00
• 8da8e02dc8 Replaced some old redmatrix branding Paolo Tacconi 2015-10-19 10:51:33 +02:00
• 3e9b6a330d Merge pull request #1 from redmatrix/master Wave 2015-10-19 10:28:17 +02:00
• b54c4df74d Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-10-18 20:17:09 -07:00
• f0a33c00bc separate permission_update notification into permission_create and permission_update, since some networks send out a notification for duplicate share requests even if connected. redmatrix 2015-10-18 20:13:12 -07:00
• 8631b28130 Merge pull request #92 from HaakonME/master redmatrix 2015-10-19 10:36:01 +11:00
• 9b3662e5ad issues with "the Register" feed redmatrix 2015-10-18 16:29:09 -07:00