Commit graph

6507 commits

Author SHA1 Message Date
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
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
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
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
fermionic
5fbad0d925 Merge pull request #442 from fermionic/frost-image-upload-and-post-local-time
fix image and file upload on frost moble; add support to frost for local...
2012-08-24 20:30:27 -07:00
Zach Prezkuta
54d4fc73c4 fix image and file upload on frost moble; add support to frost for local post time 2012-08-24 21:25:39 -06:00
friendica
1b0dd6f2ec handle Windows proc_run 2012-08-23 16:36:13 -07:00
friendica
9a50454290 rev update 2012-08-23 16:35:40 -07:00
friendica
386b6d081b moods 2012-08-22 21:36:55 -07:00
friendica
175849494c rev update 2012-08-22 20:39:36 -07:00
friendica
4f72e656ca Merge https://github.com/friendica/friendica into pull 2012-08-21 19:42:37 -07:00
friendica
ff0e0782a5 restore old comment behaviour when threading turned off 2012-08-21 19:41:50 -07:00
friendica
154be4bc5c rev update 2012-08-21 19:40:28 -07:00
Tobias Diekershoff
07a27d217c DE more updates to the strings 2012-08-21 08:23:47 +02:00
friendica
179292f758 rev update 2012-08-20 21:36:04 -07:00
Tobias Diekershoff
d470496ead Quattro: added localtime timestamp title to entries 2012-08-20 11:20:49 +02:00
Tobias Diekershoff
96e6be3c19 DE strings update 2012-08-20 11:12:40 +02:00
friendica
bcec1bddc0 put the real post time into the post 2012-08-19 14:39:43 -07:00
friendica
6bc48b58d8 algorithm for crypt tag 2012-08-19 00:35:39 -07:00
friendica
a26b4e8af1 Merge https://github.com/friendica/friendica into pull 2012-08-18 15:18:02 -07:00
friendica
862a12f8f5 rev update 2012-08-18 15:17:07 -07:00
friendica
64b6d26d4f Merge pull request #441 from fermionic/frost-permission-denied-login-style-wrong
include login style when necessary
2012-08-18 15:16:43 -07:00
friendica
d8d20f2afa Merge pull request #440 from fermionic/blank-screen-at-install-end
template was loaded in the wrong place
2012-08-18 15:16:07 -07:00
Zach Prezkuta
b4a4ccfb2b include login style when necessary 2012-08-18 14:47:59 -06:00
Zach Prezkuta
d00c98b8b8 template was loaded in the wrong place 2012-08-18 13:28:49 -06:00
friendica
22bf48cae9 Merge https://github.com/friendica/friendica into pull 2012-08-17 22:07:12 -07:00
friendica
d96b9cda43 wall-to-wall posts not identified correctly after thread mod 2012-08-17 22:06:13 -07:00
friendica
d233beb4ce rev update 2012-08-17 22:05:42 -07:00
fermionic
9ac2231a62 Merge pull request #439 from fermionic/frost-fix-archive-widget
another javascript that needed $ --> $j
2012-08-16 20:52:50 -07:00
Zach Prezkuta
045f98cddd another javascript 2012-08-16 21:51:36 -06:00
friendica
86d867f96f Merge https://github.com/friendica/friendica into pull 2012-08-16 15:24:57 -07:00
friendica
f9d703b8fc rev update 2012-08-16 15:24:02 -07:00
Thomas Willingham
008d04bdbd Merge branch 'master' of https://github.com/friendica/friendica 2012-08-16 18:22:20 +01:00
Thomas Willingham
ee998864e6 Make Vier threaded comments not broken.
These should be inherited from Quattro really, but aren't.
2012-08-16 18:21:33 +01:00
friendica
1e3ebccb97 Merge https://github.com/friendica/friendica into pull 2012-08-15 17:16:24 -07:00
friendica
68d7a3ae01 put a variant of the parent_uri into email notification message-ids. Current message-ids aren't completel legal. More work to do. 2012-08-15 17:14:29 -07:00
friendica
6184b5cf5a rev update 2012-08-15 17:12:58 -07:00
Thomas Willingham
c47e6dca30 Remove Facebook from newmember text. 2012-08-15 22:26:44 +01:00