clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,350 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

12350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Vogel af3d10eb0c Merge pull request #2515 from rabuzarus/key_fix 
photo.php: correct misspelling of an array key
 2016-05-15 10:35:16 +02:00
rabuzarus 7be1c83b0c photo.php: correct misspelling of an array key 2016-05-15 02:37:18 +02:00
Michael Vogel 1b2f67906b Bugfix for shares in the plaintext function 2016-05-13 22:23:46 +02:00
Michael Vogel 6434b5d8ce Support for comments for the Diaspora relay system 2016-05-13 22:19:31 +02:00
Tobias Diekershoff d6a124ee2b Merge pull request #2511 from rabuzarus/1205_photo_live_update 
1205 photo live update
 2016-05-13 07:57:13 +02:00
rabuzarus 255405c8f3 photos view: fix js error - forgot to delete this testing stuff 2016-05-13 01:34:56 +02:00
rabuzarus 6944d67dbc photos view: fix js error with undefined variable 2016-05-13 01:26:07 +02:00
rabuzarus 8384ba833a infinite scroll: include updated code from friendica develop branch 2016-05-12 20:30:08 +02:00
Tobias Diekershoff 6a0a30ab75 Merge pull request #2510 from rabuzarus/1005_js_pageload 
infinite_scroll: move js from index.php to main.js
 2016-05-12 07:47:26 +02:00
rabuzarus 12cf9c2914 some more work on private messages mail_display.tpl & mail_conv.tpl 2016-05-12 02:49:55 +02:00
rabuzarus 4c2da30892 prv message: fix message body was not sent 2016-05-11 22:05:01 +02:00
rabuzarus 27db338587 background: set background-attachment to fixed 2016-05-11 19:20:57 +02:00
rabuzarus ef1f68ea09 item deletion: fix - little mistake in the templates 2016-05-11 17:07:38 +02:00
rabuzarus 676ac36d7d item deletion: fix for don't showing the delete button if item is getting unchecked but other items are still checked 2016-05-11 16:53:49 +02:00
rabuzarus b13eb01d3c item deletion: use js to delete items. so we don't have to reload the page 2016-05-11 16:04:11 +02:00
rabuzarus d454905d3c infinite_scroll: move js from index.php to main.js 2016-05-11 01:52:05 +02:00
rabuzarus 1f994aa17a theme-settings: Add a note for the background Image 2016-05-10 17:30:06 +02:00
rabuzarus 8be0a2268f theme-settings: background image can be set with fbrowser 2016-05-09 23:30:09 +02:00
rabuzarus dab12f0b93 filebrowser: massive improvements (fix https://github.com/rabuzarus/frio/issues/3 , integrate fbrowser into jot) 2016-05-09 21:08:11 +02:00
rabuzarus dceee050e7 head.tpl move strings to js strings into the html <head> so we can move the js scripts out of the template 2016-05-08 01:31:30 +02:00
rabuzarus 88be5e3028 Some code cleanup - move js and css to head.tpl -> this stuff should be done in theme.php but does need changings in core (this would allow theme developers more structured working) 2016-05-08 00:29:33 +02:00
rabuzarus da63ae343a append poke and private message template 2016-05-07 04:41:57 +02:00
rabuzarus a73ec108ad apply bootstrap media fix (maybe we remove it again, lets test it) 2016-05-07 00:34:18 +02:00
rabuzarus 5a878de119 fix: tooltips now appear also on ajax content 2016-05-07 00:25:40 +02:00
rabuzarus 263e0d85fd hovercard: some css cleanup (remove unneeded css) 2016-05-06 22:58:26 +02:00
rabuzarus 697104dcce hovercard: some polishing 2016-05-06 22:28:12 +02:00
rabuzarus 415c36e4bb hovercard: fix hover-card does now working with ajax loaded content 2016-05-06 20:48:12 +02:00
Tobias Diekershoff 0b4565a72c Merge pull request #2507 from annando/1605-hidewall 
Better implementation of "hidewall" with feeds
 2016-05-06 19:28:55 +02:00
Michael Vogel 4d105111a7 Added documentation 2016-05-06 18:30:34 +02:00
Michael Vogel b7c14803b2 The feed header is now displayed even with "hidewall" activated 2016-05-06 18:27:19 +02:00
rabuzarus 0ab7a210f9 hovercard: better placement management 2016-05-06 17:32:07 +02:00
rabuzarus 047722dc37 move some js to have more structure 2016-05-06 16:48:06 +02:00
rabuzarus 485b1e5521 hovercard: add cache for contact data results 2016-05-06 16:37:04 +02:00
Michael Vogel 6f72bc8d3a Better implementation of "hidewall" 2016-05-06 11:04:21 +02:00
Tobias Diekershoff a1d06cc45e Merge pull request #2505 from annando/1605-diaspora-reshare 
Diaspora: Reshares of non native reshares now look better
 2016-05-06 09:45:49 +02:00
Michael Vogel ea78f63eac Diaspora: Reshares of non native reshares now look better 2016-05-06 08:22:27 +02:00
Tobias Diekershoff 480c35fb86 Merge pull request #2503 from annando/1605-hide-profile 
Better handling of hidden profiles
 2016-05-06 07:45:44 +02:00
Tobias Diekershoff c2a648adb2 Merge pull request #2504 from annando/1605-share2 
Avoid warning messages at "strstr"
 2016-05-06 07:42:35 +02:00
rabuzarus 9efc6fb823 poke: fix poke dialog - js tests now if there is already a questionmark in the url 2016-05-06 02:19:45 +02:00
rabuzarus 8609cc1675 hovercard: cache raw content of the template so we don't have to request it everytime from the server 2016-05-05 23:48:52 +02:00
rabuzarus adefc315f7 make the addon frio_hovercard working with the frio theme (Note: some changes which belong to the addon itself are going to the frio theme repository, because it's not planned to use the frio_hovercard addon without the frio theme and and vice versa. 
The addon frio_hovercard was initatet because we need a new module for the frio theme
 2016-05-05 21:10:08 +02:00
Michael Vogel 1aa3aa21b3 Avoid warning messages at "strstr" 2016-05-05 20:36:23 +02:00
rabuzarus 462a942df2 provide a custom jsmart because friendica delimters diddn't work with the original 2016-05-05 18:39:15 +02:00
Michael Vogel bd1030b246 Update the global contact entries for local users on a regular base 2016-05-05 15:38:28 +02:00
Michael Vogel de431e185e New function to update the global contact for the user id. 2016-05-05 15:08:05 +02:00
Michael Vogel 3df235e5bd The global contact for server users is now stored directly 2016-05-05 12:02:51 +02:00
Michael Vogel 90155da59a The "hide" element is included in the feed as well. 2016-05-05 06:46:23 +02:00
Michael Vogel 683cdcc19e Changed check for searchability 2016-05-05 00:29:54 +02:00
Michael Vogel ed485b9d61 Set "hide" in noscrape 2016-05-04 23:50:31 +02:00
Michael Vogel fbc5404522 DFRN: "Hidewall" is now transmitted, "hide" is respected in dfrn and ostatus. 2016-05-04 23:21:30 +02:00