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

318 Commits

Author SHA1 Message Date
Michael Vogel b429b85680 CSR changes, split dbclean in separate processes if worker is active 2016-10-22 10:14:41 +00:00
Michael Vogel 501c45def5 Some more improved queries 2016-10-21 18:25:21 +00:00
Michael Vogel 60a0235af0 The account type is now read and displayed 2016-10-01 20:03:27 +00:00
Roland Haeder c825cc8d0d
This merge brings back dbm::is_result() where I could find it. 
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-09-18 23:21:18 +02:00
rabuzarus 3921113e5c photos - include paginate into the templates - provide a photo_album.tpl for frio 2016-08-04 21:53:22 +02:00
Michael Vogel 668da905e2 "proc_run" is now called with priority. 2016-08-01 07:48:43 +02:00
Michael Vogel f27bc00464 Remove obsolote functions 2016-07-09 20:09:09 +02:00
Roland Haeder 3e701b90ac
Continued rewriting: 
- use dba::is_result() everywhere (where I found the old, bad way)
- converted some spaces -> tabs for code
- converted some CRLF -> LF as mixures of both is not good

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-05-01 14:24:44 +02:00
Michael Vogel 5a90f865ed
Add the guid to items that we create locally 2016-05-01 13:47:24 +02:00
Michael Vogel 8f00836ffb Add the guid to items that we create locally 2016-03-20 15:01:50 +01:00
Michael Vogel 7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +01:00
fabrixxm b202e02fbf Revert "Updated modules to allow for partial overrides without errors" 
This reverts commit db949bb802.
 2016-02-07 15:11:34 +01:00
Andrej Stieben db949bb802 Updated modules to allow for partial overrides without errors 
Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions.
 2016-02-05 21:52:39 +01:00
fabrixxm fcf7a791f1 Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget" 
This reverts commit 83e54f70d3, reversing
changes made to ecf576bdd0.
 2016-01-04 11:46:19 +01:00
rabuzarus 29c671bb22 photos aside widget:permissions cleanup 2016-01-03 16:09:05 +01:00
rabuzarus 20fbf670db photo aside widget for profile page 2015-12-30 00:26:50 +01:00
rabuzarus e61d6e030e fix account_type 2015-12-14 14:12:56 +01:00
rabuzarus d963cdfe48 photos-albms widget: add some classes 2015-12-02 20:01:22 +01:00
rabuzarus cd7ec72b20 unify hcard and vcard: make $pdesc available in hcard&vcard 2015-12-01 19:47:23 +01:00
rabuzarus 89c5989cfb unify hcard and vcard 2015-12-01 18:31:08 +01:00
rabuzarus 649578ae33 Merge develop-new into event-attendance-new 
Conflicts:
	include/conversation.php
 2015-10-11 19:39:55 +02:00
rabuzarus c775d6885b port of reds geotag feature 2015-10-03 20:24:35 +02:00
Michael Vogel 68a6f0298e The events moved from the profile to the navigation bar - for supported themes 2015-09-30 18:50:44 +02:00
rabuzarus 7cb4ea52fd port of the event attendance feature of red matrix with example implementation for vier theme. 2015-09-30 16:58:02 +02:00
rabuzarus 2ff67ef5ed fixes like/dislike for photos 2015-09-30 14:39:00 +02:00
rabuzarus 3d7602a5a3 don't show profile photos in albums to others than the owner or remote user 2015-09-29 19:44:26 +02:00
fabrixxm 5a23bd400c Merge pull request #1715 from rabuzarus/theme_uid 
use local theme settings for visitors
 2015-06-30 08:41:07 +02:00
fabrixxm 28f0e9a2de Merge pull request #1696 from rabuzarus/acl-var 
move jotnets to populate_acl
 2015-06-29 13:53:37 +02:00
rabuzarus a982320ba9 show maximagesize warning in a human readable format 2015-06-29 02:39:08 +02:00
rabuzarus 8cca849c2e Merge acl-var into develop 
Conflicts:
	mod/settings.php
 2015-06-27 15:23:19 +02:00
