Commit graph

278 commits

Author SHA1 Message Date
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
Friendika
3f432a7b82 share,retweet,relay,forward, whatever 2011-03-16 19:36:59 -07:00
Friendika
ee210718cc photo album prev/next links 2011-03-11 20:06:13 -08:00
Friendika
35c3e12df5 ability to edit image permissions 2011-03-09 21:10:16 -08:00
Friendika
0de88eb6b0 yet another template converted to language neutral format 2011-03-08 18:53:52 -08:00
Friendika
5641532936 yet another template 2011-02-24 02:46:06 -08:00
Friendika
755c2245e8 move php path setting inside proc_run 2011-02-23 15:16:12 -08:00
Friendika
079e63bba9 Merge branch 'themetests' of https://github.com/fabrixxm/friendika into fabrixxm-themetests 2011-02-21 13:27:03 -08:00
Friendika
4bff52990e ajax reload fixes 2011-02-16 21:17:49 -08:00
Fabio Comuni
dc15e8640d duepuntozero: show desc on image in albums 2011-02-16 12:49:16 +01:00
Friendika
1dea6a2d71 wrong return url for ajax comments on display and photos pages 2011-02-14 20:21:28 -08:00
Friendika
9f5d3000c7 don't change photo visibility if only album name was changed 2011-02-07 21:16:39 -08:00
Fabio Comuni
d72f248b3c Allow to set a photo from albums as profile photo 2011-02-04 10:18:28 +01:00
Friendika
5c98032893 Merge branch 'photos' of https://github.com/fabrixxm/friendika into fabrixxm-photos 2011-02-03 23:25:33 -08:00
Friendika
e2c8bedfe5 allow changing album name in photo edit page 2011-02-03 15:13:38 -08:00
Fabio Comuni
bed0391e6f Show lock info on photos 2011-02-03 17:24:58 +01:00
Friendika
26cc2e02fe Merge branch 'fabrixxm-master'
Conflicts:
	boot.php
