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 |
|
Christian Vogeley
|
f6be815c31
|
more tweaks
|
2014-02-22 22:54:09 +01:00 |
|
friendica
|
f0a361a7c1
|
Merge pull request #334 from cvogeley/master
Add option for narrow navbar instead of the bootstrap default
|
2014-02-23 08:50:55 +11:00 |
|
friendica
|
5dc35bb7f0
|
Merge https://github.com/friendica/red into zpull
|
2014-02-22 13:34:07 -08:00 |
|
friendica
|
075b7fa9c8
|
This should resolve the dav authentication loop (correctly)
|
2014-02-22 13:33:18 -08:00 |
|
Christian Vogeley
|
a5f70f6c10
|
little tweaks
|
2014-02-22 20:30:41 +01:00 |
|
Christian Vogeley
|
f9eddb89ef
|
Add option for narrow navbar instead of the bootstrap default
thick version
|
2014-02-22 16:10:46 +01:00 |
|
tobiasd
|
bbea85f809
|
Merge pull request #333 from tobiasd/20140222
DE: Update to the strings
|
2014-02-22 14:12:37 +01:00 |
|
Tobias Diekershoff
|
65d5fae324
|
DE: update to the strings
|
2014-02-22 14:10:21 +01:00 |
|
friendica
|
9c4c0e6d23
|
prevent mod/cloud looping (ping gets a new session on each call [wtf?] which triggers our "changed uid" detector)
|
2014-02-22 03:38:23 -08:00 |
|
friendica
|
f63e220939
|
Merge https://github.com/friendica/red into zpull
|
2014-02-21 23:52:20 -08:00 |
|
friendica
|
9e2ea6b5d4
|
strings/version update
|
2014-02-21 23:51:57 -08:00 |
|
friendica
|
0501bab7dc
|
doc update
|
2014-02-21 23:51:43 -08:00 |
|
friendica
|
07fb85fcc9
|
Merge pull request #332 from zzottel/master
First steps at German doco
|
2014-02-22 09:01:48 +11:00 |
|
friendica
|
e43ffdaaf4
|
Merge pull request #331 from git-marijus/master
update bootstrap and revert some style.css cleaning
|
2014-02-22 09:01:31 +11:00 |
|
zottel
|
a66e7d2999
|
changed old Friendica stuff to what we have now in Red
|
2014-02-21 22:27:21 +01:00 |
|
zottel
|
fe6cd80285
|
small corrections
|
2014-02-21 22:27:03 +01:00 |
|
zottel
|
d58068186b
|
first few German help files
|
2014-02-21 22:26:29 +01:00 |
|
zottel
|
6249178b79
|
Merge remote-tracking branch 'upstream/master'
|
2014-02-21 22:25:06 +01:00 |
|
marijus
|
32d0189b56
|
remove some design fixes which got fixed in bootstrap 3.1.1
|
2014-02-21 14:38:21 +01:00 |
|
marijus
|
8c37a01f74
|
dont allow bootstrap to mess with blockquote font-size
|
2014-02-21 13:57:00 +01:00 |
|