Commit Graph

20 Commits

Author SHA1 Message Date
Michael Vogel aed28a24f1 Merge remote-tracking branch 'upstream/master'
Conflicts:
	mod/crepair.php
2014-01-05 16:22:42 +01:00
Olaf Conradi 0c31ca6c29 Backport Nginx sample config from Red to Friendica 2013-11-13 00:29:12 +01:00
friendica f07df4f667 merge 2013-03-02 15:46:54 -08:00
Michael Vogel 93143702ed Merge remote-tracking branch 'upstream/master'
Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php
2013-02-17 12:35:40 +01:00
Zach Prezkuta 53e5592f9a move tpl scripts to util 2013-02-04 22:55:15 -07:00
Michael Vogel 2350aa54eb OStatus-Conversation auto completion works now.
Some performance issues added as well.
2013-01-30 01:31:27 +01:00
Olaf Conradi 492a42eebe Add ttf and svg to skip the front controller
This makes themes that rely on the correct mimetype work.
2013-01-15 10:28:24 +01:00
Zach Prezkuta 74caf1a4a7 * Add MIME types for file attachments
* Restore translatability to mood phrases
* Prevent casting of "false" in html2plain
* Allow attachments with a comma in the filename
* Fix/optimize ACL img data-src jQuery search
* Fix bug when uploading files with a comma in the name using Chrome/Chromium
* Babel nicer output formatting
* Remove obsolete "plaintext" check in mod/parse_url
* Restore TinyMCE live insertion of images
* Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files
2013-01-12 06:31:32 -07:00
Zach Prezkuta c43ff35fe7 newline at end of header 2013-01-11 10:00:10 -07:00
Zach Prezkuta 1656c63a55 add warning message about automatically generated templates 2013-01-11 09:57:11 -07:00
Zach Prezkuta f24d460522 automatic, command-line conversion 2013-01-11 09:41:45 -07:00
Zach Prezkuta cd017282e4 use Python 2.4 compatible script; update Smarty templates 2013-01-10 22:34:23 -07:00
Zach Prezkuta 96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07:00
Olaf Conradi c490074589 Typos 2012-12-15 16:43:24 +01:00
Olaf Conradi 30b5e08eb6 Fix rewrite rules to pass arguments
Fix location regex for extensions to end with $
Add more comments
2012-12-15 16:21:50 +01:00
Olaf Conradi b38b62f759 Modify nginx sample to a real config file 2012-12-15 16:01:20 +01:00
friendica 6faadc9662 anybody can see the "remove category" link, though it doesn't do anything if you aren't the owner. Can't believe this has gone so long without being reported. 2012-12-13 14:15:18 -08:00
friendica 6fb49a4de9 nginx config update 2012-12-12 19:44:59 -08:00
friendica 5d757b0668 add sample nginx config from Olaf Conradi to mods directory 2012-12-12 15:54:13 -08:00
Michael Vogel dc416e5887 Moving the index creation commands into a readme file due to the fact that creating of these indexes is really slow. 2012-07-26 07:38:51 +02:00