]> git.mxchange.org Git - friendica.git/history - view/theme/dispy
projects / friendica.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge remote branch 'upstream/master'
[friendica.git] / view / theme / dispy /
2013-04-24 friendicaMerge https://github.com/friendica/friendica into pull tree | commitdiff
2013-04-23 friendicaMerge pull request #669 from fabrixxm/templateengine tree | commitdiff
2013-04-23 Fabrixxmmissing "templates" folders tree | commitdiff
2013-04-23 Fabrixxmtemplate: remove old 'internal' template files, move... tree | commitdiff
2013-02-17 Michael VogelMerge remote-tracking branch 'upstream/master' tree | commitdiff
2013-02-15 FabrixxmMerge remote branch 'friendica/master' tree | commitdiff
2013-02-07 fermionicMerge pull request #601 from fermionic/20130204-100... tree | commitdiff
2013-02-06 friendicaMerge pull request #605 from fermionic/20130204-events... tree | commitdiff
2013-02-06 friendicaMerge pull request #608 from fermionic/20130204-diabook... tree | commitdiff
2013-02-06 friendicaMerge pull request #602 from fermionic/20130204-permiss... tree | commitdiff
2013-02-06 friendicaMerge pull request #603 from fermionic/20130204-info... tree | commitdiff
2013-02-06 friendicaMerge pull request #600 from fermionic/20130204-message... tree | commitdiff
2013-02-06 friendicaMerge pull request #604 from fermionic/20130204-db... tree | commitdiff
2013-02-06 friendicaMerge pull request #606 from fermionic/20130204-themes... tree | commitdiff
2013-02-06 friendicaMerge pull request #607 from fermionic/20130204-attach... tree | commitdiff
2013-02-06 friendicaMerge pull request #609 from fermionic/20130204-move... tree | commitdiff
2013-02-05 friendicaMerge https://github.com/friendica/friendica into pull tree | commitdiff
2013-02-05 fermionicMerge pull request #599 from fermionic/20130129-colorbox tree | commitdiff
2013-02-05 Zach Prezkutaadd support for more file attachment types tree | commitdiff
2013-02-05 Zach Prezkutafinish updating themes for colorbox tree | commitdiff
2013-02-05 Zach Prezkutastarting switching to colorbox tree | commitdiff
2013-01-30 Thomas WillinghamDispy - remove head.tpl. It isn't actually required... tree | commitdiff
2013-01-29 FabrixxmMerge remote branch 'friendica/master' tree | commitdiff
2013-01-28 Tobias DiekershoffMerge branch 'master' of git://github.com/friendica... tree | commitdiff
2013-01-28 friendicaMerge pull request #594 from fermionic/20130127-add... tree | commitdiff
2013-01-28 friendicaMerge pull request #591 from fermionic/20130126-javascr... tree | commitdiff
2013-01-28 friendicaMerge pull request #592 from fermionic/20130126-richtex... tree | commitdiff
2013-01-28 friendicaMerge pull request #593 from fermionic/20130127-tinymce... tree | commitdiff
2013-01-27 Zach Prezkutatry to improve TinyMCE block handling tree | commitdiff
2013-01-26 Zach Prezkutaupdate smart templates tree | commitdiff
2013-01-26 Zach PrezkutaDecaf mobile: an (almost) Javascript-free theme tree | commitdiff
2013-01-20 Michael - piratica.euMerge branch 'master' of https://github.com/annando... tree | commitdiff
2013-01-20 Michael VogelMerge remote-tracking branch 'upstream/master' tree | commitdiff
2013-01-12 friendicaMerge https://github.com/friendica/friendica into pull tree | commitdiff
2013-01-12 fermionicMerge pull request #580 from fermionic/20130111-better... tree | commitdiff
2013-01-11 Zach Prezkutanewline at end of header tree | commitdiff
2013-01-11 Zach Prezkutaadd warning message about automatically generated templates tree | commitdiff
2013-01-11 friendicaMerge https://github.com/friendica/friendica into pull tree | commitdiff
2013-01-11 friendicaMerge pull request #578 from fermionic/20130110-update... tree | commitdiff
2013-01-11 Zach Prezkutause Python 2.4 compatible script; update Smarty templates tree | commitdiff
2013-01-04 friendicaMerge https://github.com/friendica/friendica into pull tree | commitdiff
2013-01-04 friendicaMerge pull request #570 from annando/master tree | commitdiff
2013-01-04 friendicaMerge pull request #574 from fermionic/20130103-always... tree | commitdiff
2013-01-03 Zach Prezkutanever use profile_load outside of a module's _init... tree | commitdiff
2012-12-31 friendicaMerge https://github.com/friendica/friendica into pull tree | commitdiff
2012-12-30 Michael VogelMerge remote-tracking branch 'upstream/master' tree | commitdiff
2012-12-30 Olaf ConradiMerge pull request #569 from oohlaf/fixes tree | commitdiff
2012-12-30 Olaf ConradiMerge branch 'master' into fixes tree | commitdiff
2012-12-29 Olaf ConradiFix browser prefetch in notifications menu tree | commitdiff
2012-12-26 friendicafix profile_vcard all themes tree | commitdiff
2012-12-26 friendicaMerge https://github.com/friendica/friendica into pull tree | commitdiff
2012-12-26 friendicaMerge pull request #557 from fermionic/20121224-install... tree | commitdiff
2012-12-26 fermionicMerge pull request #563 from fermionic/20121225-smarty... tree | commitdiff
2012-12-26 Zach Prezkutarevert unnecessary variable name changes tree | commitdiff
2012-12-25 fermionicMerge pull request #562 from fermionic/20121225-smarty... tree | commitdiff
2012-12-25 Zach Prezkutasome missed templates tree | commitdiff
2012-12-25 fermionicMerge pull request #561 from fermionic/20121225-smarty... tree | commitdiff
2012-12-25 Zach Prezkutasmall fixes; update smarty3 templates tree | commitdiff
2012-12-25 Zach Prezkutasimplify by making Smarty include directives behave... tree | commitdiff
2012-12-24 fermionicMerge pull request #558 from fermionic/20121222-use... tree | commitdiff
2012-12-24 fermionicMerge pull request #556 from fermionic/20121224-smarty3... tree | commitdiff
2012-12-24 Zach Prezkutachange field_*.tpl to * in some missed templates tree | commitdiff
2012-12-24 friendicaMerge pull request #555 from annando/master tree | commitdiff
2012-12-24 fermionicMerge pull request #554 from fermionic/20121222-use... tree | commitdiff
2012-12-24 Zach Prezkutacouple more places where file_get_contents was used tree | commitdiff
2012-12-24 fermionicMerge pull request #552 from annando/master tree | commitdiff
2012-12-23 fermionicMerge pull request #551 from fermionic/20121222-use... tree | commitdiff
2012-12-23 Zach Prezkutamissed a couple more template engine assignments tree | commitdiff
2012-12-23 fermionicMerge pull request #550 from fermionic/20121222-use... tree | commitdiff
2012-12-23 Zach Prezkutaonly use Smarty if the view/smarty3/ directory is writa... tree | commitdiff
2012-12-23 friendicaMerge https://github.com/annando/friendica into annando tree | commitdiff
2012-12-23 friendicaMerge https://github.com/friendica/friendica into pull tree | commitdiff
2012-12-23 friendicaMerge pull request #549 from fermionic/20121222-use... tree | commitdiff
2012-12-22 Zach PrezkutaImplement Smarty3 tree | commitdiff
2012-12-03 tobiasdMerge pull request #542 from annando/master tree | commitdiff
2012-12-03 Michael VogelMerge remote-tracking branch 'upstream/master' tree | commitdiff
2012-11-23 friendicaMerge https://github.com/friendica/friendica into pull tree | commitdiff
2012-11-23 friendicaMerge pull request #537 from fermionic/20121121-features tree | commitdiff
2012-11-22 Zach Prezkutaimplement features tree | commitdiff
2012-11-15 Michael VogelMerge remote-tracking branch 'upstream/master' tree | commitdiff
2012-11-14 friendicaMerge https://github.com/friendica/friendica into pull tree | commitdiff
2012-11-14 Thomas WillinghamEven shinier Dispy. tree | commitdiff
2012-11-14 friendicaMerge https://github.com/friendica/friendica into pull tree | commitdiff
2012-11-13 friendicaMerge pull request #533 from fabrixxm/moveme tree | commitdiff
2012-11-13 Thomas WillinghamMerge branch 'master' of https://github.com/friendica... tree | commitdiff
2012-11-13 Thomas WillinghamEverything is shiny (except frost and smoothly). tree | commitdiff
2012-11-11 Thomas WillinghamMerge branch 'master' of https://github.com/friendica... tree | commitdiff
2012-11-10 friendicaMerge pull request #531 from fabrixxm/master tree | commitdiff
2012-11-09 Michael VogelMerge remote-tracking branch 'upstream/master' tree | commitdiff
2012-11-09 friendicaMerge https://github.com/friendica/friendica into pull tree | commitdiff
2012-11-09 fermionicMerge pull request #530 from fermionic/20121108-dispy... tree | commitdiff
2012-11-09 Zach Prezkutafix help button position tree | commitdiff
2012-11-05 FabrixxmMerge remote-tracking branch 'remotes/friendica/master... tree | commitdiff
2012-11-04 Thomas WillinghamMerge remote-tracking branch 'upstream/master' tree | commitdiff
2012-11-03 friendicaMerge https://github.com/friendica/friendica into pull tree | commitdiff
2012-11-03 MichaelMerge remote-tracking branch 'upstream/master' tree | commitdiff
2012-11-02 fermionicMerge pull request #521 from fermionic/20121101-updates tree | commitdiff
2012-11-02 Zach Prezkutadisplay live update; don't collapse comments on live... tree | commitdiff
2012-11-01 Zach Prezkutaprevent double posting of status updates and comments tree | commitdiff
2012-10-29 FabrixxmMerge remote branch 'friendica/master' into moveme tree | commitdiff
next
Unnamed repository; edit this file 'description' to name the repository.