bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
6544 commits 4 branches 0 tags 133 MiB
Commit graph

6544 commits

This branch
This branch
All branches
Author SHA1 Message Date
friendica 10b0ce5861 Merge https://github.com/friendica/friendica into pull 2012-08-06 19:52:49 -07:00
friendica 558fbcc69e rev update + don't tag anything in [] brackets 2012-08-06 19:50:57 -07:00
friendica 3032d663f6 Merge pull request #427 from fermionic/frost-embedded-videos 
allow themes to change the size of embedded videos
 2012-08-06 15:58:17 -07:00
Simon 7c68dcd747 Merge pull request #428 from simonlnu/master 
new 'manage' icon
 2012-08-06 14:07:38 -07:00
Simon L'nu 7ceb213859 add a 'manage' icon to clarify things 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-08-06 17:05:25 -04:00
Simon L'nu 76e1e07571 Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  rev update
  Frost-mobile: media query in css for tablets
  expire issue
  rev update
 2012-08-06 13:18:00 -04:00
Zach Prezkuta d8a13d6e8d allow themes to change the size of embedded videos 2012-08-06 09:59:57 -06:00
Fabrixxm 4062312e9c quattro: collaps threaded items 2012-08-06 04:48:24 -04:00
friendica f9f45fa957 Merge https://github.com/friendica/friendica into pull 2012-08-05 21:44:31 -07:00
friendica 5d7f9d3b4b rev update 2012-08-05 21:43:20 -07:00
Fabrixxm fd7ea5cc91 quattro: support threaded comments 2012-08-05 16:55:20 -04:00
Domovoy 5b374c4050 Diaspora doesn't support threaded comments (forgot some) 2012-08-05 19:30:21 +02:00
Domovoy 707dd216ce Diaspora doesn't support threaded comments 2012-08-05 19:27:54 +02:00
fermionic fbc0f0e7ca Merge pull request #426 from cvogeley/master 
Frost-mobile: Add media query in stylesheet for tablets
 2012-08-05 09:43:24 -07:00
Christian Vogeley e6067e6694 Frost-mobile: media query in css for tablets 
Use space more efficiently on tablets in frost-mobile theme. Tested with
iPad 1.
 2012-08-05 16:08:07 +02:00
Domovoy 97285f4811 Preview was not working 2012-08-05 15:35:12 +02:00
Domovoy dac88fce56 Remove database update, use fallback solution instead. 2012-08-05 15:08:31 +02:00
Domovoy e247915f48 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	include/conversation.php
 2012-08-05 13:43:53 +02:00
Domovoy 5d1eb37b9b Remote items should be threaded now 2012-08-05 13:30:51 +02:00
friendica f616fd21e7 Merge https://github.com/friendica/friendica into pull 2012-08-04 23:30:35 -07:00
friendica 9732f1fccf expire issue 2012-08-04 23:29:52 -07:00
Simon L'nu 3d0fc813dc Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  missed an instance of $mobileapp in switch to generic app label
  ImageMagick rotates CW while imagerotate() rotates CCW
  update main frost version
  update version and todo
  -- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter) -- More HTML cleanup in TPL files -- Various Frost bug fixes and tweaks
  put back notags
  fix angle char storage and transmission, rev update
  Darkzero/NS .contact-photo-menu
  rev update
 2012-08-04 23:41:51 -04:00
fermionic 47ab0650e2 Merge pull request #425 from fermionic/frost-mobile-app-bug 
missed an instance of $mobileapp in switch to generic app label
 2012-08-04 20:06:38 -07:00
Zach Prezkuta ed9811762d missed an instance of $mobileapp in switch to generic app label 2012-08-04 21:05:25 -06:00
friendica bc5b54d7b7 Merge https://github.com/friendica/friendica into pull 2012-08-04 17:03:32 -07:00
friendica e27395b3d7 Merge pull request #423 from fermionic/frost-updates 
Various updates
 2012-08-04 17:02:57 -07:00
friendica e840184446 Merge pull request #424 from fermionic/rotate-direction-wrong 
ImageMagick rotates CW while imagerotate() rotates CCW
 2012-08-04 17:02:42 -07:00
friendica bf19e62ecd rev update 2012-08-04 17:02:05 -07:00
Zach Prezkuta ba66e17d1d ImageMagick rotates CW while imagerotate() rotates CCW 2012-08-04 17:30:25 -06:00
Domovoy 786e9064f2 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-04 23:33:06 +02:00
Zach Prezkuta 1f8182a453 update main frost version 2012-08-04 14:05:56 -06:00
Zach Prezkuta 849720f160 update version and todo 2012-08-04 14:04:18 -06:00
Zach Prezkuta 63628910b2 -- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter) 
-- More HTML cleanup in TPL files
-- Various Frost bug fixes and tweaks
 2012-08-04 14:02:39 -06:00
friendica 0c67649c08 put back notags 2012-08-03 18:36:45 -07:00
friendica bceae7b4c0 Merge https://github.com/friendica/friendica into pull 2012-08-03 18:34:00 -07:00
friendica 621e737826 fix angle char storage and transmission, rev update 2012-08-03 18:33:11 -07:00
Domovoy 8742beb772 Flatten children when threads are disabled 2012-08-03 22:28:21 +02:00
Domovoy ea7db7b7a8 Threaded items in every page concerned. Some code cleanup. 2012-08-03 21:55:17 +02:00
Domovoy cc6e6e53be Threaded notes 2012-08-03 21:41:26 +02:00
Domovoy 985f16d992 Threaded item when in single post display 2012-08-03 21:34:29 +02:00
Domovoy 75700a725e Comment box is inside the item 2012-08-03 19:18:56 +02:00
Domovoy 66848b0471 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	update.php
 2012-08-03 18:57:37 +02:00
Thomas Willingham 208019ea9c Darkzero/NS .contact-photo-menu 2012-08-03 03:07:29 +01:00
friendica 864b5fc256 rev update 2012-08-02 14:15:56 -07:00
Simon L'nu 9433d229ed Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  parse_url: Fixed a problem in the detection if there was an image or not. Additionally removed some test content.
  rev update
  Changed markdown to enable diaspora postings with images that contain links
  bbcode: two new bbcode elements (style, class) for CSS
  Moving the index creation commands into a readme file due to the fact that creating of these indexes is really slow.
  network: Caching of images
  scale_external_images: Fix: Hadn't looked for pictures in the format [img=XxY]
  Further performance improvements
  Speed improvements in the database
 2012-08-02 12:46:36 -04:00
friendica ad25336d10 Merge pull request #422 from annando/master 
Speed improvements, better diaspora export
 2012-08-02 03:47:02 -07:00
Michael Vogel b904a21134 Merge remote branch 'upstream/master' 2012-08-02 10:27:11 +02:00
Michael Vogel 6d0f0e6273 parse_url: Fixed a problem in the detection if there was an image or not. Additionally removed some test content. 2012-08-02 10:25:08 +02:00
friendica 9885be256e Merge https://github.com/friendica/friendica into pull 2012-08-02 01:24:04 -07:00
friendica 4cbde6a75d rev update 2012-08-02 01:23:16 -07:00