]> git.mxchange.org Git - friendica.git/history - library
Merge pull request #1354 from tobiasd/20150204_defr
[friendica.git] / library /
2015-01-04 Michael VogelMerge remote-tracking branch 'upstream/develop' into...
2015-01-04 Michael VogelMerge remote-tracking branch 'upstream/develop' into...
2015-01-04 Tobias DiekershoffMerge pull request #1279 from annando/1501-wrong-encoding
2015-01-04 Michael VogelThe "scrape" bugfix lead to partly damaged encodings...
2014-12-27 haukeMerge branch 'develop' of https://github.com/friendica...
2014-12-24 Fabio ComuniMerge branch 'release-3.3.2'
2014-12-20 Michael VogelMerge remote-tracking branch 'upstream/develop' into...
2014-12-10 fabrixxmMerge branch 'develop' into release-3.3.2
2014-12-10 tobiasdMerge pull request #1242 from annando/1412-stale-gprobe
2014-12-08 Michael VogelMoving the clean up code to a central place.
2014-11-18 Michael VogelMerge branch 'develop' of github.com:annando/friendica...
2014-09-07 fabrixxmMerge pull request #1123 from fabrixxm/mail_notificatio...
2014-09-07 fabrixxmMerge pull request #1124 from tobiasd/duepuntoderivs
2014-09-07 fabrixxmMerge pull request #1122 from tugelbend/master
2014-09-07 haukeremoved fancybox as it is not used anywhere
2014-09-07 haukeupdate of fullcalender to v1.6.4
2014-09-07 fabrixxmMerge remote-tracking branch 'friendica/master' into...
2014-09-07 haukereverting tinymce changes, updating smarty to 3.1.19
2014-09-07 haukeMerge branch 'master' of https://github.com/friendica...
2014-09-07 haukeupdated tinymce to 3.5.11
2014-09-06 haukeMerge branch 'feature/2014-09-hackathon-ui-improvements...
2014-09-06 tobiasdMerge pull request #1108 from tugelbend/master
2014-09-06 haukeMerge branch 'release/jquery-update'
2014-09-06 haukeupdated jquery to version 1.11, updated themes frost...
2014-09-04 BeanowMerge branch 'feature/edit-profile-improvements' into...
2014-08-10 tobiasdMerge pull request #1067 from Beanow/feature/noscrape
2014-07-25 tobiasdMerge pull request #1057 from annando/master
2014-07-24 Michael VogelMerge remote-tracking branch 'upstream/master'
2014-07-24 Michael VogelRemoving of some warnings
2014-06-22 tobiasdMerge pull request #1028 from tugelbend/master
2014-05-12 fabrixxmMerge pull request #954 from fabrixxm/issue_936
2014-05-09 tobiasdMerge pull request #956 from annando/master
2014-04-29 Michael VogelMerge remote-tracking branch 'upstream/master'
2014-04-28 Michael VogelNew database system that uses PDO if present/Test scrip...
2014-01-06 fabrixxmMerge pull request #886 from fabrixxm/illegaloffset
2014-01-06 tobiasdMerge pull request #884 from annando/master
2014-01-05 Michael VogelMerge remote-tracking branch 'upstream/master'
2013-08-23 fabrixxmMerge pull request #749 from mexon/fetch_url_cookies
2013-08-06 fabrixxmMerge pull request #744 from annando/master
2013-08-05 Michael VogelMerge remote-tracking branch 'upstream/master'
2013-08-02 fabrixxmMerge pull request #745 from mexon/redirect_fix
2013-07-28 Michael VogelPreparations for a more visible reshare when exporting...
2013-06-13 friendicaMerge https://github.com/friendica/friendica into pull
2013-06-08 Michael VogelMerge remote-tracking branch 'upstream/master'
2013-06-02 friendicaMerge pull request #689 from fermionic/20130601-cropper...
2013-06-01 Zach Prezkutaeliminate Cropper conflicts with jQuery
2013-05-17 Michael VogelMerge remote-tracking branch 'upstream/master'
2013-05-12 friendicaMerge https://github.com/friendica/friendica into pull
2013-05-11 fermionicMerge pull request #678 from fermionic/20130511-update...
2013-05-11 Zach Prezkutaupdate to v4.0.0; point to local host of SWF
2013-05-11 fermionicMerge pull request #674 from fermionic/20130503-basic...
2013-05-04 Zach Prezkutabasic video playback support using VideoJS
2013-04-30 friendicaMerge pull request #672 from cpfeiffer/email-notificati...
2013-04-29 tobiasdMerge pull request #670 from fabrixxm/help
2013-04-28 friendicaMerge https://github.com/friendica/friendica into pull
2013-04-27 friendicaMerge pull request #671 from cpfeiffer/OAuthException
2013-04-27 Carsten PfeifferWrap class OAuthException with !class_exists
2013-03-10 fermionicMerge pull request #646 from annando/master
2013-03-07 Michael VogelMerge remote-tracking branch 'upstream/master'
2013-03-06 tobiasdMerge pull request #643 from annando/master
2013-03-05 tobiasdMerge pull request #645 from tobiasd/master
2013-03-05 Tobias DiekershoffTwitter API 1.1
2013-03-04 fermionicMerge pull request #644 from fermionic/20130303-no...
2013-03-03 Michael VogelMerge remote-tracking branch 'upstream/master'
2013-03-03 friendicaMerge pull request #642 from oohlaf/master
2013-03-03 Olaf ConradiIgnore invalid tokens when scraping an URL
2013-02-17 Michael VogelUpdated from master
2013-02-17 Michael VogelMerge remote-tracking branch 'upstream/master'
2013-02-15 FabrixxmMerge remote branch 'friendica/master'
2013-02-07 fermionicMerge pull request #601 from fermionic/20130204-100...
2013-02-06 friendicaMerge pull request #605 from fermionic/20130204-events...
2013-02-06 friendicaMerge pull request #608 from fermionic/20130204-diabook...
2013-02-06 friendicaMerge pull request #602 from fermionic/20130204-permiss...
2013-02-06 friendicaMerge pull request #603 from fermionic/20130204-info...
2013-02-06 friendicaMerge pull request #600 from fermionic/20130204-message...
2013-02-06 friendicaMerge pull request #604 from fermionic/20130204-db...
2013-02-06 friendicaMerge pull request #606 from fermionic/20130204-themes...
2013-02-06 friendicaMerge pull request #607 from fermionic/20130204-attach...
2013-02-06 friendicaMerge pull request #609 from fermionic/20130204-move...
2013-02-05 friendicaMerge https://github.com/friendica/friendica into pull
2013-02-05 fermionicMerge pull request #599 from fermionic/20130129-colorbox
2013-02-05 Zach Prezkutaupdate minified javascripts
2013-02-05 Zach Prezkutaadd colorbox
2013-02-03 Michael VogelOStatus conversation are now checked every 30 minutes...
2013-01-29 FabrixxmMerge remote branch 'friendica/master'
2013-01-28 Tobias DiekershoffMerge branch 'master' of git://github.com/friendica...
2013-01-28 friendicaMerge pull request #594 from fermionic/20130127-add...
2013-01-28 friendicaMerge pull request #591 from fermionic/20130126-javascr...
2013-01-28 friendicaMerge pull request #592 from fermionic/20130126-richtex...
2013-01-28 friendicaMerge pull request #593 from fermionic/20130127-tinymce...
2013-01-28 Zach Prezkutasome deleted files for tinymce update
2013-01-27 Zach PrezkutaTinyMCE 3.5.8 update; some fixes
2013-01-24 friendicaMerge https://github.com/friendica/friendica into pull
2013-01-23 fabrixxmMerge pull request #589 from fabrixxm/master
2013-01-22 Fabrixxmupdate fancybox, remove tiptip from head.tpl
2012-12-03 tobiasdMerge pull request #542 from annando/master
2012-12-03 Michael VogelMerge remote-tracking branch 'upstream/master'
2012-11-23 friendicaMerge pull request #537 from fermionic/20121121-features
2012-11-22 friendicafurther jenkins include fixes
2012-11-04 Thomas WillinghamMerge remote-tracking branch 'upstream/master'
next