Fabio Comuni
|
dfba0f13c8
|
Merge branch 'newacl' into newui
|
2011-07-25 08:59:28 +02: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 |
|
|
|
855ce3263b
|
Merge pull request #147 from tobiasd/master
link the community page in dispy when enabled
|
2011-07-24 02:17:11 -07:00 |
|
|
|
a09bdf5ad6
|
added link to community page to dispy theme menu
|
2011-07-24 11:07:39 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
abc01cad20
|
Merge branch 'master' of git://github.com/friendika/friendika
|
2011-07-23 07:43:25 +02:00 |
|
|
|
a213a9babf
|
dispy ACL into the fancybox
|
2011-07-23 07:41:20 +02:00 |
|
Fabio Comuni
|
93eda9d9c1
|
Initial work on new UI
|
2011-07-22 17:37:51 +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 |
|
|
|
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 |
|
|
|
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 |
|
Friendika
|
b27d68633b
|
register hook
|
2011-07-19 23:10:09 -07:00 |
|
Friendika
|
9048ecd85c
|
diaspora encryption xml template
|
2011-07-19 22:58:38 -07:00 |
|
Friendika
|
e2f22a1827
|
diaspora salmon endpoint (decryption not yet provided)
|
2011-07-19 21:23:47 -07:00 |
|
Friendika
|
bf1739aef2
|
Merge branch 'pull'
|
2011-07-19 17:25:13 -07:00 |
|
Friendika
|
6ce5bcee9f
|
revup
|
2011-07-19 17:24:44 -07:00 |
|
Friendika
|
1d35d1e5a1
|
Merge pull request #141 from fabrixxm/newacl
New jot ACL selector
|
2011-07-19 17:24:09 -07:00 |
|
Fabio Comuni
|
0a3ae96093
|
add icons to acl selector
|
2011-07-19 17:15:34 +02:00 |
|
Fabio Comuni
|
89eefbe46c
|
Fix style and scrollbar
|
2011-07-19 16:34:27 +02:00 |
|
Fabio Comuni
|
9debbfde1e
|
fix group image name
|
2011-07-19 16:25:40 +02:00 |
|
Fabio Comuni
|
9fa0956966
|
New jot acl selector
|
2011-07-19 16:17:58 +02:00 |
|
Friendika
|
0b8aaef09c
|
lack of guarantee is not a license term, but a disclaimer
|
2011-07-19 04:24:20 -07:00 |
|
Friendika
|
07a77a4d27
|
resize editor
|
2011-07-18 21:25:49 -07:00 |
|
Friendika
|
114a728009
|
created license with which to renounce the license
|
2011-07-18 20:52:35 -07:00 |
|
Friendika
|
7008bec045
|
improved code blocks
|
2011-07-18 19:17:16 -07:00 |
|
Friendika
|
c0b8e63a3f
|
basic diaspora discovery
|
2011-07-18 18:13:46 -07:00 |
|
Friendika
|
25b4aacf3b
|
green icons for greenzero
|
2011-07-18 16:42:39 -07:00 |
|
Friendika
|
f3bd216112
|
bug #104
|
2011-07-17 21:34:02 -07:00 |
|
Friendika
|
1fa2231c20
|
invite system
|
2011-07-17 21:12:31 -07:00 |
|
Friendika
|
43110db749
|
begin invites, fb setup changes
|
2011-07-17 16:08:47 -07:00 |
|
