Commit graph

1894 commits

Author SHA1 Message Date
Ludovic Grossard
1f86205ee8 proofreading the mail templates in fr
fixed typo, grammar, spelling…
2012-05-03 22:35:59 +02:00
Simon L'nu
bb081e4bf5 forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv (which it includes)
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-03 14:35:21 -04:00
Simon L'nu
1a13c56fef major reworking of dispy dark. light to follow
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-03 14:25:18 -04:00
tommy tomson
d72db2e1aa diabook-theme: small fix 2012-05-03 07:57:40 +02:00
tommy tomson
ff2ddc319d diabook-theme: small fix 2012-05-03 06:25:23 +02:00
tommy tomson
3521e22333 diabook-theme: made boxes at right_aside sortable 2012-05-03 06:05:55 +02:00
Max Weller
f0c11cac4a Moved Meta Viewport from global head.tpl to diabook's header
I mistakenly added this <meta> tag to the global header, but it
causes problems for other themes, as they have other optimal widths.

I also added a style to diabook which makes the jGrowl messages
appear below the header bar, so you can still click the menu items
without having to close messages first.
2012-05-02 16:59:58 +02:00
tommy tomson
6875f54647 diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box 2012-05-02 16:27:01 +02:00
tommy tomson
67471bb534 diabook-theme: tryied to improve performance a bit 2012-05-02 14:33:04 +02:00
tommy tomson
6a9cd8cd4b diabook-theme: fix footer/impressum 2012-05-02 12:40:51 +02:00
friendica
1fab28c413 fix size 2012-05-01 20:38:06 -07:00
friendica
066d69b21c add template 2012-05-01 20:22:59 -07:00
friendica
8bd6e1aef9 first try common friends for visitors 2012-05-01 19:16:18 -07:00
Thomas Willingham
671a10f5d4 More Diabook-dark touch-ups. Should *really* be useable this time...with editplain anyway. 2012-05-01 21:37:49 +01:00
tommy tomson
ab556857f0 diabook-themes: small fix at "community pages"-box 2012-05-01 16:46:08 +02:00
Simon L'nu
6d3ba2825b lighten bg and darken font on dispy light
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-01 04:02:56 -04:00
Simon L'nu
e245ecddf2 sub-minor change to head.tpl
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-01 01:56:21 -04:00
Simon L'nu
46558e98a8 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  diabook-themes: add "community profiles"-box to right_column
  change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it
  make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
  diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter
  rev update
  start adding tooltips to tab menus
  fix join group notifications

* master:
2012-05-01 00:49:42 -04:00
tommy tomson
2c577ed90f diabook-themes: add "community profiles"-box to right_column 2012-05-01 06:21:40 +02:00
friendica
a3a55897e5 Merge https://github.com/friendica/friendica into pull 2012-04-30 19:04:28 -07:00
friendica
3c0cf72716 make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it
also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
2012-04-30 19:01:41 -07:00
tommy tomson
f35ffa9b60 diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter 2012-05-01 02:33:55 +02:00
Simon L'nu
9b7dac6ce1 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  provide "xxx joined yyy" notifications
  adding META viewport tag for better look on tablets
  Update Esperanto to 100%
  DE update to the strings
  activitystreams schema constants for "join group"
  missed a db field
  typo in profile_selectors, fix remote tagging
  not all profile selector choices have unique or direct translations
  log db error strings in all cases
  admin page to manage failed updates
  improved db error logging
  close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw)

* master:
2012-04-30 06:02:38 -04:00
friendica
9f18c9d664 Merge pull request #277 from mschmitt/master
Update Esperanto to 100%
2012-04-30 01:29:50 -07:00
Max Weller
9d8a0553ac adding META viewport tag for better look on tablets 2012-04-30 09:48:21 +02:00
Martin Schmitt
5b9f01c3ab Update Esperanto to 100% 2012-04-30 09:00:03 +02:00
Tobias Diekershoff
f08dc392df DE update to the strings 2012-04-30 08:39:12 +02:00
friendica
0153d86b7f admin page to manage failed updates 2012-04-29 19:10:07 -07:00
Simon L'nu
34eb843fb4 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  the heart should really be red.
  fix location change notification
  enhanced profile reporting for single values
  add db field for removed account, which will also be the first test of update error checking
  toggle to archive unfriends, though render them useless
  indicate successful updates
  diabook-themes: small fix
  diabook-themes: bug/css-fixes
  some constants for the db update failure possibilities
  bring back the email and logging of update failures, but without the transactions

* master:
2012-04-29 22:06:16 -04:00
tommy tomson
920d40acf4 diabook-themes: small fix 2012-04-29 05:58:23 +02:00
tommy tomson
3d054341ef diabook-themes: bug/css-fixes 2012-04-29 04:12:04 +02:00
friendica
7919d00399 bring back the email and logging of update failures, but without the transactions 2012-04-28 17:50:28 -07:00
Simon L'nu
ecd1dab373 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  a few more continues that should be returns
  small bugfix. sometimes also avatar pics were rescaled

* master:
2012-04-28 20:16:25 -04:00
Christian Vogeley
3f586bb962 small bugfix. sometimes also avatar pics were rescaled 2012-04-28 20:15:10 +02:00
Simon L'nu
c661dc502f Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  break up poller into separate processes
  add tooltip title to common_tabs
  PRIVACY: if wall is blocked, don't provide public keywords in HTML meta
  Diabook-dark update, it's almost useable now (if you're lenient).
  Added "important changes" to admin menu for admins who don't follow the github properly.

* master:
2012-04-28 05:29:03 -04:00
friendica
f163aed66d break up poller into separate processes 2012-04-27 23:17:40 -07:00
friendica
3bb06cc3e4 add tooltip title to common_tabs 2012-04-27 19:47:52 -07:00
Thomas Willingham
4b553de79f Diabook-dark update, it's almost useable now (if you're lenient). 2012-04-28 03:01:27 +01:00
Simon L'nu
3bfa3f2a13 fix #search-text
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 21:02:57 -04:00
Thomas Willingham
adc2fc18a5 Added "important changes" to admin menu for admins who don't follow
the github properly.
2012-04-28 01:25:55 +01:00
friendica
26c53580d1 implement contact archival 2012-04-27 17:17:58 -07:00
Christian Vogeley
731379fa25 another attempt to fix lower tab behaviour on small screens, community back in tab area 2012-04-27 23:48:44 +02:00
Simon L'nu
64f3af49fa remove extra netsearch-box and fix
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 14:33:56 -04:00
Simon L'nu
d0d79196ba fix contact-friend stuff on profile sidebar
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 13:31:06 -04:00
friendica
4b92e3543c Merge https://github.com/friendica/friendica into pull 2012-04-27 02:31:37 -07:00
friendica
266eaae439 put community back on the lower tab. It belongs with message streams 2012-04-27 02:30:49 -07:00
Simon L'nu
deae1df3be fix some css errors
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 04:42:38 -04:00
friendica
153534bc70 Merge https://github.com/friendica/friendica into pull 2012-04-27 01:10:33 -07:00
friendica
f06a554e05 fix view contacts 2012-04-27 01:10:09 -07:00
Simon L'nu
b936e3a18a fix 2 issues. contacts img in finder; wall filer title
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 02:33:58 -04:00