Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-16 03:33:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
6074 commits 3 branches 64 tags 246 MiB
Commit graph

6074 commits

This branch
This branch
All branches
Author SHA1 Message Date
zottel
5fadf68fb4 Merge remote branch 'upstream/master' 2012-03-23 08:39:00 +01:00
tommy tomson
7706a8f9d8 small fix 2012-03-23 07:28:48 +01:00
tomtom84
149b3f3018 Merge pull request #159 from tomtom84/master 
fixes in theme diabook
 2012-03-22 23:03:55 -07:00
tommy tomson
687fa80094 fix 1024resolution 2012-03-23 07:02:21 +01:00
friendica
42d231f8bf Merge pull request #158 from tomtom84/master 
add right_aside to theme diabook ... need author
 2012-03-22 20:19:44 -07:00
tommy tomson
bf4dd8ad17 add right_aside to theme diabook 2012-03-23 02:36:34 +01:00
friendica
528d795fb6 ability to change tags in edited posts 2012-03-22 16:17:10 -07:00
zottel
e7d80a79ff Merge remote branch 'upstream/master' 2012-03-22 16:03:14 +01:00
Fabio Comuni
d5a6e7b176 Merge remote-tracking branch 'friendica/master' 2012-03-22 14:56:23 +01: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
zottel
3f3c4aec79 Merge remote branch 'upstream/master' 2012-03-22 09:16:10 +01: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
Simon L'nu
8e29669b81 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  support lowercase :-p smilie
  work around doubled linefeeds in tinymce3.5b2
  add icons to aside diabook, fixes in css
  revert permissions relaxation on community
  add comix-plain
  smooth the comix comment box
  make autocomplete work with updated tinymce
  ika to ica
  private file in repository
  facepark is unsupported ATM
  remove stray template variable from old code
  add comix theme
  use password field for DB input
  added Vijay's theme from facepark.in
  added README to mcefixes to explain what is going on.
  update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks
  more friend suggestions

* master:
 2012-03-22 01:29:55 -04: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
Michael Vogel
792edfe9c8 New parameter in html2plain for plain text exports. More compatibility in API 2012-03-21 10:08:40 +01: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
zottel
88bbc5e0bc Merge remote branch 'upstream/master' 2012-03-21 08:08:23 +01: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