rabuzarus 373bb0822b get the themes settings of foreign profiles 2015-06-27 14:10:43 +02:00
rabuzarus 5ce125d6e0 cleanup of some unused code 2015-06-26 15:13:52 +02:00
rabuzarus 94b21245bc some more work to get acl data into populate_acl 2015-06-25 18:57:42 +02:00
rabuzarus bfebf9636b acl for events and photos 2015-06-25 12:38:09 +02:00
fabrixxm 35e9fc3b02 use fields template in photo edit form 2015-06-22 20:07:19 +02:00
rabuzarus a674e782b2 fix Issue #1638 2015-06-01 01:36:37 +02:00
rabuzarus b61e39a1cb cleaning after local merge 2015-05-29 16:30:42 +02:00
rabuzarus 553a152345 Merge photo-template into develop 2015-05-29 16:24:58 +02:00
rabuzarus a7d417abb2 remove whitespace 2015-05-29 16:18:30 +02:00
rabuzarus 5cbb5b140c css work 2015-05-29 16:08:17 +02:00
rabuzarus 415a606a59 better solution to exclude Contact Photos and include count of Photos 2015-05-28 15:54:53 +02:00
rabuzarus 1067718018 little revision 2015-05-27 12:44:40 +02:00
rabuzarus 15499ff1aa first step to get html code from photos.php removed 2015-05-27 03:35:29 +02:00
rabuzarus f309f3a681 remove html and use vcard-widget.tpl 2015-05-26 14:32:40 +02:00
Michael Vogel 0e895e24f7 Code reworks: replaced hardcoded network text with the corresponding constants. 2015-04-11 22:14:56 +02:00
Rabuzarus 5939a8cea5 revert last commit f59e574, remove some html code 2014-12-26 14:44:48 +01:00
Rabuzarus f59e574068 removed Pagination 2014-12-26 12:54:23 +01:00
Rabuzarus cb47fdfcb9 minor change: rel should not be part of the PHP 2014-12-26 03:32:21 +01:00
Rabuzarus 73f9d06e3e move some html code from photos.php to photo_album.tpl 2014-12-25 16:20:55 +01:00
Fabrixxm 51e6c30188 add id to album name tag 
this should be in template
 2014-09-17 11:02:18 +02:00
Michael Vogel ed1dce93d6 Usage of /display/(guid) as path instead of /display/(user)/(id) 
Bugfix for adding tags to photos
 2014-07-22 00:36:20 +02:00
Fabrixxm aba27ad404 fix photo comments: use $drop array as in wall_thread and search_item 2014-04-28 09:29:48 -04:00
Michael Vogel 6b8585d48d Database stuff. New table "thread". Changing "left join" to "inner join", removing "limit 1" at update and delete. 2014-03-09 09:19:14 +01:00
Michael Vogel 608d5255ec Support for twitter cards (in both directions) 2014-02-22 15:46:19 +01:00
Michael Vogel 93143702ed Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php
 2013-02-17 12:35:40 +01:00
Zach Prezkuta 488a38cd85 Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
Michael Vogel b9afb38f4d Some more function calls to ensure that the tags are deleted when an item is deleted 2013-01-13 15:11:06 +01:00
Michael Vogel 3dc615dd9d Adding the tag creating function to the function when a photo is tagged 2013-01-13 15:05:24 +01:00
Zach Prezkuta 11c06e21b7 simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
Zach Prezkuta 96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07:00
friendica 5d904a9fa8 improve performance of photo upload page 2012-11-25 19:34:54 -08:00
friendica b01ca0e345 what happened to the photos page vcard? 2012-11-09 00:21:16 -08:00
friendica 0627fdcce7 positional params in "was tagged in a photo" string 2012-11-03 15:29:47 -07:00
fermionic d3290f314f Merge pull request #521 from fermionic/20121101-updates 
Various updates
 2012-11-02 12:26:49 -07:00
friendica e8fa4279fa no profile pic on photos page if no photos have been uploaded 2012-11-02 04:20:12 -07:00
Zach Prezkuta e9b26ffbb3 prevent double posting of status updates and comments 2012-11-01 17:14:42 -06:00
Michael Johnston 939227e820 Moved comment box on photos to be after the last comment, added text for the Preview link 2012-10-14 14:41:31 -04:00
Zach Prezkuta b9818185db for profile and photos, detect contacts from local hub and auto-redir 2012-10-09 09:50:24 -06:00
Zach Prezkuta ce73cd560f allow tagging of people by name or nickname 2012-09-29 17:55:40 -06:00
friendica ebabd25717 order photo album list in blog (reverse date) order 2012-09-29 06:08:44 -07:00
friendica c357fddea7 photo "conversation streams" need work - quite a bit of it 2012-09-29 06:04:01 -07:00
friendica 7bec5778ba provide option to view photo albums in posted order (rather than blog order) 2012-09-08 18:33:28 -07:00
friendica 4cd8233f61 remote_user can now support multiple contacts being logged in at once 2012-09-04 22:50:28 -07: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
Zach Prezkuta 1f09e7ad23 Modify Javascript to improve page loading times 
1. Add template category 'end' that places content right before final </body> tag
	2. Move most Javascript from tpl files into one cacheable file, theme.js
	3. Load scripts at end of the HTML document instead of in the header
	4. Minify several Javascript files

Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.
 2012-07-28 09:57:16 -06:00
