MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
5706 commits 3 branches 0 tags 96 MiB
Commit graph

5706 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
friendica eaf028c9fb Merge https://github.com/friendica/friendica into pull 2012-05-12 22:20:03 -07:00
friendica e7813f22af slackr drop shadows 2012-05-12 22:19:29 -07:00
Simon L'nu f267a283b4 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-05-12 18:56:13 -04:00
Simon b506c6f073 Merge pull request #295 from simonlnu/master 
css fixes; new screenshots
 2012-05-12 15:55:37 -07:00
Simon L'nu 93dc96e2cf css fixes; new screenshots 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-12 18:53:01 -04:00
Simon L'nu 8853e53e29 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  Ĝisdatigis la esperantlingvan tradukaĵon al 100%.

* master:
 2012-05-12 18:50:53 -04:00
friendica 72d8e0459d Merge pull request #294 from mschmitt/master 
Esperanto at 100% again
 2012-05-12 15:01:05 -07:00
Simon L'nu 89df33f0a8 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  diabook-theme: fix in earthlayers
  diabook-theme: some fixes

* master:
 2012-05-12 15:55:03 -04:00
Martin Schmitt ae300bceb9 Ĝisdatigis la esperantlingvan tradukaĵon al 100%. 2012-05-12 16:56:31 +02:00
tommy tomson 9699d9cd01 diabook-theme: fix in earthlayers 2012-05-12 16:11:46 +02:00
tommy tomson 2882012e1b diabook-theme: some fixes 2012-05-12 13:50:22 +02:00
Simon f434bd7f0a Merge pull request #293 from simonlnu/master 
finished migrating dispy light - maybe
 2012-05-12 04:32:55 -07:00
Simon L'nu c6897d0dc4 finished migrating dispy light - maybe 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-12 07:29:36 -04:00
friendica 62727012d3 language detection library 2012-05-12 01:55:18 -07:00
friendica 99e4ea19e7 Merge https://github.com/friendica/friendica into pull 2012-05-12 01:28:04 -07:00
friendica aa83198611 rev update 2012-05-12 01:27:33 -07:00
Simon L'nu 534a93f81c Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  Darkzero - fixed notifications bar.
  diabook-theme: update mapquery and small fix
  diabook-theme: add "population density 2010"-layer to EarthLayers-box
  fix search/new against possible email leakage
  better test of email reply visibility
  diabook-theme:small fix
  moderated comment templates
  diabook-theme: small fix
  diabook-theme: include prv_message autocomplete
  fix PM replies after autocomplete changes
  add photos to PM autocomplete, improved appearance
  rev update
  diabook-theme: small fix

* master:
 2012-05-11 20:39:06 -04:00
Thomas Willingham 2454028ef6 Darkzero - fixed notifications bar. 2012-05-12 00:32:47 +01:00
tommy tomson 48c48d644f diabook-theme: update mapquery and small fix 2012-05-11 16:41:16 +02:00
tommy tomson 74e79a06a8 diabook-theme: add "population density 2010"-layer to EarthLayers-box 2012-05-11 14:56:59 +02:00
friendica 4e0b0d4e43 fix search/new against possible email leakage 2012-05-11 05:19:29 -07:00
friendica 20229ce187 better test of email reply visibility 2012-05-11 05:11:53 -07:00
friendica 49cd3f615d Merge https://github.com/friendica/friendica into pull 2012-05-11 04:05:25 -07:00
tommy tomson f9d5e602ac diabook-theme:small fix 2012-05-11 13:04:25 +02:00