strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
5680 commits 2 branches 55 tags 148 MiB
Commit graph

5680 commits

This branch
This branch
All branches
Author SHA1 Message Date
Simon
ec85825509 Merge pull request #302 from simonlnu/master 
fix -desc again
 2012-05-19 00:16:44 -07:00
Simon L'nu
4a35a51724 fix -desc again 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-19 03:15:35 -04:00
Simon L'nu
2cee9ec5c8 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  profile change activity link bug

* master:
 2012-05-19 02:59:40 -04:00
friendica
4133df6223 profile change activity link bug 2012-05-18 17:55:11 -07:00
Simon L'nu
83f0807e59 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  apply max-width to images in posts, duepuntozero
  theming for default group selector
  catch more places to apply default group
  make it difficult to setup a private forum with no privacy
  more private forums, default privacy group for new contacts
  tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work

* master:
 2012-05-18 12:12:40 -04:00
friendica
3821744450 apply max-width to images in posts, duepuntozero 2012-05-18 01:46:02 -07:00
friendica
34b79b4f2b theming for default group selector 2012-05-18 01:38:11 -07:00
friendica
5ecaeb8e5c catch more places to apply default group 2012-05-18 01:03:46 -07:00
friendica
1d157fc747 make it difficult to setup a private forum with no privacy 2012-05-17 23:05:41 -07:00
friendica
7b0ded3f14 more private forums, default privacy group for new contacts 2012-05-17 22:44:52 -07:00
Simon L'nu
c024c17b5f Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  setup delivery chain for private groups (work in progress)
  bring in the *much better* xml parser from the original zot branch
  rev update
  merged from wrong project
  initial commit

* master:
 2012-05-17 23:01:46 -04:00
friendica
7cfa7a7671 tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work 2012-05-17 19:59:46 -07:00
friendica
d5d853f37f setup delivery chain for private groups (work in progress) 2012-05-17 19:35:24 -07:00
friendica
4f0e26759c bring in the *much better* xml parser from the original zot branch 2012-05-16 21:29:57 -07:00
friendica
f5f345d388 Merge https://github.com/friendica/friendica into pull 2012-05-16 13:55:00 -07:00
friendica
6744b5975c rev update 2012-05-16 13:52:11 -07:00
Simon
296c84d822 Merge pull request #301 from simonlnu/master 
fix admin links
 2012-05-16 10:34:30 -07:00
Simon L'nu
331013f281 fix admin links... 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-16 13:33:20 -04:00
friendica
d6add82b32 merged from wrong project 2012-05-16 05:08:15 -07:00
friendica
18f638c93e Merge https://github.com/friendica/friendica into pull 2012-05-16 04:59:15 -07:00
Simon
becfe1f6f7 Merge pull request #300 from simonlnu/master 
*sigh*. fix dark *again*
 2012-05-16 02:52:35 -07:00
Simon L'nu
a8a3732f05 *sigh*. fix dark *again* 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-16 05:51:29 -04:00
Simon
423864dc23 Merge pull request #299 from simonlnu/master 
get rid of the monstrosity for .button. need to find alternate solution
 2012-05-16 02:33:10 -07:00
Simon L'nu
7eb73bc600 get rid of the monstrosity for .button. need to find alternate solution 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-16 05:32:08 -04:00
Simon L'nu
2d6c6255f9 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-05-16 05:29:34 -04:00
Michael Vogel
f2c0c40f6e Merge remote branch 'upstream/master' 2012-05-16 08:24:46 +02:00
friendica
1900f4dd5b Merge https://github.com/friendica/friendica into pull 2012-05-15 23:15:29 -07:00
Michael
2b8c4df544 Merge branch 'master' of github.com:annando/friendica 2012-05-16 08:10:28 +02:00
Simon
a65bd73bf3 Merge pull request #298 from simonlnu/master 
slight re-design of wall stuff and css/font cleaning
 2012-05-15 23:01:20 -07:00
Simon L'nu
fca09c9d4c slight re-design of wall stuff and css/font cleaning 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-16 01:58:55 -04:00
friendica
1872cf2b2d Merge https://github.com/friendica/dir into dpull 2012-05-15 22:30:47 -07:00
Simon L'nu
a3137eec11 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  update tinymce to 3.5.0.1
  rev update
  DE strings
  slackr drop shadows extended
  Allow plugins to modify the contact photo menu
  rev update

* master:
 2012-05-15 23:40:35 -04:00
friendica
e39014a3a7 update tinymce to 3.5.0.1 2012-05-15 17:18:46 -07:00
friendica
205c09e4f0 rev update 2012-05-15 17:05:28 -07:00
friendica
1a1d950eb4 initial commit 2012-05-15 05:09:26 -07:00
Tobias Diekershoff
68dc7c3568 DE strings 2012-05-15 10:44:01 +02:00
friendica
0faa0c2ab1 slackr drop shadows extended 2012-05-14 21:45:37 -07:00
friendica
c53674d367 Merge https://github.com/friendica/friendica into pull 2012-05-14 20:36:27 -07:00
friendica
bd32693a90 Merge pull request #297 from mexon/upstream 
Allow plugins to modify the contact photo menu
 2012-05-14 18:57:55 -07:00
Matthew Exon
e574514e21 Allow plugins to modify the contact photo menu 2012-05-15 08:59:45 +08:00
friendica
2b471d6df3 rev update 2012-05-14 16:32:21 -07:00
Simon L'nu
2687f4377c Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-05-14 19:29:06 -04:00
Simon
59aefd9346 Merge pull request #296 from simonlnu/master 
finish dispy light colour fixes
 2012-05-13 21:33:07 -07:00
Simon L'nu
db5fe14241 finish dipsy light colour fixes 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-14 00:30:25 -04:00
Simon L'nu
fcf6d10efd Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  rev update

* master:
 2012-05-14 00:26:34 -04:00
friendica
c12ec1116b Merge https://github.com/friendica/friendica into pull 2012-05-13 16:40:46 -07:00
friendica
2bd4ff5705 rev update 2012-05-13 16:40:02 -07:00
Simon L'nu
39c042f4ea Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  diabook-theme: small fixes
  rename get_language() to get_browser_language()
  slackr drop shadows
  language detection library
  rev update

* master:
 2012-05-13 18:50:04 -04:00
tommy tomson
303856ce01 diabook-theme: small fixes 2012-05-13 20:51:39 +02:00
friendica
3811fe288f rename get_language() to get_browser_language() 2012-05-13 04:52:29 -07:00