Commit Graph

Select branches

Hide Pull Requests

2022.05-rc

develop

stable

Mono Color

• 9433d229ed Merge remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-08-02 12:46:36 -04:00
• ad25336d10 Merge pull request #422 from annando/master friendica 2012-08-02 03:47:02 -07:00
• b904a21134 Merge remote branch 'upstream/master' Michael Vogel 2012-08-02 10:27:11 +02:00
• 6d0f0e6273 parse_url: Fixed a problem in the detection if there was an image or not. Additionally removed some test content. Michael Vogel 2012-08-02 10:25:08 +02:00
• 9885be256e Merge https://github.com/friendica/friendica into pull friendica 2012-08-02 01:24:04 -07:00
• 4cbde6a75d rev update friendica 2012-08-02 01:23:16 -07:00
• 31eff37693 Merge remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-08-01 22:59:54 -04:00
• 50ffe24280 Merge pull request #421 from fermionic/frost-tinymce-editplain-broken fermionic 2012-08-01 18:10:25 -07:00
• 3e8e1ab830 ugly fix to make editplain work Zach Prezkuta 2012-08-01 19:09:28 -06:00
• 2aa67d67f5 Changed markdown to enable diaspora postings with images that contain links Michael Vogel 2012-08-02 01:46:28 +02:00
• 04c31d194f Merge remote branch 'upstream/master' Michael Vogel 2012-08-02 00:21:14 +02:00
• bed99674d2 bbcode: two new bbcode elements (style, class) for CSS Michael Vogel 2012-08-02 00:13:37 +02:00
• ac88336ce9 Merge pull request #420 from fabrixxm/master fabrixxm 2012-08-01 01:56:56 -07:00
• fde3edaa21 quattro: readd sparkle cursor Fabrixxm 2012-08-01 04:45:27 -04:00
• bf04fb450a quattro: style for "show more" addon Fabrixxm 2012-08-01 04:41:21 -04:00
• 372ad112c9 tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat. friendica 2012-08-01 01:36:39 -07:00
• 70389c99ea logic was reversed - should work now friendica 2012-07-31 22:25:03 -07:00
• 14282a40bb Merge pull request #419 from fermionic/more-div-problems friendica 2012-07-31 21:58:08 -07:00
• fc22c356ff fix almost all errant divs in view/ and frost folders Zach Prezkuta 2012-07-31 22:43:18 -06:00
• 764ee653ba Provide backend ability to poke as a comment rather than top-level post friendica 2012-07-31 20:59:51 -07:00
• 0e7f6d1417 Merge remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-07-31 23:16:56 -04:00
• 08c9185a7e Merge https://github.com/friendica/friendica into pull friendica 2012-07-31 18:02:41 -07:00
• 49ad9b355c rev update friendica 2012-07-31 18:01:55 -07:00
• 0c36d5b3cf Merge pull request #418 from fermionic/reduce-frost-dom-elements friendica 2012-07-31 18:01:33 -07:00
• 885bb50f0d fix /display bug; oembed audio bug; other tweaks Zach Prezkuta 2012-07-31 18:53:18 -06:00
• b522ffeea5 Frost: reduce DOM elements by about 20%; other tweaks and fixes Zach Prezkuta 2012-07-31 08:00:24 -06:00
• 5c033dee77 Merge https://github.com/friendica/friendica into pull friendica 2012-07-30 14:17:07 -07:00
• 5297d6ee75 Merge pull request #417 from fermionic/events-reminder-makes-format-wonky friendica 2012-07-30 14:16:11 -07:00
• 27ee8620f9 rev update friendica 2012-07-30 14:14:20 -07:00
• 72df6ff664 errant div in events_reminder.tpl Zach Prezkuta 2012-07-30 07:59:08 -06:00
• 07f87848b4 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items Domovoy 2012-07-30 13:36:33 +02:00
• efded40461 pass deleted flag to display friendica 2012-07-30 00:49:48 -07:00
• 9b752b8a59 Merge https://github.com/friendica/friendica into pull friendica 2012-07-29 15:36:01 -07:00
• ee802016ba Merge pull request #416 from fermionic/frost-tweaks friendica 2012-07-29 15:35:02 -07:00
• 299f9e3d9e rev update friendica 2012-07-29 15:32:26 -07:00
• 067865db9e fix filer bug; some interface tweaks Zach Prezkuta 2012-07-29 14:49:12 -06:00
• 30d7db5e42 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items Domovoy 2012-07-29 22:43:49 +02:00
• 4f13618b18 Merge pull request #414 from 23n/patch-1 fermionic 2012-07-29 12:36:22 -07:00
• ec1580b82d Merge pull request #415 from 23n/patch-2 fermionic 2012-07-29 12:36:05 -07:00
• 7b2ca538c8 Fallback to the old behavior for unhandled conversations mode. Domovoy 2012-07-29 21:11:19 +02:00
• 283e91cd6a Update the thr-parent field in the item table Domovoy 2012-07-29 21:01:04 +02:00
• 56f0ee4915 Threaded items on profile page Domovoy 2012-07-29 20:41:11 +02:00
• 3b330510ea Fixed misbehaviour in collapsing Domovoy 2012-07-29 20:09:51 +02:00
• 2fc0fcdc18 Unlimited level threading is now a site option. Domovoy 2012-07-29 19:53:04 +02:00
• 25015d3ab9 Update now handles threaded items. Domovoy 2012-07-29 18:39:38 +02:00
• 8ea3087342 Collapsing is back for threaded comments. Domovoy 2012-07-29 17:13:21 +02:00
• 5b5e4b6cb7 Update view/theme/frost/nav.tpl 23n 2012-07-29 15:28:59 +03:00
• 0f1b33a278 Update view/theme/frost-mobile/nav.tpl 23n 2012-07-29 15:07:52 +03:00
• 10eb873f7c Merge branch 'master' of https://github.com/friendica/friendica into threaded_items Domovoy 2012-07-29 10:03:17 +02:00
• 5e64bccd5c don't show birthday/event details on mobile devices friendica 2012-07-28 17:48:33 -07:00
• fe19890c3c Merge https://github.com/friendica/friendica into pull friendica 2012-07-28 16:13:25 -07:00
• 61115d7a07 rev update friendica 2012-07-28 16:12:12 -07:00
• 52df143134 Merge pull request #413 from fermionic/improve-page-loading friendica 2012-07-28 16:08:44 -07:00
• 38d4df77c6 remove server-specific change Zach Prezkuta 2012-07-28 10:14:28 -06:00
• 231b37217b update version of frost and frost-mobile Zach Prezkuta 2012-07-28 10:03:56 -06:00
• 1f09e7ad23 Modify Javascript to improve page loading times Zach Prezkuta 2012-07-28 09:57:16 -06:00
• eafec44793 Merge https://github.com/friendica/friendica into pull friendica 2012-07-27 17:53:35 -07:00
• 50e20a1494 rev update friendica 2012-07-27 17:52:43 -07:00
• 3f39e29e6e Friendicaland got bigger. Thomas Willingham 2012-07-28 01:16:09 +01:00
• eaf0d04bfb Comment box is now inside the item. Makes it easier to know what we are commenting on. Domovoy 2012-07-27 22:58:51 +02:00
• d558d25540 CommentBox is now hidden by default, this can be toggled with a fake link Domovoy 2012-07-27 22:47:18 +02:00
• 8ecf8167db Threaded comments are starting to work. Domovoy 2012-07-27 22:08:57 +02:00
• 672f9fd87f include/plugin: define THISPLUGIN as "addon/$pluginname/$pluginname.php" to make life a litte bit easy to lazy plugin devs like me Fabrixxm 2012-07-27 09:02:28 -04:00
• a77fdfa6aa remove special case for /.well-known/host-meta and add module for /.well-known Fabrixxm 2012-07-27 08:58:27 -04:00
• 3484d3bc5f Merge branch 'master' of github.com:CyberDomovoy/friendica into threaded_items Domovoy 2012-07-27 08:27:24 +02:00
• ca4a731bc2 Merge branch 'master' of github.com:simonlnu/friendica Simon L'nu 2012-07-26 13:52:38 -04:00
• dc416e5887 Moving the index creation commands into a readme file due to the fact that creating of these indexes is really slow. Michael Vogel 2012-07-26 07:38:51 +02:00
• c5603cf756 fixed head.tpl before the last pull. hadn't pushed and merged with upstream yet. Simon L'nu 2012-07-25 22:28:16 -04:00
• d0724812ee Merge remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-07-25 22:28:16 -04:00
• 794ae669ce fixes to cursor Simon L'nu 2012-07-25 22:28:09 -04:00
• 2e5c970cb1 Merge pull request #412 from rainulf/master friendica 2012-07-25 19:03:58 -07:00
• 1573c10631 Fixed syntax error in usage of anonymous function. Rainulf Pineda 2012-07-25 21:38:28 -04:00
• 6ac45f2f6f Merge https://github.com/friendica/friendica into pull friendica 2012-07-25 15:55:30 -07:00
• b9f13400d9 rev update friendica 2012-07-25 15:52:26 -07:00
• fc27edb6d7 network: Caching of images Michael Vogel 2012-07-26 00:23:25 +02:00
• 6456c2484e scale_external_images: Fix: Hadn't looked for pictures in the format [img=XxY] Michael Vogel 2012-07-25 23:40:23 +02:00
• f140a6da89 Further performance improvements Michael 2012-07-25 22:50:06 +02:00
• 69b883829a Speed improvements in the database Michael Vogel 2012-07-25 21:28:06 +02:00
• 42e80a162b Merge pull request #411 from fabrixxm/master fabrixxm 2012-07-25 05:16:48 -07:00
• 727c93cb8c quattro: add id to items container div needed to make commit 4c6a4321 work Fabrixxm 2012-07-25 08:12:21 -04:00
• db0b7c36ea Merge https://github.com/friendica/friendica into pull friendica 2012-07-24 17:45:12 -07:00
• a6f006ff17 Merge pull request #410 from fermionic/broken-share-box-in-dispy friendica 2012-07-24 17:32:49 -07:00
• 2e080f594e update head.tpl for dispy Zach Prezkuta 2012-07-24 18:29:23 -06:00
• 00043f3f1e Merge https://github.com/friendica/friendica into pull friendica 2012-07-24 17:25:36 -07:00
• f48e491ba0 rev update friendica 2012-07-24 17:24:53 -07:00
• 30f37c8b5c Merge pull request #409 from fermionic/display-settings-dont-work-on-mobile fermionic 2012-07-24 17:15:15 -07:00
• 657347254f use regular theme choosing logic if no mobile theme is specified Zach Prezkuta 2012-07-24 18:13:19 -06:00
• 57a75d240b Merge pull request #406 from fermionic/frost-theme friendica 2012-07-24 15:28:16 -07:00
• cc0c4474c0 Merge pull request #407 from fermionic/frost-mobile friendica 2012-07-24 15:27:49 -07:00
• d60a834906 Merge pull request #408 from CyberDomovoy/diaspora friendica 2012-07-24 15:26:18 -07:00
• 50d1bdd902 Removed useless function Domovoy 2012-07-24 17:32:13 +02:00
• 9378bc1375 disable tos and privacy links Zach Prezkuta 2012-07-24 09:27:27 -06:00
• 178329b6dc disable tos and privacy links Zach Prezkuta 2012-07-24 09:26:12 -06:00
• c8f484e4a5 Rplace spaces with undercores in tags Domovoy 2012-07-24 17:22:56 +02:00
• f9809102a2 Introducing Frost Mobile Zach Prezkuta 2012-07-24 09:16:51 -06:00
• 8126e8ea47 Introducing Frost Zach Prezkuta 2012-07-24 09:15:57 -06:00
• aa5e60248a Merge pull request #405 from fermionic/support-for-mobile-themes friendica 2012-07-23 20:18:23 -07:00
• 982625db9c update contact photos and names in local delivery - not just polled feeds friendica 2012-07-23 20:00:00 -07:00
• 5cb979f5e4 changes to support a mobile theme Zach Prezkuta 2012-07-23 20:37:00 -06:00
• dbdcbaa7ef Merge https://github.com/friendica/friendica into pull friendica 2012-07-23 16:51:02 -07:00