Commit graph

4280 commits

Author SHA1 Message Date
Simon L'nu
467aa66d37 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:

* master:
2012-03-11 10:25:39 -04:00
Simon
ac2a81a273 Merge pull request #122 from simonlnu/master
add some '@media handheld' types for dispys
2012-03-11 07:25:27 -07:00
Simon L'nu
fa0cb8514d add some '@media handheld' types for dispys
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:24:49 -04:00
Simon
48306e1fae Merge pull request #121 from simonlnu/master
fix more stuff
2012-03-11 07:15:35 -07:00
Simon L'nu
62fe48f064 fix more stuff
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:14:31 -04:00
Simon
076393c9e7 Merge pull request #120 from simonlnu/master
fix some stuff right away
2012-03-11 06:13:10 -07:00
Simon L'nu
57d8370376 fix some stuff right away
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 09:12:31 -04:00
Tobias Hößl
4df08433c6 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-11 11:27:47 +00:00
Simon
50863a19eb Merge pull request #119 from simonlnu/master
preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
2012-03-10 22:33:40 -08:00
Simon L'nu
f7ade749b8 preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 01:32:11 -05:00
Simon L'nu
dfdf0f1335 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  bug #328
  default the text template var on conversations
  bug #327 - composed private message is lost if no recip specified.
  revup
  fixed login-fields, fixed. notofication.png, changed locations
  German translation

* master:
2012-03-11 01:24:59 -05:00
friendica
5915325367 bug #328 2012-03-10 18:52:50 -08:00
friendica
d9c5d9d2eb default the text template var on conversations 2012-03-10 15:53:36 -08:00
friendica
1bddd48661 bug #327 - composed private message is lost if no recip specified. 2012-03-10 15:50:51 -08:00
friendica
4f606ff633 Merge branch 'pull' 2012-03-10 14:45:23 -08:00
friendica
20d1a16dbb revup 2012-03-10 14:44:43 -08:00
tomtom84
c79cb57e1e Merge pull request #118 from tomtom84/master
fixes in diabook-derivates
2012-03-10 04:24:49 -08:00
tommy tomson
0f3255467e fixed login-fields, fixed. notofication.png, changed locations 2012-03-10 13:22:41 +01:00
1e37477fdc German translation 2012-03-10 10:36:20 +01:00
Simon L'nu
665ad7e660 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  spec directory
  allow user to set number of items to show on network page
  revup

* master:
2012-03-10 00:15:29 -05:00
friendica
d50a839c04 Merge branch 'pull' 2012-03-09 19:50:45 -08:00
friendica
0e3b9097f6 spec directory 2012-03-09 19:50:31 -08:00
friendica
a374bbcf81 Merge pull request #117 from unary/issue299
allow user to set number of items to show on network page
2012-03-09 19:42:52 -08:00
Michael Johnston
fd1f8fb436 allow user to set number of items to show on network page 2012-03-09 21:29:39 -05:00
Simon L'nu
686fe47b88 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  add js to hide nav-menus, when clicked outside
  fixes in css
  recover contacts total count which got lost
  bug #324 - tinymce used for mail even if editplain being used.
  bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed
  keep tony from talking to himself

* master:
2012-03-09 19:02:29 -05:00
friendica
a02ffbcc86 Merge branch 'pull' 2012-03-09 14:44:29 -08:00
friendica
92a93642e1 revup 2012-03-09 14:43:48 -08:00
tomtom84
68ca29719e Merge pull request #116 from tomtom84/master
fixes in diabook-derivates
2012-03-09 09:17:01 -08:00
tommy tomson
8fe4645a5d add js to hide nav-menus, when clicked outside 2012-03-09 18:15:27 +01:00
tomtom84
68541b5dd2 Merge pull request #115 from tomtom84/master
fixes in diabook-derivates
2012-03-09 04:24:59 -08:00
tommy tomson
9f441731af fixes in css 2012-03-09 13:23:38 +01:00
friendica
42d622d6bf recover contacts total count which got lost 2012-03-09 02:50:57 -08:00
Tobias Hößl
635958e11d Merge branch 'master' of git://github.com/friendica/friendica 2012-03-09 10:00:12 +00:00
friendica
2ce78253ae Merge branch 'pull' 2012-03-09 00:48:16 -08:00
friendica
3878b58f0d bug #324 - tinymce used for mail even if editplain being used. 2012-03-09 00:47:10 -08:00
friendica
312c175045 bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed 2012-03-09 00:31:17 -08:00
Simon
d050762e4d Merge pull request #114 from simonlnu/master
[theme:dispy] optimised the pngs: bet. 0 and 30% savings in size.
2012-03-08 21:28:35 -08:00
Simon L'nu
81f5b0e2df [theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style label elemnts.
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-09 00:26:54 -05:00
friendica
2050f886cc keep tony from talking to himself 2012-03-08 21:14:41 -08:00
Simon
0188e2b3ee Merge pull request #113 from simonlnu/master
dispy stable enough to be considered stable IMO
2012-03-08 21:03:16 -08:00
Simon L'nu
dc8d060d4d i consider dispy pretty stable at this point, so i'm removing the experimental file
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-09 00:00:56 -05:00
Simon L'nu
20b2090182 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  removed info
  add info
  fixed star-bug
  More improved transparency for smilies
  removed dolphin file (wtf?)
  .

* master:
2012-03-08 23:59:43 -05:00
tomtom84
e25fb2b2f9 Merge pull request #112 from tomtom84/master
fixes in diabook-derivates
2012-03-08 19:39:39 -08:00
tommy tomson
e06b941307 removed info 2012-03-09 04:38:20 +01:00
tomtom84
92ab98f8d8 Merge pull request #111 from tomtom84/master
fixes in diabook-derivates
2012-03-08 19:16:01 -08:00
tommy tomson
722f631d15 add info 2012-03-09 04:14:24 +01:00
friendica
ab900eb59e Merge pull request #109 from beardy-unixer/6ae5962b009cfd88925eae721e24bf895e8b78d5
More improved transparency smileys
2012-03-08 18:20:10 -08:00
tomtom84
05561bd905 Merge pull request #110 from tomtom84/master
fixes in diabook-derivates
2012-03-08 18:02:25 -08:00
tommy tomson
feda3cfc96 fixed star-bug 2012-03-09 02:59:13 +01:00
Thomas
6ae5962b00 More improved transparency for smilies 2012-03-09 01:49:12 +00:00