Michael Vogel
|
59d378913d
|
Merge remote branch 'upstream/master'
|
2012-09-04 07:22:59 +02:00 |
|
friendica
|
5beda888b8
|
Merge https://github.com/friendica/friendica into pull
|
2012-09-03 21:32:47 -07:00 |
|
|
friendica
|
cdf648c0b4
|
attachments from non-friendica contacts shouldn't go through redir - it won't work
|
2012-09-03 21:31:35 -07:00 |
|
|
friendica
|
ca371de509
|
rev update
|
2012-09-03 21:31:00 -07:00 |
|
fermionic
|
6f7e8eee9e
|
Merge pull request #454 from CyberDomovoy/mass_vhost
VirtualDocumentRoot and mod_rewrite
|
2012-09-02 14:18:00 -07:00 |
|
Domovoy
|
2b51e91414
|
Added comments in .htacces to help configuring installation behind a VirtualDocumantRoot
|
2012-09-02 23:00:58 +02:00 |
|
|
Michael Vogel
|
f6818ab243
|
Merge remote branch 'upstream/master'
|
2012-09-02 17:50:25 +02:00 |
|
|
Michael Vogel
|
3c24a7ed3e
|
items: added some logging infos
|
2012-09-02 17:49:06 +02:00 |
|
Tobias Diekershoff
|
a287b34eb3
|
DE strings (pokes THX @zottel)
|
2012-09-02 11:59:44 +02:00 |
|
|
friendica
|
115310f1f4
|
Merge https://github.com/friendica/friendica into pull
|
2012-09-02 01:48:24 -07:00 |
|
|
friendica
|
39c7b34276
|
rev update
|
2012-09-02 01:47:04 -07:00 |
|
fabrixxm
|
9752f62b8d
|
Merge pull request #452 from fabrixxm/master
quattro: fix attachments icons, fix wall-to-wall comments, style blockquote element, bigger text in textareas
|
2012-09-01 02:05:53 -07:00 |
|
|
Fabrixxm
|
02037e345d
|
quattro: fix attachments icons, fix wall-to-wall comments, style blockquote element, bigger text in textareas
|
2012-09-01 04:52:01 -04:00 |
|
|
friendica
|
f88f0bf3f2
|
Merge https://github.com/friendica/friendica into pull
|
2012-08-31 01:29:55 -07:00 |
|
|
friendica
|
b1c8b22aa5
|
rev update
|
2012-08-31 01:29:37 -07:00 |
|
|
friendica
|
2ace7d6646
|
Merge pull request #451 from fabrixxm/master
fixes and tweaks
|
2012-08-31 01:26:03 -07:00 |
|
|
Fabrixxm
|
51686cce01
|
quattro: remove 'experimental'
|
2012-08-31 03:32:10 -04:00 |
|
|
Fabrixxm
|
ad45d9a78a
|
quattro: fix live update
|
2012-08-31 03:31:33 -04:00 |
|
|
Fabrixxm
|
f433158bed
|
config: fix get_config and get_pconfig search for serialized array
works also if the serialized string contains newlines
|
2012-08-29 04:19:15 -04:00 |
|
|
friendica
|
af789ee98b
|
Merge https://github.com/friendica/friendica into pull
|
2012-08-28 20:35:25 -07:00 |
|
|
fermionic
|
ed7c3363c2
|
Merge pull request #450 from fermionic/frost-showmore-border
make the show more line look nicer
|
2012-08-28 19:20:36 -07:00 |
|
|
Zach Prezkuta
|
2ef1081c68
|
make the show more line look nicer
|
2012-08-28 20:19:47 -06:00 |
|
|
fermionic
|
65f766ba0e
|
Merge pull request #449 from fermionic/markdownify-breaks-links-with-underscores
manually fix escaped underscores in links
|
2012-08-28 19:13:48 -07:00 |
|
|
Zach Prezkuta
|
f7a1999c15
|
manually fix escaped underscores in links
|
2012-08-28 20:12:41 -06:00 |
|
|
friendica
|
f07658accf
|
Merge https://github.com/friendica/friendica into pull
|
2012-08-28 19:11:52 -07:00 |
|
|
friendica
|
724583e386
|
rev update
|
2012-08-28 19:08:17 -07:00 |
|
|
fermionic
|
9ae5ae6df5
|
Merge pull request #448 from fermionic/limit-items-on-all-pages
limit number of items on profile page too
|
2012-08-28 19:03:15 -07:00 |
|
|
fermionic
|
597e96e156
|
Merge pull request #447 from fermionic/zrls-and-redir-photos-broken-with-tags
regular expressions were grabbing too much
|
2012-08-28 19:03:04 -07:00 |
|
|
fermionic
|
8c064069d9
|
Merge pull request #443 from fermionic/new-users-privacy-settings
automatically make posts private for new users
|
2012-08-28 19:02:51 -07:00 |
|
|
Tobias Diekershoff
|
c2b4dc2e60
|
DE: some translations
|
2012-08-28 18:14:57 +02:00 |
|
|
Fabrixxm
|
9ecb984285
|
Merge remote branch 'friendica/master' into bid-prov
|
2012-08-28 10:38:40 -04:00 |
|
|
Tobias Diekershoff
|
d9ffb0578c
|
quattro: display date info as "ago" with mouse over date stamp
|
2012-08-27 19:47:04 +02:00 |
|
|
Tobias Diekershoff
|
647802f92e
|
get "ago" information into the mail thread view
|
2012-08-27 19:46:35 +02:00 |
|
|
Tobias Diekershoff
|
cf91a7f79a
|
quattro: mail_display has no ago information so don't display it
|
2012-08-27 19:39:31 +02:00 |
|
|
Tobias Diekershoff
|
036d5db0c0
|
quattro: use "ago" for date information and on mouse the date stamp
|
2012-08-27 19:32:23 +02:00 |
|
|
Tobias Diekershoff
|
1e9d35fb0e
|
pass "ago" information to the mail_list template
|
2012-08-27 19:31:41 +02:00 |
|
|
Tobias Diekershoff
|
37a0504f96
|
quattro: expanded the new prvmessage field a bit
|
2012-08-27 08:13:07 +02:00 |
|
|
Zach Prezkuta
|
c681e69794
|
limit number of items on profile page too; add show more back to Frost mobile; some show more fixes
|
2012-08-26 15:21:26 -06:00 |
|
|
Zach Prezkuta
|
72712175b5
|
regular expressions were grabbing too much
|
2012-08-26 14:56:34 -06:00 |
|
|
fermionic
|
0765ab5203
|
Merge pull request #446 from fermionic/frost-scrollbars-are-annoying
Frost scrollbars are annoying
|
2012-08-26 08:32:52 -07:00 |
|
|
Zach Prezkuta
|
a77081f659
|
remove show more/less from frost mobile--it is too great a load
|
2012-08-26 09:31:37 -06:00 |
|
|
Zach Prezkuta
|
0fe1727d74
|
remove show more/less animation on mobile
|
2012-08-26 09:22:49 -06:00 |
|
|
fermionic
|
17b59a7e3f
|
Merge pull request #445 from fermionic/frost-scrollbars-are-annoying
Frost scrollbars are annoying
|
2012-08-25 21:45:52 -07:00 |
|
|
Zach Prezkuta
|
7c9c92e542
|
update version
|
2012-08-25 22:43:32 -06:00 |
|
|
Zach Prezkuta
|
193cc2c537
|
try to get rid of scrollbars in Frost
|
2012-08-25 22:42:12 -06:00 |
|
|
Zach Prezkuta
|
1ffd67f291
|
hey: you missed a spot
|
2012-08-25 15:07:39 -06:00 |
|
|
Zach Prezkuta
|
f062ccbb66
|
add documentation; add to admin panel; some tweaks and interface stuff
|
2012-08-25 15:03:16 -06:00 |
|
|
fermionic
|
5cb618bcf1
|
Merge pull request #444 from fermionic/frost-notifications-sometimes-dont-show
restore nav element to login pages, since system messages are sent in it
|
2012-08-25 09:10:01 -07:00 |
|
|
Zach Prezkuta
|
3413cc1006
|
restore nav element to login pages, since system messages are sent in it
|
2012-08-25 10:08:25 -06:00 |
|
|
Zach Prezkuta
|
bd59f3d152
|
probably shouldn't require exact match for non-string
|
2012-08-24 21:46:42 -06:00 |
|