mexon/friendica
1
0
Fork 0
Code Pull requests Activity
6113 commits 5 branches 60 tags 188 MiB
Commit graph

6113 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
friendica 9951071b5b rev update 2012-07-05 16:06:01 -07:00
friendica fe984963ed Merge pull request #373 from fermionic/more-list-fixes 
fix small bug in lists and revert Diaspora list processing to non-Markdo...
 2012-07-05 16:03:29 -07:00
friendica 10336651ba Merge pull request #374 from fermionic/diaspora-prevent-fcontact-race-conditions 
Prevent fcontact race conditions
 2012-07-05 15:57:28 -07:00
Zach Prezkuta 2edfc3b539 final db updates after testing 2012-07-05 14:31:19 -06:00
Zach Prezkuta e0607e0238 cleanup some syntax errors in lock.php 2012-07-05 14:27:29 -06:00
Zach Prezkuta 75ed37fb3d "lock" is a reserved MySQL keyword 2012-07-05 14:27:29 -06:00
Zach Prezkuta 46068935d0 minor cleanup in lock.php 2012-07-05 14:26:42 -06:00
Zach Prezkuta 20c4ecbcd9 cleanup obsolete comments 2012-07-05 14:26:42 -06:00
Zach Prezkuta 168ae40dd2 add rudimentary locking capability to Friendica functions 2012-07-05 14:26:42 -06:00
Zach Prezkuta 041aeaf4a1 fix small bug in lists and revert Diaspora list processing to non-Markdownify version 2012-07-05 12:54:52 -06:00
friendica 360c35e438 recycle symbol woes with multiple html entity encode/decode cycles going on 2012-07-04 23:24:59 -07:00
friendica e29dd081ca render the recycle symbol correctly on Diaspora reshares 2012-07-04 22:44:04 -07:00
friendica f40b056e3b some initial code and benchmarking for "red" content rendering engine 2012-07-04 20:37:15 -07:00
friendica 0990269555 restore translation of bbcode videos, events, bookmarks, etc. to diaspora 2012-07-04 19:12:09 -07:00
friendica 5589bca1e0 fix !@#$ tinymce linebreaks for the thousandth time 2012-07-04 17:15:43 -07:00
friendica fd626022ec add smarty engine, remove some obsolete zot1 stuff 2012-07-03 22:23:08 -07:00
friendica 13b4962531 Merge https://github.com/friendica/friendica into pull 2012-07-03 21:41:05 -07:00
friendica c726a92a3f punycode hostname 2012-07-03 21:40:13 -07:00
Thomas Willingham badaa68340 Diabook directory wide variants. 2012-07-04 01:08:50 +01:00
friendica b550b1326b Merge https://github.com/friendica/friendica into pull 2012-07-03 16:26:58 -07:00
friendica 7926a0d171 add link to shares 2012-07-03 16:26:14 -07:00
Thomas Willingham e3828fe675 Merge pull request #372 from rdc/master 
Resolved CSS error in sidebar profile thumbs
 2012-07-03 12:58:57 -07:00
Zvi ben Yaakov (a.k.a rdc) 424797138f Limiting .directory-photo-wrapper styles to <section> so as not to 
interfere with .directory-photo-wrapper in <aside>
 2012-07-03 21:49:02 +03:00
friendica 14d4635be6 Merge pull request #371 from fermionic/option-to-limit-max-image-pixel-length 
add ability to set maximum pixel length of uploaded pictures
 2012-07-02 19:12:58 -07:00
Zach Prezkuta 3fe5bdbd8d add ability to set maximum pixel length of uploaded pictures 2012-07-02 20:01:23 -06:00
friendica f7144e671c fix diabook directory pages (only the normal style - any volunteers for the wide?) 2012-07-02 16:56:37 -07:00
friendica ced0a208d8 fix double lines 2012-07-02 16:34:01 -07:00
friendica 64fc1318c6 Merge https://github.com/friendica/friendica into pull 2012-07-02 01:13:30 -07:00
friendica 315784444a try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up to harder stuff 2012-07-02 01:11:19 -07:00
friendica a9c65dfe27 "babel" diagnostic - convert bbcode to different formats and back again 2012-07-01 23:00:25 -07:00
Thomas Willingham 610c78f9e0 Merge branch 'master' of https://github.com/friendica/friendica 2012-07-02 03:41:27 +01:00
Thomas Willingham 74a819980f Various theme stuff. 
Profile group list for testbubble
Screenshot for facepark
Various niggles in darkzero/NS
 2012-07-02 03:40:12 +01:00
friendica ab2b3304dc ...and the other bit 2012-07-01 19:40:03 -07:00
friendica e2a725ff98 pagination start off by one 2012-07-01 19:17:21 -07:00
friendica dd71f9446b config to disable email validation 2012-07-01 18:56:00 -07:00
friendica 696d78d658 Merge pull request #369 from rdc/master 
Added more profile data and CSS styling to the /directory page
 2012-07-01 16:44:21 -07:00