2011-01-28 18:50:20 -08:00
Friendika
33037754d8 removed java photo uploader from mainline. Photo uploaders are now plugins, but a single item upload is available by default. 2011-01-27 18:45:19 -08:00
Friendika
620aae5b50 still not quite ready for the big photos rollover 2011-01-27 03:55:40 -08:00
Friendika
076c25e103 Revert "Revert "roll version - now in alpha 2.1""
This reverts commit e8a3166fa9.
2011-01-27 03:52:18 -08:00
Friendika
e8a3166fa9 Revert "roll version - now in alpha 2.1"
This reverts commit df4f77dadd.
2011-01-27 03:50:56 -08:00
Friendika
df4f77dadd roll version - now in alpha 2.1 2011-01-27 03:46:09 -08:00
fabrixxm
e9251499dd Added proc_run() and modified all occurrence of proc_close(proc_open()) to use proc_run() 2011-01-24 22:00:02 +01:00
Friendika
f057cc3a70 missing pagination in photo collections 2011-01-04 00:06:36 -08:00
Friendika
8b086a76e5 stray debugging statement 2010-12-07 17:16:05 -08:00
Friendika
75306b6294 allow community page members to upload photos and assorted other stuff which was previously restricted to the page owner 2010-12-05 18:08:36 -08:00
Friendika
8c395f96de view directory cleanup 2010-11-15 21:02:59 -08:00
Friendika
f4fd679928 couple of issues w/ profile photo update propogation 2010-11-09 18:24:35 -08:00
Friendika
4514927128 added search 2010-11-08 17:30:00 -08:00
Friendika
01f171bce7 ability to remove individual photo tags 2010-11-08 14:37:58 -08:00
Friendika
fbcb74099a show larger images for profile photos on summary photos page 2010-11-07 03:41:28 -08:00
Friendika
944c14b9e6 could not delete photos 2010-11-07 03:36:03 -08:00
Friendika
05236adf0f notification email on follow activities 2010-11-06 14:40:19 -07:00
Friendika
b94cb8d234 add micro profile photo 2010-11-04 23:50:32 -07:00
Friendika
4cba826a2f hub anomolies & swat0 compliance 2010-11-04 20:47:44 -07:00
Friendika
4f8445760c cleanup photo page a bit more, some work on branding 2010-11-04 00:19:10 -07:00
Friendika
b3856a797b show like/dislike when no comments yet, bit of lint 2010-11-03 19:47:07 -07:00
Friendika
a90e5f438b clean up photo edit layout 2010-11-03 17:20:46 -07:00
Friendika
a985ad4a54 add activity target to items, allow multiple link relations 2010-11-03 16:48:21 -07:00
Friendika
98a508532f fix like/dislike refresh on photos/display items 2010-11-02 22:21:49 -07:00
Mike Macgirvin
26f97b8284 like,dislike for photos (still needs a bit of tweaking) 2010-11-02 16:24:23 -07:00
Mike Macgirvin
d8630dbdd8 infrastructure for swat0 (#fsw) 2010-11-01 23:42:26 -07:00
Mike Macgirvin
ac824fe83e eradicate redundant get_uid function 2010-10-18 14:34:59 -07:00
Mike Macgirvin
511c761fec group/community/celebrity pages 2010-10-18 00:43:49 -07:00
Mike Macgirvin
d96ae0f9f5 can no longer avoid recording the curl response code 2010-10-13 22:01:23 -07:00
Mike Macgirvin
8424f31aad a bit more robust about loading external pics
also friend confirm was getting wrong email
2010-10-04 16:04:52 -07:00
Mike Macgirvin
e25e40f1ef i18n string extraction util 2010-09-29 18:11:23 -07:00
Mike Macgirvin
01d36785b0 fixed photo comments, msg typo, and changed cursor when hovering
over "special friends" where SSO is allowed
2010-09-27 19:48:45 -07:00
Mike Macgirvin
34eedb503a stronger type checking on comparisons 2010-09-26 17:24:20 -07:00
Mike Macgirvin
b91494d22e preliminary network abstraction, configurable debugging. 2010-09-26 16:30:21 -07:00
Mike Macgirvin
d5a13b1e4c localisation path for all view templates 2010-09-22 18:00:19 -07:00
Mike Macgirvin
188dc1fcf8 relationship direction was too confusing to work with. instead of "in,out,both" it's now declared by role e.g. "vip,fan,bud". 2010-09-21 19:51:08 -07:00
Mike Macgirvin
c5031139eb abstractify items, check photos for birthday paradox 2010-09-13 22:57:31 -07:00
Mike Macgirvin
7d5ace644e item wall flag => photos 2010-09-10 01:27:56 -07:00
Mike Macgirvin
ffb1997902 mistpark 2.0 infrasturcture lands 2010-09-08 20:14:17 -07:00
Mike Macgirvin
b02e30f1cf sort out notify x-domain 2010-08-22 20:57:20 -07:00
Mike Macgirvin
43adabcd20 multi-user fixes 2010-08-19 17:23:13 -07:00
Mike Macgirvin
e0045a43e2 mongo checkin, global directory, redir rework, location basics 2010-08-19 04:59:31 -07:00
Mike Macgirvin
facca43e2d no more url in cmdline 2010-08-16 20:47:40 -07:00
Mike Macgirvin
35e29e10e6 installer changes, pe sync 2010-08-15 21:49:29 -07:00
Mike Macgirvin
6fa5557994 post branch fixes 2010-08-09 22:58:58 -07:00
Mike Macgirvin
d11c1c63c0 lots of fixes - most recent photo updates for contacts 2010-08-08 21:03:08 -07:00
Mike Macgirvin
0bcd552231 photo album finish, general cleanup begins 2010-08-08 17:08:39 -07:00
Mike Macgirvin
c9d8211ae7 photo editing 2010-08-08 01:58:26 -07:00
Mike Macgirvin
5933f13ab7 default acl's 2010-08-07 23:54:22 -07:00
Mike Macgirvin
adce88e564 photo editing 2010-08-07 06:20:27 -07:00
Mike Macgirvin
4a7643b3ec allow 640 image to display directly, add album name to photo 2010-08-06 17:16:52 -07:00
Mike Macgirvin
a48efe0bc0 photo comments 2010-08-06 06:30:25 -07:00
Mike Macgirvin
72b20a6eb1 progress on photos 2010-08-05 21:15:24 -07:00