Commit graph

9810 commits

Author SHA1 Message Date
zzottel
05882df43a Merge pull request #342 from zzottel/master
German help
2014-02-27 18:35:54 +01:00
zottel
6c0fdbebeb some new German files 2014-02-27 18:35:03 +01:00
Thomas Willingham
c66313af88 Merge pull request #343 from beardy-unixer/master
Doc update  (just formatting and typos)
2014-02-27 16:35:46 +00:00
Thomas Willingham
ac383cf07b Can't type today 2014-02-27 16:33:36 +00:00
Thomas Willingham
9488bc0631 Who reverted that? 2014-02-27 16:31:25 +00:00
Thomas Willingham
46a3c4d804 Doc update 2014-02-27 16:28:29 +00:00
zottel
77e087a380 convert existing German help files to BBCode 2014-02-27 15:01:44 +01:00
cvogeley
7cdca97654 Typo 2014-02-27 09:54:07 +01:00
cvogeley
0850a5d63d Typo 2014-02-27 09:39:07 +01:00
Thomas Willingham
ba41d4a461 If we leave this any longer, it'll be 2015 before anyone remembers. 2014-02-27 06:49:46 +00:00
friendica
efb77774b5 Merge https://github.com/friendica/red into zpull 2014-02-26 14:51:51 -08:00
friendica
c8f1bf89a9 vsprintf error 2014-02-26 14:51:29 -08:00
friendica
3b24d921b6 Merge pull request #341 from git-marijus/master
properly fix profile edit dropdown menu
2014-02-27 09:37:29 +11:00
marijus
8860d80bd4 Revert "little correction"
This reverts commit 496a5a556f.
2014-02-26 23:34:36 +01:00
marijus
496a5a556f little correction 2014-02-26 23:31:35 +01:00
marijus
c5b8224dcc properly fix profile edit dropdown menu 2014-02-26 23:20:40 +01:00
friendica
364fc9f163 comanche: provide an option to add a menu class for different theming choices on some menus (e.g. horizontal, tabbed, etc.) 2014-02-25 20:58:20 -08:00
friendica
1857036a99 I'll have to fix this someday. 2014-02-25 20:36:56 -08:00
friendica
3fb26e06ab Merge https://github.com/friendica/red into zpull 2014-02-25 19:48:57 -08:00
friendica
e7e97e578b put bookmarked chatrooms into poco 2014-02-25 19:48:13 -08:00
friendica
c1f3c892b0 Merge pull request #340 from beardy-unixer/master
Fix the weirdness of messages appearing in the middle of the screen
2014-02-26 13:04:16 +11:00
Thomas Willingham
04e6cb515b Fix the weirdness of messages appearing in the middle of the screen
and working their way downwards one comment at a time as the ping runs
when joining an active chat room.
2014-02-26 01:57:29 +00:00
friendica
2c72e49d1f more chatroom discovery 2014-02-25 17:55:30 -08:00
friendica
9a2e73ae15 move bootstrap to theme and out of core. 2014-02-25 16:29:00 -08:00
friendica
8fd12eb122 Merge https://github.com/friendica/red into zpull 2014-02-25 14:13:26 -08:00
friendica
08313bac6c allow personalised page layouts for modules. 2014-02-25 14:12:51 -08:00
Thomas Willingham
36085bc608 Also update database.sql 2014-02-25 21:12:19 +00:00
Thomas Willingham
8e3a16bcdd Update channel permissions to full ints 2014-02-25 21:06:47 +00:00
friendica
4e8c0933c0 Merge pull request #339 from tuscanhobbit/master
Wrong logo on assets/home page
2014-02-26 06:21:08 +11:00
tuscanhobbit
8cf59c2e1b assets dir had the old logo 2014-02-25 18:46:04 +01:00
Paolo T
0a98f6b878 Merge pull request #1 from friendica/master
Update this fork
2014-02-25 16:33:40 +01:00
friendica
b1021df485 provide ability to bookmark chatrooms using rbmark 2014-02-24 21:34:49 -08:00
friendica
51a895471b Merge pull request #338 from solstag/master
Fix typo that broke jquery.divgrow. Sorry I should have tested.
2014-02-25 15:50:19 +11:00
friendica
2becbae402 remote "add bookmark" - like rpost but saves a bookmark from a remote hub into one of your own bookmark folders (or a new one if desired). 2014-02-24 20:46:52 -08:00
Alexandre Hannud Abdo
5691a609c4 Fix typo that broke jquery.divgrow. Sorry I should have tested. 2014-02-25 01:15:47 -03:00
friendica
fdb25f3450 string 'null' showing up in timeago since last modify 2014-02-24 15:27:39 -08:00
friendica
29ebfc25ca take a p 2014-02-24 15:07:00 -08:00
friendica
b2372c0c8f Merge https://github.com/friendica/red into zpull 2014-02-24 14:19:53 -08:00
friendica
5bd71e4e4d set theme for un-viewable profile 2014-02-24 14:19:21 -08:00
friendica
9a097dc80c Merge pull request #337 from solstag/master
Updates to pt-br translation, including some email templates. Fix some jQuery translation issues.
2014-02-25 09:17:11 +11:00
Alexandre Hannud Abdo
59211e0ac8 Translation for jQuery.divgrow strings. Fix mismatch in jQuery.timeago strings 2014-02-24 17:47:57 -03:00
Alexandre Hannud Abdo
e4eeb9d101 Updates to pt-br translation, including some email templates. 2014-02-24 16:17:50 -03:00
Thomas Willingham
fea3422b46 Doco - just a friendicared => [baseurl] 2014-02-24 17:34:40 +00:00
friendica
b2dc95f383 Merge pull request #335 from beardy-unixer/master
Import doco from docs@friendicared.net
2014-02-24 20:34:51 +11:00
Thomas Willingham
5cc70f75a4 The string replacement missed that little blighter. 2014-02-24 05:20:27 +00:00
Thomas Willingham
29f6975715 Import doco from docs@friendicared.net 2014-02-24 05:13:28 +00:00
Thomas Willingham
8284901f9e Make bbcode the default doco ready for the next commit 2014-02-24 05:11:56 +00:00
friendica
2ccff45221 In case a page has overloaded a module, see if we already have a layout defined. Otherwise, if a pdl file exists for this module, use it. 2014-02-23 18:40:43 -08:00
friendica
b78d423a54 Merge https://github.com/friendica/red into zpull 2014-02-22 14:59:16 -08:00
friendica
5b4e3f46bc minor stuff, some doco, auth cleanup, and make "unknown" more translateable by context. 2014-02-22 14:58:12 -08:00