Commit Graph

2602 Commits

Author SHA1 Message Date
Friendika 0a3c9017d0 Merge branch 'pull' 2011-07-28 16:50:44 -07:00
Friendika 04675e3ec3 revup 2011-07-28 16:49:43 -07:00
tobiasd b9cd244dd9 Merge pull request #149 from tobiasd/master
wording for StatusNet and Twitter config cleared
2011-07-28 08:40:23 -07:00
Tobias Diekershoff cfc7f8308f Merge branch 'master' of git://github.com/friendika/friendika 2011-07-28 17:36:49 +02:00
Tobias Diekershoff ea0d5d34ac config page formatation issues fixed 2011-07-28 17:34:34 +02:00
Tobias Diekershoff ce36f0bf3d clearing the wordenting for the addon config 2011-07-28 13:25:41 +02:00
Friendika c74f0f0cab show full size photos for album view even when photo has been used as a profile photo 2011-07-28 01:01:19 -07:00
Friendika 822fea9d9d installer text changes 2011-07-27 21:48:02 -07:00
Friendika b721fabc3c show lock icon on private events 2011-07-27 02:21:55 -07:00
Friendika e6c5afdf4f privacy issue introduced yesterday 2011-07-26 22:57:48 -07:00
Friendika c17890ab62 privacy settings on event item not propagated correctly 2011-07-26 22:40:11 -07:00
Friendika 94e027af67 deal with browser pre-fetch of the ACL img template '{0}' 2011-07-26 19:20:29 -07:00
Friendika 454ff3c7f0 configurable format for date input selectors 2011-07-25 20:59:25 -07:00
Friendika 1441fce04e ignore any fully numeric hash tag 2011-07-25 20:21:16 -07:00
Friendika 06802dd8fe auto focus jot editor 2011-07-25 20:10:21 -07:00
Friendika ec52010e16 helper functions for Diaspora cert mangling 2011-07-25 19:57:17 -07:00
Friendika c0749f18d6 event ownership issues 2011-07-25 18:41:48 -07:00
Friendika 21058cdb47 provide ability to use different port 2011-07-25 15:43:28 -07:00
Friendika 60ff58d7be Merge branch 'pull' 2011-07-25 00:18:11 -07:00
Friendika f1115a1031 revup 2011-07-25 00:17:46 -07:00
fabrixxm 9f34f587ea Merge pull request #148 from fabrixxm/newacl
Remove "share" greyed text in jot editor when user reshare an item
2011-07-24 23:53:37 -07:00
Fabio Comuni 363c4c5798 Remove "share" greyed text in jot editor when user reshare an item 2011-07-25 08:56:51 +02:00
Friendika 57653f4fdf Merge branch 'pull' 2011-07-24 03:59:18 -07:00
Friendika 2e1f74397c revup 2011-07-24 03:58:48 -07:00
tobiasd 855ce3263b Merge pull request #147 from tobiasd/master
link the community page in dispy when enabled
2011-07-24 02:17:11 -07:00
Tobias Diekershoff a09bdf5ad6 added link to community page to dispy theme menu 2011-07-24 11:07:39 +02:00
tobiasd 4ba29089d2 Merge pull request #146 from tobiasd/master
hide the editor and controls if not with focus in dispy theme, resend works
2011-07-24 00:36:06 -07:00
Tobias Diekershoff a4f7e8e8fe dispy theme hide editor if without focus 2011-07-24 09:32:20 +02:00
Friendika 0fbaac59f0 revup 2011-07-23 00:22:25 -07:00
Friendika a486d2cd6a Merge pull request #145 from tobiasd/master
dispy ACL and addon license
2011-07-23 00:21:25 -07:00
Tobias Diekershoff abc01cad20 Merge branch 'master' of git://github.com/friendika/friendika 2011-07-23 07:43:25 +02:00
Tobias Diekershoff a213a9babf dispy ACL into the fancybox 2011-07-23 07:41:20 +02:00
Friendika 4e93c742d5 Merge pull request #144 from fabrixxm/newacl
fix "resend" function when editor is disabled
2011-07-22 05:51:11 -07:00
Fabio Comuni 5c9eb19767 fix "resend" function when editor is disabled 2011-07-22 08:46:29 +02:00
Tobias Diekershoff 9cf9753190 Merge github.com:tobiasd/friendika 2011-07-22 06:32:36 +02:00
Friendika 6b806708d9 typo 2011-07-21 20:21:41 -07:00
Friendika 77cea581b0 better fix for bug #107, last one was flawed 2011-07-21 20:19:55 -07:00
Friendika f4b4f61f66 provide fake first arg to ajax updater 2011-07-21 17:55:15 -07:00
Friendika 9290283040 revup 2011-07-21 16:14:38 -07:00
Friendika a13eaf915c Merge pull request #143 from fabrixxm/newacl
Use new ACL selector in photo edit
2011-07-21 06:10:30 -07:00
Tobias Diekershoff ba8fbb60da removed the "same as friendika" note from the license line 2011-07-21 11:15:13 +02:00
Friendika 1d7d4bf8c6 wrong path for salmon verify 2011-07-20 23:14:43 -07:00
Friendika 5307225682 ajax pause - any key to resume 2011-07-20 17:17:08 -07:00
Fabio Comuni 096ecba883 Use new ACL selector in photo edit 2011-07-20 14:19:20 +02:00
Friendika 40092c83a5 Merge pull request #142 from fabrixxm/newacl
More on ACL and editor
2011-07-20 03:54:10 -07:00
Fabio Comuni 19c93adf84 Use popup ACL selector in photo upload. js_upload use new acl selector. 2011-07-20 11:40:24 +02:00
Fabio Comuni 7a069c1438 Load tinyMCE on post editor only if needed. 2011-07-20 11:08:42 +02:00
Fabio Comuni 11d1d309c2 Recursive string replacement in template 2011-07-20 11:05:41 +02:00
Fabio Comuni 020deefba6 Merge remote-tracking branch 'friendika/master' into newacl 2011-07-20 10:01:12 +02:00
Fabio Comuni 1c9ed08620 show acl selector in a popup with fancybox 2011-07-20 10:00:33 +02:00