Commit graph

4491 commits

Author SHA1 Message Date
friendica 528d795fb6 ability to change tags in edited posts 2012-03-22 16:17:10 -07:00
friendica 622b25df5f Merge branch 'pull' 2012-03-22 06:20:32 -07:00
friendica 40d19d5b8c normalise comparison link on delegation page 2012-03-22 06:19:27 -07:00
Tobias Diekershoff 586c07681b Merge branch 'master' of https://github.com/friendica/friendica 2012-03-22 14:10:53 +01:00
Tobias Diekershoff 07c5b0af5a quattro(-green) styling the 'filed under: remove' text 2012-03-22 14:09:21 +01:00
friendica c7dcc58673 Merge pull request #157 from campino/master
Tests for the template engine
2012-03-22 05:49:08 -07:00
Tobias Diekershoff 1e86e3fb26 it's only item.filer ;-) 2012-03-22 13:46:05 +01:00
Tobias Diekershoff 5babf5c8b4 Merge branch 'quattrofiler' 2012-03-22 13:42:10 +01:00
Tobias Diekershoff 6df7fae4b5 non static filer text 2012-03-22 13:41:41 +01:00
Tobias Diekershoff 19eaed60d5 Merge branch 'master' of https://github.com/friendica/friendica 2012-03-22 13:38:59 +01:00
Alexander Kampmann 9ba5fff865 new lines removed 2012-03-22 13:05:34 +01:00
Alexander Kampmann 43f672877f removed some new lines to cut down number of changed files 2012-03-22 13:03:28 +01:00
Alexander Kampmann ad9d0dadb3 removed unneccessary stuff 2012-03-22 12:52:24 +01:00
Alexander Kampmann cea7ca1df4 Merge branch 'master' of git://github.com/friendica/friendica
Conflicts:
	boot.php
	database.sql
	include/template_processor.php
	update.php
2012-03-22 12:50:02 +01:00
Alexander Kampmann 29900febb3 removed problem from previous commit 2012-03-22 12:45:11 +01:00
Alexander Kampmann f208e7af36 tests for the template engine 2012-03-22 12:43:03 +01:00
Tobias Diekershoff 54c08b2b0f adding filer functionality to quattro(-green) 2012-03-22 12:41:51 +01:00
friendica 808180ce5f missing tooltip for "file as" 2012-03-22 04:07:37 -07:00
Tobias Diekershoff 5f7715529d Merge branch 'master' of https://github.com/friendica/friendica 2012-03-22 11:54:09 +01:00
friendica ebdf0ee99e prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms 2012-03-22 01:46:52 -07:00
tomtom84 576eb6cc38 Merge pull request #156 from tomtom84/master
fixes in diabook-derivates
2012-03-21 22:57:29 -07:00
tommy tomson e37c4f69b4 add file_as-option to diabook-derivates 2012-03-22 06:54:18 +01:00
Tobias Diekershoff 5189a56ef8 Merge branch 'master' of https://github.com/friendica/friendica 2012-03-22 06:27:13 +01:00
friendica d81256d7b0 support lowercase :-p smilie 2012-03-21 21:45:45 -07:00
friendica ec890f3ce2 Merge branch 'pull' 2012-03-21 21:43:10 -07:00
friendica f1bbe03df1 work around doubled linefeeds in tinymce3.5b2 2012-03-21 21:42:27 -07:00
tomtom84 294d39f96f Merge pull request #155 from tomtom84/master
fixes in diabook-derivates
2012-03-21 20:39:19 -07:00
tommy tomson 72d0756fa6 add icons to aside diabook, fixes in css 2012-03-22 04:33:21 +01:00
friendica c1d6ece98e revert permissions relaxation on community 2012-03-21 14:56:06 -07:00
friendica 89028f2e2f add comix-plain 2012-03-21 13:55:37 -07:00
friendica 56495e04b2 smooth the comix comment box 2012-03-21 06:48:04 -07:00
friendica 3ad02a749b make autocomplete work with updated tinymce 2012-03-21 05:27:08 -07:00
friendica 1a98f3c067 ika to ica 2012-03-21 00:35:33 -07:00
friendica 86d8d3f442 private file in repository 2012-03-21 00:34:12 -07:00
friendica adcf52d02d facepark is unsupported ATM 2012-03-21 00:08:06 -07:00
friendica db02eebde1 Merge branch 'pull' 2012-03-20 23:59:02 -07:00
friendica 6c7b619b34 remove stray template variable from old code 2012-03-20 23:57:33 -07:00
friendica efd7c14c24 Merge pull request #154 from tonybaldwin/master
added theme
2012-03-20 23:31:12 -07:00
friendica 0dc4c3f484 add comix theme 2012-03-20 22:54:20 -07:00
friendica 4d39b0658f use password field for DB input 2012-03-20 22:53:19 -07:00
tony baldwin e5c29fcc78 Merge remote branch 'upstream/master' 2012-03-21 01:36:23 -04:00
tony baldwin cf17606d0f added Vijay's theme from facepark.in 2012-03-21 01:33:48 -04:00
friendica b4a2dae085 added README to mcefixes to explain what is going on. 2012-03-20 21:04:09 -07:00
friendica f55779fd83 update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks 2012-03-20 20:47:31 -07:00
friendica 810e69ef0a more friend suggestions 2012-03-20 19:06:26 -07:00
friendica ef33cfcc9a move friend suggestions to top of contact page, add default contact profile photos if missing 2012-03-20 16:05:32 -07:00
friendica def0e35e21 Merge branch 'pull' 2012-03-20 15:45:32 -07:00
friendica a72a23b6d6 missed a default profile photo replacement in notifications 2012-03-20 15:43:34 -07:00
friendica 894278dbcc change default profile photo to something more interesting than a reddish brown square 2012-03-20 15:41:06 -07:00
friendica 92ef36ad61 slightly relax overly strict permissions in community and search to match those in display - tl;dr public conversations are publicly visible 2012-03-20 14:55:18 -07:00