Commit Graph

7049 Commits

Author SHA1 Message Date
Thomas Willingham c8055cb680 Merge pull request #523 from balderino/master
add new englisch help files
2012-11-04 07:51:17 -08:00
balderino 0116c6accd doc_new-englisch-help-files 2012-11-04 15:39:44 +01:00
balderino aa3cefa5b3 doc_new-englisch-help-files 2012-11-04 15:18:03 +01:00
balderino 0180ac563e doc_new-englisch-help-files 2012-11-04 15:14:52 +01:00
balderino e62c518312 doc_new-englisch-help-files 2012-11-04 14:45:10 +01:00
balderino 1e89df1df7 doc_new-englisch-help-files 2012-11-04 14:41:30 +01:00
balderino 701b20fbeb doc_new-englisch-help-files 2012-11-04 14:40:50 +01:00
balderino b25b7c2d8c doc_new-englisch-help-files 2012-11-04 14:38:15 +01:00
friendica 6ca9f0e5fa string update 2012-11-03 15:31:33 -07:00
friendica 0627fdcce7 positional params in "was tagged in a photo" string 2012-11-03 15:29:47 -07:00
friendica f076d7f0dc Merge https://github.com/friendica/friendica into pull 2012-11-03 14:44:46 -07:00
friendica 3303d9db75 put 1i8n position orders in welcome string 2012-11-03 14:43:48 -07:00
fermionic d3290f314f Merge pull request #521 from fermionic/20121101-updates
Various updates
2012-11-02 12:26:49 -07:00
friendica e8fa4279fa no profile pic on photos page if no photos have been uploaded 2012-11-02 04:20:12 -07:00
Zach Prezkuta c6a3b87359 update_display for display live updates 2012-11-01 18:36:11 -06:00
Zach Prezkuta c9248b66db display live update; don't collapse comments on live update 2012-11-01 18:31:50 -06:00
friendica ce932dfdaf Merge https://github.com/friendica/friendica into pull 2012-11-01 17:21:55 -07:00
friendica 08121ad6b4 rev update 2012-11-01 17:21:39 -07:00
Zach Prezkuta 6effdd570c add a confirm dialog and a busy rotator for delete selected 2012-11-01 17:42:40 -06:00
Zach Prezkuta e9b26ffbb3 prevent double posting of status updates and comments 2012-11-01 17:14:42 -06:00
fermionic 6ecccf6830 Merge pull request #520 from fermionic/20121101-auto-redir-and-theme-threading
auto redir and theme threading
2012-11-01 09:37:18 -07:00
Zach Prezkuta 3e594f0f1c get rid of stray file 2012-11-01 10:35:20 -06:00
Zach Prezkuta d98974572b fix theme control of allowing threading 2012-11-01 10:33:01 -06:00
Zach Prezkuta 43de9cf904 don't try to auto redir if I'm a blocked or pending contact 2012-11-01 10:32:33 -06:00
Tobias Diekershoff c177a5e5b2 vier: threads 2012-11-01 15:05:31 +01:00
Tobias Diekershoff 9086641fd1 ES: update to the strings 2012-11-01 13:12:54 +01:00
Tobias Diekershoff 4832bc74f5 FR: update to the strings 2012-11-01 13:03:25 +01:00
Tobias Diekershoff 70f8a69ef3 IT: update to the strings 2012-10-31 07:42:23 +01:00
friendica e2ca9e9db5 poco - ignore archived contacts 2012-10-30 14:25:33 -07:00
friendica 68da185cce rev update 2012-10-30 14:23:11 -07:00
friendica 0fe9019c08 rev update 2012-10-29 21:01:15 -07:00
friendica fcc8bf8105 Merge https://github.com/friendica/friendica into pull 2012-10-29 21:01:08 -07:00
friendica a41e78a06d Merge pull request #516 from fermionic/20121029-auto-redir-fix
make sure that the contact is local for auto redir
2012-10-29 21:00:28 -07:00
friendica d3682f5d6a Merge pull request #517 from fermionic/20121029-wall-live-commenting
add live div to wall page
2012-10-29 20:58:32 -07:00
friendica fca910a7c9 Merge pull request #518 from fermionic/20121029-email-polling-array-size
don't combine msg and meta arrays unless they're the same size
2012-10-29 20:57:50 -07:00
friendica 400d91a8b4 Merge pull request #519 from fermionic/20121029-delete-duplicate-template-files
delete template files that are identical to the defaults
2012-10-29 20:55:43 -07:00
Zach Prezkuta 2bfacda2df missed quattro threaded_conversation live update field 2012-10-29 13:04:59 -06:00
Zach Prezkuta 4fa5b76167 delete template files that are identical to the defaults 2012-10-29 12:56:17 -06:00
Zach Prezkuta 200d2030d5 don't combine msg and meta arrays unless they're the same size 2012-10-29 12:47:51 -06:00
Zach Prezkuta 4fd339b216 add live div to wall page 2012-10-29 12:43:52 -06:00
Zach Prezkuta 4990f64927 make sure that the contact is local for auto redir 2012-10-29 12:03:48 -06:00
friendica 81a21257c3 rev update 2012-10-27 15:42:23 -07:00
friendica ab78e2064c Merge https://github.com/friendica/friendica into pull 2012-10-26 14:30:23 -07:00
friendica 88c8387c44 revive "mark everything seen" on main network page - see comments 2012-10-26 14:29:42 -07:00
pixelroot c1299bc689 view/theme/smoothly/screenshot.png 2012-10-25 13:50:26 +02:00
pixelroot 8e9c9992b0 new file: view/theme/smoothly/images/arrow.png
new file:   view/theme/smoothly/images/calendar.png
	new file:   view/theme/smoothly/images/connect.png
	new file:   view/theme/smoothly/images/dot.png
	new file:   view/theme/smoothly/images/down.png
	new file:   view/theme/smoothly/images/file.gif
	new file:   view/theme/smoothly/images/groups.png
	new file:   view/theme/smoothly/images/icons.png
	new file:   view/theme/smoothly/images/icons.svg
	new file:   view/theme/smoothly/images/login-bg.gif
	new file:   view/theme/smoothly/images/lrarrow.gif
	new file:   view/theme/smoothly/images/menu-user-pin.jpg
	new file:   view/theme/smoothly/images/menu-user-pin.png
	new file:   view/theme/smoothly/images/nav-bg.png
	new file:   view/theme/smoothly/images/next.png
	new file:   view/theme/smoothly/images/notifications.png
	new file:   view/theme/smoothly/images/photo-menu.jpg
	new file:   view/theme/smoothly/images/photography.png
	new file:   view/theme/smoothly/images/premium.png
	new file:   view/theme/smoothly/images/prev.png
	new file:   view/theme/smoothly/images/search.png
	new file:   view/theme/smoothly/images/shiny.png
	new file:   view/theme/smoothly/images/star.png
	new file:   view/theme/smoothly/images/tobottom.png
	new file:   view/theme/smoothly/images/totop.png
	new file:   view/theme/smoothly/images/user.png
