Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 23:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6149 commits 7 branches 30 tags 160 MiB
Commit graph

6149 commits

This branch
This branch
All branches
Author SHA1 Message Date
friendica
c148455570 use include/language.php for all language and translation code 2012-07-16 01:26:26 -07:00
friendica
945ac38a73 contact edit slider 2012-07-15 22:44:05 -07:00
friendica
92d4e6ebb3 change readme 2012-07-15 21:41:23 -07:00
friendica
f83a504da1 more work on json notifications, now working except for notify popup 2012-07-15 21:06:07 -07:00
friendica
03209d2d0d updates 2012-07-14 20:39:46 -07:00
friendica
a20a637727 merge upstream, slider work, refactor ping module, language selection work 2012-07-13 07:09:29 -07:00
friendica
599f3d2961 add plink to profile change notifications 2012-07-12 16:53:42 -07:00
friendica
3f7b93ce65 language detection and sparkle links added to plinks where appropriate 2012-07-12 03:50:05 -07:00
friendica
bb6d8e9597 don't need this one right now 2012-07-11 18:13:32 -07:00
friendica
10c517da0c use the colour wheel 2012-07-11 18:11:05 -07:00
friendica
9ac32c49e2 move saved searches to new taxonomy 2012-07-11 17:54:00 -07:00
friendica
3f414aec63 get rid of special "short salmon key" for statusnet 2012-07-11 16:54:18 -07:00
friendica
71afdf3d9c gracefully recover from datetime constructor issues 2012-07-11 16:20:17 -07:00
friendica
6105211e73 catchup 2012-07-11 04:29:47 -07:00
friendica
31c218e785 catchup 2012-07-10 20:44:17 -07:00
friendica
cc35457971 add icons 2012-07-10 19:29:10 -07:00
friendica
e7957e1448 create fetch_tags function, make search work again, change logo 2012-07-10 19:28:02 -07:00
friendica
94fabe3a29 upstream fixes and a lot of taxonomy stuff 2012-07-10 06:28:02 -07:00
friendica
1215de575d slider 2012-07-09 23:23:20 -07:00
friendica
5355193b63 theme cleanup 2012-07-09 22:48:51 -07:00
friendica
4b066e04f6 making tags work 2012-07-09 22:08:25 -07:00
friendica
8855cb9c28 identity address is now a web-id or "webbie" 2012-07-09 06:11:58 -07:00
friendica
95fdba753c remove bookmark content flag 2012-07-08 03:38:10 -07:00
friendica
8c3703c4f9 Merge branch 'master' of file:////home/macgirvin/dev 
Conflicts:
	boot.php
 2012-07-07 22:04:31 -07:00
friendica
1965c70769 begin divergence 2012-07-07 22:03:21 -07:00
friendica
63f10f6c6b Merge https://github.com/friendica/friendica into pull 2012-07-07 21:55:15 -07:00
friendica
a3640b4e9f Merge pull request #381 from fermionic/embed-multiple-private-photos 
Embed multiple private photos
 2012-07-07 21:15:52 -07:00
Zach Prezkuta
6d10374c17 cleanup 2012-07-07 18:50:46 -06:00
Zach Prezkuta
da2ccebed8 fix bugs 2012-07-07 18:50:33 -06:00
friendica
e94f7ed23d rev update 2012-07-07 16:20:34 -07:00
Zach Prezkuta
173b3a1b9a allow more than one embedded private photo 2012-07-07 16:24:20 -06:00
Zach Prezkuta
57635e7684 add function to exclude embedded images when checking message length 2012-07-07 16:24:20 -06:00
friendica
0c5af9f303 Merge pull request #379 from fermionic/events-display-wrong-in-diaspora 
remove check for event description in bb2diaspora
 2012-07-07 04:19:15 -07:00
friendica
7788a93258 Merge pull request #380 from copyninja/master 
orient function should not be called on png image types
 2012-07-07 04:18:13 -07: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
4fb996d9f7 remove check for event description, since it's not required to create an event 2012-07-06 17:11:25 -06:00
Vasudev Kamath
ba4db236ec Merge branch 'master' of git://github.com/friendica/friendica 2012-07-06 22:47:27 +05:30
friendica
a122fecf50 add additional page types to admin user report 2012-07-05 22:30:13 -07:00
friendica
8b19168999 a bit more colour 2012-07-05 22:20:27 -07:00
friendica
a6514e81bb remove obsolete zot encapsulation functions 2012-07-05 20:58:45 -07:00
friendica
868e04f5eb Merge pull request #378 from fermionic/apparent-typo-in-function-name 
my php thinks this is a typo
 2012-07-05 19:56:38 -07:00
Zach Prezkuta
47c7fd89ba my php thinks this is a typo 2012-07-05 20:39:22 -06:00
friendica
a71365d566 Merge pull request #377 from fermionic/local-delete-blank-out-title-and-body 
clear title and body of items on local delete
 2012-07-05 19:14:27 -07:00
Zach Prezkuta
5395cf5bd9 clear title and body of items on local delete 2012-07-05 20:07:01 -06:00
friendica
854abcf612 Merge pull request #376 from fermionic/diaspora-prevent-fcontact-race-conditions 
slightly better way of handling last loop
 2012-07-05 18:10:32 -07:00
Zach Prezkuta
528d250ded slightly better way of handling last loop 2012-07-05 19:08:30 -06:00
friendica
09959b1b1c Merge pull request #375 from fermionic/diaspora-prevent-fcontact-race-conditions 
add some timeouts to prevent deadlock
 2012-07-05 18:05:32 -07:00
Zach Prezkuta
5dcce1ed93 add some timeouts to prevent deadlock 2012-07-05 19:01:13 -06:00
friendica
d7920c4c25 term (tag, mention, category, file, etc.) table 2012-07-05 17:59:56 -07:00
friendica
8af78079cb Merge https://github.com/friendica/friendica into pull 2012-07-05 16:06:43 -07:00