Zach Prezkuta 5cb979f5e4 changes to support a mobile theme 2012-07-23 20:37:00 -06:00
Zach Prezkuta 9fbe921051 auto-orient uploaded wall photos and profile photos also 2012-07-08 09:18:05 -06:00
Vasudev Kamath 1b3d84422e orient function uses exif_read_data for which valid image types are only JPEG and TIFF as per the document [1]. 
When trying to upload an screenshot with png type I was getting message as *failed* even though image was uploading. So added a fix to check image type before calling orient function. Not sure if this is a proper fix but after this i'm not getting any error during file upload

[1] http://au2.php.net/manual/en/function.exif-read-data.php
 2012-07-07 16:17:26 +05:30
Zach Prezkuta 3fe5bdbd8d add ability to set maximum pixel length of uploaded pictures 2012-07-02 20:01:23 -06:00
friendica 35a098e0dc service limits for photo uploads 2012-06-25 01:37:44 -07:00
friendica 9528beac34 sidebar photo album list not visible to anybody if user['hidewall'] set 2012-06-24 16:51:39 -07:00
Zach Prezkuta 54c76ca822 allow rotation either CW or CCW 2012-06-20 20:51:03 -06:00
Zvi ben Yaakov (a.k.a rdc) a801888b15 Now using App::get_cached_avatar_image for /photos page 2012-06-19 16:05:39 -07:00
Zach Prezkuta 42fa47e8f7 rotate uploaded images if an EXIF rotation is present 2012-06-18 21:02:11 -06:00
Zvi ben Yaakov (a.k.a rdc) edc68f4876 Enabled Profile photo revisions to be displayed on /photos page 2012-06-17 23:59:29 +03:00
Fabio Comuni 2438c6e45d png support: update database.sql, fix some typos, fix tinymce image browser 2012-06-07 20:17:31 +02:00
Fabio Comuni 7cc8c369cb Add support for PNG images with alpha 2012-06-07 17:42:13 +02:00
friendica 61dba985c1 photo rotation 2012-05-23 01:01:04 -07:00
friendica 54e2c1ca81 rev update, bug 428, 429, and ability to block globaldir submissions from demo sites 2012-05-21 16:40:11 -07:00
Tobias Hößl 720c8324c7 Some Bugfixes, and variable checks 2012-04-17 11:33:50 +00:00
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica 
Conflicts:
	include/config.php
	update.php
 2012-04-05 13:39:15 +02:00
friendica 7c6c3d36f5 profile wall privacy 2012-03-27 01:31:47 -07:00
friendica cf2edb5b9a ctrl + left|right cursor keys to prev/next photos 2012-03-19 01:20:53 -07:00
Tobias Hößl 0341078a73 Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier 2012-03-19 07:37:09 +00:00
friendica a97cb88b65 logger_debug was used as string instead of constant 2012-02-21 14:15:10 -08:00
friendica a76a497d92 implement "moderate" flag on items 2012-01-23 20:56:11 -08:00
friendica 8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
friendica e3a415d409 add photo upload link to album widget and "upload to this album" ability 2012-01-15 17:48:42 -08:00
Fabio Comuni f9b0af6f2f Merge remote-tracking branch 'friendica/master' 2012-01-06 09:11:48 +01:00
friendica b99cb511ca comment preview 2012-01-05 16:38:24 -08:00
Fabio Comuni 2ef2d0b79f quattro: contacts and first photo page 2011-12-22 16:33:14 +01:00
friendica efeb377a12 w3c valid cleanup 2011-12-06 20:56:51 -08:00
Friendika 35305fb6d9 fix "do not show status post for photo" setting when used with js_upload (value is string "true/false" not integer or boolean) 2011-11-02 21:53:44 -07:00
Friendika e5a7b3e24b add contact-id to auto-complete response to resolve duplicates 2011-10-27 19:12:30 -07:00
Friendika 278433eac7 origin flag handling, and bug #137 - provide timezone conversion for events posted across to Diaspora 2011-10-17 14:52:03 -07:00
Fabio Comuni 070e081ae9 Fix url in profile tabs 2011-10-10 16:40:12 +02:00
Fabio Comuni f64e2d63b9 New common tab template. Update css 2011-10-10 15:28:34 +02:00
Friendika 0ad9e7b5f4 option to not post photos to status stream 2011-10-01 06:20:41 -07:00
Friendika f4c961b906 override pragma 2011-10-01 02:22:48 -07:00
Devlon Duthie 78c3210f6a fixed a bug I introduced when working on the testbubble theme - user's photo widget header div wasn't closed correctly 
+ some opera-friendly style changes
 2011-09-27 00:29:34 -05:00
Devlon Duthie cb1c6dd1e3 really commiting files this time, still getting the hang of git. 
some images added, some classes added to groupidebar, contacts sidebar
notification flags moved out of nav and into banner for testbubble the
testbubble css tweaks
 2011-09-25 13:20:19 -05:00
