Commit Graph

Select branches

Hide Pull Requests

2022.05-rc

develop

stable

Mono Color

• ce38e574a2 DE: update to the strings Tobias Diekershoff 2012-09-27 06:21:16 +02:00
• 25773b41cb add "tagged" hook (bots and such) friendica 2012-09-26 18:24:19 -07:00
• eaaf14736c rev update friendica 2012-09-26 18:23:08 -07:00
• 41db3fb983 declare array separately, doesn't work well when defined in hook friendica 2012-09-26 04:50:24 -07:00
• d1d5eca258 network_ping hook for next generation "page"/"forums" plugin friendica 2012-09-26 04:46:54 -07:00
• 4a8100a409 frost-mobile - everything is walltowall friendica 2012-09-25 21:55:53 -07:00
• 2cacbdb9e7 Merge https://github.com/friendica/friendica into pull friendica 2012-09-25 19:11:58 -07:00
• e433f20cd8 sort out the 'delete selected' mess friendica 2012-09-25 19:10:46 -07:00
• 75d65db785 Merge remote branch 'upstream/master' pixelroot 2012-09-25 12:00:29 +02:00
• 0bf9ff5821 modified: view/theme/smoothly/events_reminder.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2012-09-25 11:59:58 +02:00
• 245d9f0aca one template to rule them all friendica 2012-09-25 01:31:48 -07:00
• a798ef1a56 one template to rule them all friendica 2012-09-24 21:43:03 -07:00
• c8960fe3db Merge https://github.com/friendica/friendica into pull friendica 2012-09-24 20:54:55 -07:00
• 98064fc627 rev update friendica 2012-09-24 20:54:20 -07:00
• 0592a9e3ca modified: view/theme/smoothly/login.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2012-09-24 16:07:41 +02:00
• 8df6f249fd Merge https://github.com/friendica/friendica into pull friendica 2012-09-24 01:31:23 -07:00
• 8184de9c78 remove THISPLUGIN definition - not used and doesn't work friendica 2012-09-24 01:30:18 -07:00
• 0834779405 Merge remote branch 'upstream/master' pixelroot 2012-09-24 10:16:05 +02:00
• 05223cc325 modified: view/theme/smoothly/search_item.tpl modified: view/theme/smoothly/theme.php modified: view/theme/smoothly/wall_item.tpl modified: view/theme/smoothly/wall_thread.tpl modified: view/theme/smoothly/wallwall_item.tpl modified: view/theme/smoothly/wallwall_thread.tpl pixelroot 2012-09-24 10:15:31 +02:00
• 94f3aef1ea allow a bit more height friendica 2012-09-24 00:46:00 -07:00
• 316014e4ea restore category/file display on dispy/diabook friendica 2012-09-24 00:35:19 -07:00
• c44d068adf Merge branch 'master' of http://github.com/friendica/friendica pixelroot 2012-09-24 08:46:25 +02:00
• 054f8edb59 zeros - theming for new categories/folder display friendica 2012-09-23 19:22:48 -07:00
• b661e61d6a Merge https://github.com/friendica/friendica into pull friendica 2012-09-23 17:17:33 -07:00
• c3b4f9f0d3 support for bringing back cats/folders friendica 2012-09-23 17:16:37 -07:00
• fbd120f1ce rev update friendica 2012-09-23 17:16:01 -07:00
• 930169a8aa DE: update to the strings Tobias Diekershoff 2012-09-22 08:42:07 +02:00
• 994c37b85b Merge branch 'master' of http://github.com/friendica/friendica pixelroot 2012-09-22 08:36:50 +02:00
• b6b8f40fa9 Merge https://github.com/friendica/friendica into pull friendica 2012-09-21 18:10:32 -07:00
• 5fd124eabe undo revert of template changes friendica 2012-09-21 18:09:55 -07:00
• c2af97ef61 rev update friendica 2012-09-21 18:04:09 -07:00
• 57849ff959 modified: view/theme/smoothly/style.css pixelroot 2012-09-21 08:57:22 +02:00
• fa2156a9c1 modified: view/theme/smoothly/style.css pixelroot 2012-09-20 13:26:53 +02:00
• 8a8fe725af modified: view/theme/smoothly/style.css pixelroot 2012-09-20 13:25:12 +02:00
• 85c0260f33 modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2012-09-20 13:15:01 +02:00
• 7b9721f052 Merge remote branch 'upstream/master' pixelroot 2012-09-20 11:33:24 +02:00
• 12f7c32f9b modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2012-09-20 11:32:55 +02:00
• 58399c854f Merge pull request #492 from fabrixxm/blog-like friendica 2012-09-20 02:15:12 -07:00
• dd25c7db7e more $item data - add $item.categories and $item.folders to object/Item.php - add $item.hastags and $item.mentions to object/Item.php - add $item.total_comments_num and $item.total_comments_text to object/Item.php (those are set for top_level item also with no comments) - move get_cats_and_terms() to include/text.php Fabrixxm 2012-09-20 09:46:49 +02:00
• eda96a82d7 Update util/typo.php to check in to 'object' folder Fabrixxm 2012-09-20 09:32:42 +02:00
• 49098ed11d deleted: view/theme/smoothly/match.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2012-09-20 09:25:53 +02:00
• 40f2ec189e Merge remote branch 'friendica/master' into blog-like Fabrixxm 2012-09-20 02:48:54 -04:00
• 4758dc187c remove blog theme Fabrixxm 2012-09-20 02:42:54 -04:00
• 4c389eb73b Merge remote branch 'upstream/master' Michael Vogel 2012-09-20 08:32:33 +02:00
• ee6044a6e4 Merge pull request #491 from fermionic/separate-number-text-in-hidden-comments-text friendica 2012-09-19 20:56:26 -07:00
• da7c5b19b1 allow hidden comments phrase to be accessed separately as number and text Zach Prezkuta 2012-09-19 21:31:26 -06:00
• cd109b5adf Merge pull request #490 from fermionic/diaspora-profile-updates-broken friendica 2012-09-19 19:52:50 -07:00
• 1aa111387a -- Fix Diaspora profile update avatar bugs -- Protect BBCode tags inside of [pre] from space re-formatting -- More information in email poll logging -- Frost/Frost Mobile bug fixes Zach Prezkuta 2012-09-19 20:35:39 -06:00
• c11aa30ef4 this is not the best solution, but don't close the comment-bb buttons when you click outside the comment, because the comment-bb buttons are outside the comment and if you click one on an empty comment box the comment goes away completely and the bbcode doesn't get inserted. friendica 2012-09-19 18:24:20 -07:00
• 51bee79b21 Merge https://github.com/friendica/friendica into pull friendica 2012-09-19 15:39:19 -07:00
• 09a00a9a07 html tag completed early friendica 2012-09-19 15:34:21 -07:00
• b400ddd22d conversation: new 'categories' and 'folder' elements to $item remove static "Filed under" e "Category" text from message body both are lists of array whith 'name' : category/folder name 'remove': url to remove 'first': bool first in array 'last' : bool last in array Fabrixxm 2012-09-19 11:38:32 -04:00
• 2bdbdc8d8e Merge branch 'master' into blog-like Fabrixxm 2012-09-19 11:38:04 -04:00
• 31064a15ec modified: view/theme/smoothly/theme.php pixelroot 2012-09-19 16:16:58 +02:00
• a4f25f6eaa modified: view/theme/smoothly/style.css pixelroot 2012-09-19 16:14:45 +02:00
• 05a61b80e2 modified: view/theme/smoothly/follow.tpl modified: view/theme/smoothly/jot.tpl modified: view/theme/smoothly/peoplefind.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php modified: view/theme/smoothly/wall_item.tpl modified: view/theme/smoothly/wall_thread.tpl modified: view/theme/smoothly/wallwall_item.tpl modified: view/theme/smoothly/wallwall_thread.tpl pixelroot 2012-09-19 15:53:37 +02:00
• 82678e7bbf bad html in view/follow.tpl friendica 2012-09-19 03:17:41 -07:00
• 490c98b7db fix events friendica 2012-09-19 00:44:37 -07:00
• 0b59d30e34 more infrastructure for ignored events friendica 2012-09-18 22:49:05 -07:00
• 66081201bc allow "subscribe to thread" activities to exist without displaying them. friendica 2012-09-18 20:12:55 -07:00
• fa14723ef5 Merge https://github.com/friendica/friendica into pull friendica 2012-09-18 17:44:38 -07:00
• 5cad3e114a give themes more control over events/birthdays and provide them as notifications friendica 2012-09-18 17:43:09 -07:00
• 8596a275fc rev update friendica 2012-09-18 17:24:45 -07:00
• 6ebd56012a Merge pull request #479 from fermionic/album-image-inserted-too-large friendica 2012-09-18 15:46:41 -07:00
• 96d6d6b988 Pull request #487 Thomas Willingham 2012-09-18 16:15:36 +01:00
• 61eb884a20 Update view/theme/smoothly/bottom.tpl Alex 2012-09-18 13:13:05 +03:00
• cd25573038 select based on dimensions instead of scale level Zach Prezkuta 2012-09-17 21:46:36 -06:00
• 863e036b76 Merge pull request #483 from fabrixxm/bug471 friendica 2012-09-17 17:39:32 -07:00
• 69182360ef Merge pull request #486 from cvogeley/master Thomas Willingham 2012-09-17 14:44:17 -07:00
• cf2016e1a6 ignore OSX .DS_Store files Christian Vogeley 2012-09-17 23:11:42 +02:00
• 4b8fc897e6 remove .DS_Store Christian Vogeley 2012-09-17 23:03:53 +02:00
• c024ed601e Remove and ignore .DS_Store Christian Vogeley 2012-09-17 23:03:34 +02:00
• 808b0f2ed8 ES: bringing the strings to 100% thx to csolisr Tobias Diekershoff 2012-09-17 21:52:21 +02:00
• 318bc23e8a Add notifications in title Christian Vogeley 2012-09-17 20:39:34 +02:00
• e34b8e6d46 Pull request #484 (Smoothly) Thomas Willingham 2012-09-17 18:37:44 +01:00
• 55b741a4eb Merge pull request #485 from tomtom84/master tomtom84 2012-09-17 08:58:55 -07:00
• 68c2316ce3 Corrected titlebar notifications in Diabook tomtom84 2012-09-17 17:54:07 +02:00
• 11eebf7091 Add titlebar notifications to Dispy. Thomas Willingham 2012-09-17 14:54:40 +01:00
• 9cabcad36c Add title bar notifications to Smoothly Thomas Willingham 2012-09-17 14:53:17 +01:00
• dbdc4bcb67 Gitignore seems to have been overwritten with somebody's personal copy - put the old one back. Thomas Willingham 2012-09-17 14:52:26 +01:00
• 6aa45fb9cc admin: Don't allow to block or delete site admin in users admin page. fix bug 471 Fabrixxm 2012-09-17 08:48:43 -04:00
• f558a1fe8d Merge pull request #482 from pixelroot/master Alex 2012-09-17 05:12:53 -07:00
• ede6b4ad12 modified: view/theme/smoothly/style.css pixelroot 2012-09-17 14:16:13 +02:00
• 01daaafc92 Merge pull request #481 from pixelroot/master Alex 2012-09-17 04:46:00 -07:00
• 176fe0351a new file: view/theme/smoothly/shiny.png modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2012-09-17 13:49:09 +02:00
• 06c9330c5e Merge pull request #480 from pixelroot/master Alex 2012-09-17 02:20:07 -07:00
• cd3938dfda new file: view/theme/smoothly/default.php new file: view/theme/smoothly/footer.tpl new file: view/theme/smoothly/header.tpl modified: view/theme/smoothly/nav.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2012-09-17 11:22:12 +02:00
• 640f5306f5 fix item_id table friendica 2012-09-17 01:34:05 -07:00
• 6deb070890 quattro: first work on font size options Fabrixxm 2012-09-17 03:29:58 -04:00
• 59d98647fb Merge https://github.com/friendica/friendica into pull friendica 2012-09-16 19:20:40 -07:00
• 5b325935c2 rev update friendica 2012-09-16 19:19:50 -07:00
• 02ed81d8f9 bug 479 - typo in database.sql friendica 2012-09-16 19:19:09 -07:00
• 364f56e8bd dont insert images larger than scale level 2 Zach Prezkuta 2012-09-16 19:07:12 -06:00
• e6fc21e9fd Merge pull request #478 from fermionic/frost-improvements fermionic 2012-09-16 17:59:01 -07:00
• ab10a7b56b missed one Zach Prezkuta 2012-09-16 18:57:04 -06:00
• 3c7419ec57 various bug fixes Zach Prezkuta 2012-09-16 18:56:31 -06:00
• d29da99dbd frost: added some missing baseurls to nav.tpl Tobias Diekershoff 2012-09-16 18:33:55 +02:00
• f198953790 Merge branch 'master' of https://github.com/friendica/friendica Thomas Willingham 2012-09-16 16:17:43 +01:00
• 225c9bb30e Make 'Friendika' 'Friendica' in open search. Thomas Willingham 2012-09-16 16:16:22 +01:00
• 89981b33bb DE: update to the strings Tobias Diekershoff 2012-09-16 10:48:29 +02:00