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

• 051759580d namespace error zotlabs 2017-03-16 01:16:29 -07:00
• fb3f63bf59 input filter issue zotlabs 2017-03-15 21:49:27 -07:00
• f6b643e84e widgets cont. zotlabs 2017-03-15 21:26:28 -07:00
• 16d750d1f6 widgets cont. zotlabs 2017-03-15 20:56:12 -07:00
• dfd626548f more widget migrations zotlabs 2017-03-15 20:11:28 -07:00
• 92d7c32f61 more widgets zotlabs 2017-03-15 19:30:57 -07:00
• 0ee48f6a58 filename issue zotlabs 2017-03-15 19:13:16 -07:00
• 664c762b35 more widgets zotlabs 2017-03-15 18:48:27 -07:00
• 9cb9608209 convert more widgets to classes zotlabs 2017-03-15 18:31:34 -07:00
• b20062efa6 Merge branch 'red' of https://github.com/zotlabs/hubzilla into red zotlabs 2017-03-15 17:44:21 -07:00
• 8d4744d115 new composer.lock for red zotlabs 2017-03-16 11:42:06 +11:00
• 14f16a7ef0 use absolute namespace zotlabs 2017-03-15 17:05:16 -07:00
• df6c07aaad Comanche: allow widgets to be class based and stored appropriately in Zotlabs zotlabs 2017-03-15 16:55:47 -07:00
• c95e9b9ba5 could not fix the merge conflicts in composer.lock so it will need to be regenerated in the red tree. also the autoload_classmap is a disgrace. We provide autoload functions so that we can dynamically change the file tree without needing to regenerate a bunch of runtime stuff every time we add a file. Merge branch 'dev' into red zotlabs 2017-03-15 16:09:08 -07:00
• 472a824a1e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-03-15 16:02:45 -07:00
• 16df1c1ad4 Merge pull request #569 from dawnbreak/QA_testing zotlabsandGitHub 2017-03-16 10:02:17 +11:00
• e1fe637dcd Merge branch 'dev' into red zotlabs 2017-03-15 15:57:37 -07:00
• 2dce86d38e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-03-15 15:55:33 -07:00
• bcd02edd80 ensure z_input_filter is called exactly once, since we now depend on the number of htmlspecialchars operations for markdown content. Also ensure that the content is escaped the correct number of times on imported items. zotlabs 2017-03-15 15:53:03 -07:00
• a73ea134cd re-add spaces between tags Mario Vavti 2017-03-15 21:22:16 +01:00
• e7a5aa7b9c js fixes Mario Vavti 2017-03-15 17:28:00 +01:00
• aa33cacb62 style hashtags, mentions and categories. hide expand-aside button if not needed. css and class fixes Mario Vavti 2017-03-15 16:42:55 +01:00
• 0c74c79b18 Merge branch 'dev' into bs4 Mario Vavti 2017-03-15 12:42:18 +01:00
• 0c973cc9fa various fixes Mario Vavti 2017-03-15 12:41:37 +01:00
• 62c921815f better handling of mimetype security Mario Vavti 2017-03-15 12:38:33 +01:00
• 211cda540d better handling of mimetype security Mario Vavti 2017-03-15 12:38:33 +01:00
• 6078d02c3a more work related to attach/photo and os_path, display_path and general code cleanup zotlabs 2017-03-15 01:20:21 -07:00
• fa89b8f66d add os_path and display_path to photos, fix some issues with multiple path separators after cloud/nickname in the content field of attach and photos zotlabs 2017-03-14 22:02:28 -07:00
• e399de8ad4 store os_path and display_path with files zotlabs 2017-03-14 21:40:11 -07:00
• 32a9487ff9 use dim for the button border also zotlabs 2017-03-14 18:46:50 -07:00
• e891380ed5 dim class was un-themed zotlabs 2017-03-14 18:42:51 -07:00
• 2c73b457ef input filter updates zotlabs 2017-03-14 17:07:29 -07:00
• 2f5f1a4d64 fix group by item query zotlabs 2017-03-14 16:14:05 -07:00
• 5c080ca4e8 👷 Add Travis' GitHub deployment steps. Klaus Weidenbach 2017-03-10 01:01:35 +01:00
• 4a85726e55 👷 ⬆️ ➕ Update PHPUnit to current stable 6. Klaus Weidenbach 2017-02-05 01:38:12 +01:00
• cb2eee1d2e 👷 Add old MySQL 5.5 to Travis CI again. Klaus Weidenbach 2017-01-27 21:56:21 +01:00
• 8e80500ee6 👷 use PHP7.1 and add PostgreSQL9.6 Klaus Weidenbach 2016-12-05 20:23:59 +01:00
• 03db9833e8 💚 Update Travis CI's Doxygen. Klaus Weidenbach 2016-11-06 21:31:02 +01:00
• 33153b8f3a [FEATURE] 👷 Extend Travis CI integration. Klaus Weidenbach 2016-10-22 22:43:25 +02:00
• 3b2398ed01 css fixes Mario Vavti 2017-03-14 18:59:27 +01:00
• a0a376e95e hide nav search behind a button, css fixes and cleanup Mario Vavti 2017-03-14 18:31:19 +01:00
• 7b9df1d401 css fixes Mario Vavti 2017-03-14 14:12:44 +01:00
• 1244b0e36a class MarkdownSoap to safely store markdown by purifying and preserving (escaped) what may be unsafe code in codeblocks. The stored item needs to be unescaped just prior to calling the markdown-to-html processor zotlabs 2017-03-14 00:23:44 -07:00
• ab58c95d27 get rid of some cruft in boot.php zotlabs 2017-03-14 00:22:57 -07:00
• a153368814 make redbasic compatible with red 5.x zotlabs 2017-03-13 18:58:23 -07:00
• 41fd729209 remove the unimplemented upload limit site settings zotlabs 2017-03-13 18:40:07 -07:00
• 58aa0f3e1a code_allowed is a real mess. Start the cleanup by remving the account level code allow and limiting to specific channels only. This reduces the possibility of cross channel security issues coming into play. Then provide a single function for checking the code permission. This is only partially done as we often need to check against the observer or logged in channel as well as the resource owner to ensure that this only returns true for local channels which also own the requested resource. zotlabs 2017-03-13 16:19:47 -07:00
• 02b390d7b8 Merge branch 'dev' into red zotlabs 2017-03-13 15:13:59 -07:00
• 41c2f74772 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-03-13 15:13:31 -07:00
• 6c641b1834 move oauth2 to vendor zotlabs 2017-03-14 09:09:05 +11:00
• 700c05a55b many class fixes and revive shiny class for item titles in a new way Mario Vavti 2017-03-13 16:34:23 +01:00
• 188782c461 merge dev into bs4 Mario Vavti 2017-03-13 11:11:20 +01:00
• bdfdd23b36 Merge pull request #697 from anaqreon/dev git-marijusandGitHub 2017-03-13 11:00:19 +01:00
• 9f0c3b496b we need to have this even if we are not the owner. otherwise we loose the acl if e.g. not-owner edits a webpage. should probably find a better solution for this though. Mario Vavti 2017-03-13 10:29:26 +01:00
• 1ae715da21 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2017-03-13 10:29:48 +01:00
• d5feb5135d we need to have this even if we are not the owner. otherwise we loose the acl if e.g. not-owner edits a webpage. should probably find a better solution for this though. Mario Vavti 2017-03-13 10:29:26 +01:00
• fc533107ed better handling of mimetype security zotlabs 2017-03-12 21:55:24 -07:00
• 1ee76cb506 remove more hardwired branding zotlabs 2017-03-12 20:54:48 -07:00
• 4bb90dffc1 update license zotlabs 2017-03-12 17:45:51 -07:00
• f4cd4184f8 update readme zotlabs 2017-03-12 17:45:18 -07:00
• c39c925d8d grrr. stop making branding assumptions. zotlabs 2017-03-12 17:32:45 -07:00
• b1fc29be11 more cleanup zotlabs 2017-03-12 16:30:05 -07:00
• 2a1f6e3df2 update std_version zotlabs 2017-03-12 15:57:56 -07:00
• 6f3493bb3c db issues zotlabs 2017-03-12 15:50:47 -07:00
• 61257094b7 fix help menu Mario Vavti 2017-03-12 22:21:49 +01:00
• 8aabc6bc3d many dropdown and class fixes. still a long way to go... Mario Vavti 2017-03-12 21:11:28 +01:00
• f68148b7e0 Add id to app-menu for JS access Andrew Manning 2017-03-12 13:57:45 -04:00
• 4c526c7d3d Merge branch 'dev' into red zotlabs 2017-03-11 18:02:59 -08:00
• 4a24a8de43 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-03-11 18:02:38 -08:00
• b8ad22f525 Login-box css-fix for Bluegrid scheme jeroenpraat 2017-03-11 21:09:42 +01:00
• d9ecca8591 Merge branch 'dev' into bs4 Mario Vavti 2017-03-11 15:08:54 +01:00
• 83d07b9551 font size and post title adjust Mario Vavti 2017-03-11 15:07:30 +01:00
• ee03391293 Merge pull request #693 from anaqreon/dev git-marijusandGitHub 2017-03-11 10:58:03 +01:00
• 30503d6533 strings zotlabs 2017-03-10 12:44:57 -08:00
• bbb83bea38 strings zotlabs 2017-03-10 12:44:57 -08:00
• 0f9ddbf3b2 fixing classes Mario Vavti 2017-03-10 17:02:55 +01:00
• 8c4b8e623f Login-box css-fix for Bluegrid scheme jeroenpraat 2017-03-10 16:58:32 +01:00
• b1c97dfcfd some sed magic on button class names Mario Vavti 2017-03-10 10:47:30 +01:00
• 1a49f0d164 one role. zotlabs 2017-03-09 18:54:10 -08:00
• a2371d56fd Take me home instead of get me home Andrew Manning 2017-03-09 20:43:16 -05:00
• c93db2cd21 more cleanup zotlabs 2017-03-09 14:31:54 -08:00
• 15d422db80 Merge branch 'dspr' into red zotlabs 2017-03-09 14:17:14 -08:00
• 14d1912115 upgrade bs to latest git and some more progress Mario Vavti 2017-03-09 22:04:17 +01:00
• b6477cd38b go back to where the problem started zotlabs 2017-03-09 11:51:21 -08:00
• c42cbda904 remove navbar-toggler-left class Mario Vavti 2017-03-09 10:45:55 +01:00
• 39d56fd08f initial commit for the bootstrap version 4 branch - upgrade lib and make nav.tpl kind of working again Mario Vavti 2017-03-09 10:17:57 +01:00
• 403f4c1a6b Monday is a proper name and should be capitalised (except in private conversation amongst unix geeks). zotlabs 2017-03-08 19:23:11 -08:00
• 15ab331b6b move all the diaspora content hacks to the diaspora plugin zotlabs 2017-03-08 17:35:19 -08:00
• 495da14e38 Update latest Spanish strings (were commited to dev instead of the RC) jeroenpraat 2017-03-08 17:22:53 +01:00
• bc2b948f1f Merge branch 2.2RC 2.2 Mario Vavti 2017-03-08 09:39:46 +01:00
• ff9442474d version 2.2 and changelog Mario Vavti 2017-03-08 09:28:58 +01:00
• 9ca53fdc5d DCV stuff zotlabs 2017-03-07 17:44:19 -08:00
• 8e3a026276 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2017-03-07 12:08:43 +01:00
• b5ddd08630 Big 2.2 string update Dutch jeroenpraatandMario Vavti 2017-03-06 22:50:52 +01:00
• 92996e550c allow post_activity_item to be passed an empty ACL without resetting to channel default zotlabs 2017-03-06 21:01:17 -08:00
• a037590ce3 allow post_activity_item to be passed an empty ACL without resetting to channel default zotlabs 2017-03-06 21:01:17 -08:00
• c3c4254882 add public_policy to the nwiki container also. This should not affect the recent bug as presented, but is being added for consistency. zotlabs 2017-03-06 17:59:34 -08:00
• a18e8e1ede add public_policy to the nwiki container also. This should not affect the recent bug as presented, but is being added for consistency. zotlabs 2017-03-06 17:59:34 -08:00
• 751c4c3169 correct fix for wiki anonymous read issue (items_permissions_sql checks item.public_policy which was set for posts, not wikis) zotlabs 2017-03-06 15:33:10 -08:00
• 595cb13d8f correct fix for wiki anonymous read issue (items_permissions_sql checks item.public_policy which was set for posts, not wikis) zotlabs 2017-03-06 15:33:10 -08:00