mexon/friendica
1
0
Fork 0
Code Pull requests Activity
6507 commits 5 branches 60 tags 188 MiB
Commit graph

6507 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Willingham a7bd46d38b Friendicaland 2012-08-15 22:21:20 +01:00
Thomas Willingham 6a714004fa Remove Facebook from the quick start, since Facebook had done a Twitter. 2012-08-15 22:17:49 +01:00
fermionic 63839c031e Merge pull request #438 from fermionic/frost-admin-updates-for-mobile-selection 
admin page selector for mobile theme
 2012-08-15 08:03:30 -07:00
Zach Prezkuta 3531704d08 admin page selector for mobile theme 2012-08-15 08:54:30 -06:00
friendica e802c81ec1 fix single quotes 2012-08-15 05:09:44 -07:00
friendica b8df47e97c bbcode quote display 2012-08-15 04:52:18 -07:00
friendica 10585ec24f Merge https://github.com/friendica/friendica into pull 2012-08-15 03:01:23 -07:00
friendica bb188cbdf2 extra email enotify logging to help convince dreamhost that they've got breakage in one of their queues. 2012-08-15 02:59:17 -07:00
Tobias Diekershoff a09c200799 add selector for mobile theme to admin panel 2012-08-15 10:16:42 +02:00
Tobias Diekershoff 52908d5e80 lets mark mobile themes similar to experimental ones 2012-08-15 10:15:21 +02:00
friendica 4654ebd43b correct the invocation for htmlspecialchars to handle quote display issues with editplain and reshare 2012-08-15 00:02:15 -07:00
friendica b95f415f2c Merge pull request #437 from fermionic/themes-update-for-threading 
basic updates for Dispy and Diabook to try to make them at least not bro...
 2012-08-14 19:15:24 -07:00
Zach Prezkuta 77626cca74 missed something again 2012-08-14 19:54:22 -06:00
Zach Prezkuta 45b21c1d20 basic updates for Dispy and Diabook to try to make them at least not broken with threading updates 2012-08-14 19:42:07 -06:00
friendica 9553aeb3bd Merge https://github.com/friendica/friendica into pull 2012-08-14 15:22:45 -07:00
friendica 7718b6abea rev update 2012-08-14 15:21:54 -07:00
Tobias Diekershoff d3d2770f3a Merge branch 'master' of https://github.com/friendica/friendica 2012-08-14 12:38:06 +02:00
Tobias Diekershoff a763a064ff DE some updates to the translation 2012-08-14 12:37:32 +02:00
friendica aaadabf7d2 partial fix for D* public key format change 2012-08-14 02:20:48 -07:00
friendica 3a601ff66f rev update 2012-08-13 16:46:24 -07:00
friendica 31bd0557cb Merge pull request #436 from fermionic/api-mark-timeline-read 
update items seen in DB when using API
 2012-08-12 19:59:21 -07:00
Zach Prezkuta 7d8aee05ef update items seen in DB when using API 2012-08-12 20:29:37 -06:00
friendica bfec28f1fe threading messed up a bit of cross-site federation code 2012-08-12 18:42:43 -07:00
friendica 962c357ebd common_friends_visitor_widget warning 2012-08-12 15:54:38 -07:00
friendica e81f15b28d crypt bbcode tag 2012-08-12 04:29:26 -07:00
fermionic 8d89a915fc Merge pull request #434 from fermionic/frost-update-for-threaded-comments 
sigh I always miss something when copying over
 2012-08-11 19:53:08 -07:00
Zach Prezkuta 91aacdbb3d sigh I always miss something when copying over 2012-08-11 20:51:51 -06:00
friendica 6348634a1b Merge https://github.com/friendica/friendica into pull 
Conflicts:
	view/wall_thread.tpl
 2012-08-11 15:42:48 -07:00
friendica 1cd23860cb rev update 2012-08-11 15:39:45 -07:00
friendica 3039ad7aa7 Merge pull request #433 from fermionic/frost-update-for-threaded-comments 
Some updates for threading
 2012-08-11 15:34:21 -07:00
Zach Prezkuta 5890e3fa3a update frost mobile TODO 2012-08-11 14:43:13 -06:00
Zach Prezkuta 5e09fc31f5 Threading updates 
- Add rudimentary thread handling to Frost
- Fix possible CSS bug in several themes from threading update
- Add ability for themes to prevent threading
 2012-08-11 14:36:58 -06:00
friendica d4b6188356 getting comment counts correct in a threaded world 2012-08-11 01:26:10 -07:00
friendica 95bf9324b4 fix child count 2012-08-10 23:42:45 -07:00
friendica 20be1778db bring likes back - comment ordering is still a bit funky 2012-08-10 16:36:44 -07:00
friendica ed7e626ed2 Merge https://github.com/friendica/friendica into pull 2012-08-10 16:04:16 -07:00
friendica f8b969e252 Merge pull request #431 from fermionic/diaspora-relays-and-tags 
Couple of Diaspora fixes
 2012-08-10 16:03:37 -07:00
friendica d2eef5f11d Merge pull request #432 from fermionic/frost-better-screen-width 
Frost Mobile better screen width
 2012-08-10 16:03:19 -07:00
friendica b960352b54 rev update 2012-08-10 16:02:20 -07:00
Zach Prezkuta bcf214debb readability in TODO 2012-08-10 08:37:31 -06:00
Zach Prezkuta d9279da369 - Frost Mobile: redo CSS to adjust automatically to the screen width 
- Frost Mobile: various tweaks and fixes
- Allow themes to limit number of items on the Network page
 2012-08-10 08:34:00 -06:00
Zach Prezkuta 009ebc732a move tag transformation to bb2diaspora; start taking out unnecessary signature stuff 2012-08-10 08:13:17 -06:00
fabrixxm e31ee9ed82 Merge pull request #430 from fabrixxm/master 
Fix Quattro with threaded comments, small tweaks to template processor and conversation.php
 2012-08-10 03:50:54 -07:00
Fabrixxm ec3d8a80cd quattro: fix collapsed thread, fix comment box, style previev comment, add 'expand / collapse" thread 2012-08-10 06:27:01 -04:00
Fabrixxm fc07f50fd8 conversation: add 'thread_level' to $item array 2012-08-10 05:42:36 -04:00
Fabrixxm dbbf5b86a2 template processor: trim strings in {{ if str!=str }}, add 'debug' tag: 
{{ debug $var [$var1 [$var2 [...]]] }}{{ enddebug }}

is replaced by

    <pre>var_export($var1)\nvar_export($var2)\n....</pre>
 2012-08-10 04:55:51 -04:00
Fabrixxm 0f15c117ee quattro: move comment box for top-level item at the end of comments list 2012-08-10 04:53:39 -04:00
Fabrixxm c4bff3d393 quattro: add comment tools icons, fix hide/show comment tools 2012-08-10 04:29:22 -04:00
Fabrixxm 64a6e8693c quattro: remove unused parameter 'comment' from function cmtBbClose 2012-08-10 04:27:50 -04:00
Fabrixxm 2b7d08508d head.tpl: commentOpen() and commentClose() return true/false 
usefull to concatenate other actions: "commentClose(this, $id) && cmtBbClose($id)"
 2012-08-10 04:25:08 -04:00