Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
6862 commits 2 branches 0 tags 132 MiB
Commit graph

6862 commits

This branch
This branch
All branches
Author SHA1 Message Date
friendica a26b4e8af1 Merge https://github.com/friendica/friendica into pull 2012-08-18 15:18:02 -07:00
friendica 862a12f8f5 rev update 2012-08-18 15:17:07 -07:00
friendica 64b6d26d4f Merge pull request #441 from fermionic/frost-permission-denied-login-style-wrong 
include login style when necessary
 2012-08-18 15:16:43 -07:00
friendica d8d20f2afa Merge pull request #440 from fermionic/blank-screen-at-install-end 
template was loaded in the wrong place
 2012-08-18 15:16:07 -07:00
Zach Prezkuta b4a4ccfb2b include login style when necessary 2012-08-18 14:47:59 -06:00
Zach Prezkuta d00c98b8b8 template was loaded in the wrong place 2012-08-18 13:28:49 -06:00
Domovoy b558dbbdb2 add 'thread_level' to $item array (friendica/friendica@fc07f50fd8) 2012-08-18 17:56:38 +02:00
Domovoy fd29ab9629 Add ability for themes to prevent threading (see friendica/friendica@5e09fc31f5) 2012-08-18 17:49:07 +02:00
Domovoy 8efe4077d3 Correct identification of wall-to-wall items (see friendica/friendica@96b9cda43d) 2012-08-18 17:36:38 +02:00
Domovoy 51802b0ae8 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-18 17:23:46 +02:00
Domovoy 17f9fcaec9 Checks done on topmost parent in local_delivery, closes #10 2012-08-18 17:17:33 +02:00
friendica 22bf48cae9 Merge https://github.com/friendica/friendica into pull 2012-08-17 22:07:12 -07:00
friendica d96b9cda43 wall-to-wall posts not identified correctly after thread mod 2012-08-17 22:06:13 -07:00
friendica d233beb4ce rev update 2012-08-17 22:05:42 -07:00
Domovoy 441c6d79e3 Use correct english 2012-08-17 16:40:41 +02:00
Domovoy 429870015f Comments on friends are back (stupid typo) 2012-08-17 16:20:28 +02:00
Domovoy 16260e9fbb Merge branch 'threaded_items' of github.com:CyberDomovoy/friendica into threaded_items 2012-08-17 15:49:23 +02:00
Domovoy 1581e02f8f Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-17 09:46:43 +02:00
fermionic 9ac2231a62 Merge pull request #439 from fermionic/frost-fix-archive-widget 
another javascript that needed $ --> $j
 2012-08-16 20:52:50 -07:00
Zach Prezkuta 045f98cddd another javascript 2012-08-16 21:51:36 -06:00
friendica 86d867f96f Merge https://github.com/friendica/friendica into pull 2012-08-16 15:24:57 -07:00
friendica f9d703b8fc rev update 2012-08-16 15:24:02 -07:00
Thomas Willingham 008d04bdbd Merge branch 'master' of https://github.com/friendica/friendica 2012-08-16 18:22:20 +01:00
Thomas Willingham ee998864e6 Make Vier threaded comments not broken. 
These should be inherited from Quattro really, but aren't.
 2012-08-16 18:21:33 +01:00
friendica 1e3ebccb97 Merge https://github.com/friendica/friendica into pull 2012-08-15 17:16:24 -07:00
friendica 68d7a3ae01 put a variant of the parent_uri into email notification message-ids. Current message-ids aren't completel legal. More work to do. 2012-08-15 17:14:29 -07:00
friendica 6184b5cf5a rev update 2012-08-15 17:12:58 -07:00
Thomas Willingham c47e6dca30 Remove Facebook from newmember text. 2012-08-15 22:26:44 +01:00
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