2012-10-25 12:27:05 +02:00
pixelroot 272cccb47f deleted: view/theme/smoothly/arrow.png
deleted:    view/theme/smoothly/calendar.png
	deleted:    view/theme/smoothly/connect.png
	modified:   view/theme/smoothly/css/typography.css
	deleted:    view/theme/smoothly/dot.png
	deleted:    view/theme/smoothly/down.png
	deleted:    view/theme/smoothly/file.gif
	deleted:    view/theme/smoothly/groups.png
	deleted:    view/theme/smoothly/icons.png
	deleted:    view/theme/smoothly/icons.svg
	deleted:    view/theme/smoothly/login-bg.gif
	deleted:    view/theme/smoothly/lrarrow.gif
	deleted:    view/theme/smoothly/menu-user-pin.jpg
	deleted:    view/theme/smoothly/menu-user-pin.png
	deleted:    view/theme/smoothly/nav-bg.png
	modified:   view/theme/smoothly/nav.tpl
	deleted:    view/theme/smoothly/nets.tpl
	deleted:    view/theme/smoothly/next.png
	deleted:    view/theme/smoothly/notifications.png
	deleted:    view/theme/smoothly/photo-menu.jpg
	deleted:    view/theme/smoothly/photo_album.tpl
	deleted:    view/theme/smoothly/photo_top.tpl
	deleted:    view/theme/smoothly/photo_view.tpl
	deleted:    view/theme/smoothly/photography.png
	deleted:    view/theme/smoothly/premium.png
	deleted:    view/theme/smoothly/prev.png
	deleted:    view/theme/smoothly/profile_entry.tpl
	deleted:    view/theme/smoothly/profile_vcard.tpl
	deleted:    view/theme/smoothly/saved_searches_aside.tpl
	deleted:    view/theme/smoothly/screenshot.png
	deleted:    view/theme/smoothly/search.png
	deleted:    view/theme/smoothly/search_item.tpl
	deleted:    view/theme/smoothly/shiny.png
	deleted:    view/theme/smoothly/star.png
2012-10-25 12:26:09 +02:00
Simon 01221ccb2a Merge pull request #515 from simonlnu/master
fixed the silly preview bug
2012-10-25 00:03:23 -07:00
Simon L'nu 00ee068b65 fix for preview post thingy blocking the posting buttons
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-10-25 02:59:49 -04:00
Simon L'nu 1d9633b0cc Merge remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  Friendicaland - remove states no longer flying the Friendica banner.
  deleted:    view/theme/smoothly/categories_widget.tpl 	deleted:    view/theme/smoothly/contact_template.tpl 	deleted:    view/theme/smoothly/footer.tpl 	deleted:    view/theme/smoothly/generic_links_widget.tpl 	deleted:    view/theme/smoothly/group_drop.tpl 	deleted:    view/theme/smoothly/group_side.tpl 	deleted:    view/theme/smoothly/header.tpl 	deleted:    view/theme/smoothly/mail_head.tpl 	deleted:    view/theme/smoothly/message_side.tpl 	deleted:    view/theme/smoothly/peoplefind.tpl 	modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/login.tpl 	modified:   view/theme/smoothly/style.css
2012-10-25 02:11:38 -04:00