Friendika a2b2318106 provide permission error vs "not found" for protected photos 2011-09-22 20:03:09 -07:00
Friendika 9161d1832e allow one to toggle into and out of photo edit mode for an entire album 2011-09-21 17:37:02 -07:00
Friendika 660787916e template escapes 2011-09-19 20:24:32 -07:00
Friendika a810d2a993 put profile photo on photos page 2011-09-19 16:39:23 -07:00
Friendika a33edb0042 infrastructure for personalised @ tags (no UI/settings form yet), allow own comments through statusnet connector 2011-09-01 18:02:08 -07:00
Friendika 04675e3ec3 revup 2011-07-28 16:49:43 -07:00
Friendika c74f0f0cab show full size photos for album view even when photo has been used as a profile photo 2011-07-28 01:01:19 -07:00
Friendika 84d12c3e08 move hidewall to user table - queries are getting too complicated and servers falling over 2011-07-05 23:23:43 -07:00
Friendika 07ea67e33b removed stray debug statement 2011-07-03 19:57:20 -07:00
Friendika 53653f6a4d consolidate perrmisions sql, minor duepuntozero validation fixes 2011-06-30 17:35:35 -07:00
Friendika 8819c73ba1 bug #99 - don't show album name/link if photos are private 2011-06-30 03:39:08 -07:00
Friendika ad5b976978 allow spaces in @ tags 2011-06-29 18:59:05 -07:00
Friendika d5855967a7 do not translate hidden photo album 'Contact Photos' as it may become unhidden when different language is used. 2011-06-28 22:33:02 -07:00
Friendika 4ca6a9a382 dbg info for photo uploads 2011-06-28 18:59:41 -07:00
Fabio Comuni 5de7d0f12f add profile tabs to "photos", "events" and "notes". in dispy, show active tab. 2011-06-23 11:30:17 +02:00
Friendika e5b54e74ba delete selected items 2011-06-15 20:43:39 -07:00
Friendika 4469f92ea3 prev/next icons (instead of text) for photos 2011-06-13 21:43:21 -07:00
Friendika 894dfde122 set permalink on photo tags 2011-06-08 22:34:22 -07:00
Friendika dea721a3f8 minor fixes to apps (don't show notes if not logged in) and photos (tag delete link is leaking to unauthorised users) 2011-06-08 21:43:32 -07:00
Friendika d2863d1859 first recently uploaded photo (in 3 hours) to an older existing album, post made visible 2011-06-07 16:23:37 -07:00
Friendika 55e727de64 make 'visible to everybody' warning toggle correctly in photos and settings 2011-06-01 22:06:53 -07:00
Friendika 69f014d02b bug #38 ability to restrict profile, wall, photos from non-friends 2011-05-28 00:49:03 -07:00
Friendika 4e8a97f30a bug #38 posts and photos only visible to friends if so configured 2011-05-28 00:42:01 -07:00
Friendika 1ccda19f7a hooks can't contain direct values, must be variables 2011-05-21 17:17:27 -07:00
Friendika db60d6d78f photo upload plugin size limit is not working, call photo_end hooks in any error return from mainline so html does not leak into json responses bug #77 2011-05-20 15:57:58 -07:00
Friendika b2e92e0af3 deprecate load_view_file 2011-05-11 04:37:13 -07:00
Friendika a00813497f bring back load_view_file for dispy templates 2011-05-10 23:35:31 -07:00
Friendika c052d68828 don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version. 2011-05-10 16:12:50 -07:00
Friendika 3b51f28d25 comment macros showing on photos 2011-05-08 22:58:38 -07:00
Friendika c2e35d2d35 set permalink on uploaded photo items 2011-05-08 22:47:35 -07:00
Friendika b3fa03d3b4 Merge pull request #95 from fabrixxm/dispy 
Dispy
 2011-05-05 04:29:14 -07:00
Fabio Comuni b3a5fccc9d template for photo display 2011-05-05 10:53:03 +02:00
Friendika 6c1d587ae3 notify not called on new photo album (first item) 2011-05-03 05:27:19 -07:00
Friendika 9e19eef194 "firewall" setting - block all public pages from the public if configured to do so 2011-04-21 17:29:47 -07:00
Friendika 5654ce926c move all message display sub-functions from boot.php into conversation.php 2011-04-12 17:58:16 -07:00
Friendika c8f32536ff pull in new 'writable' dfrn flag 2011-04-11 03:22:09 -07:00
Friendika 5d5a94c88a comment open/close anomolies in non-English languages 2011-04-07 16:19:46 -07:00
fabrixxm c1144912e2 small fix 2011-03-20 08:38:42 +01:00
Friendika ea03d9fa86 more thorough cleanup on account/contact removal 2011-03-17 21:15:27 -07:00