friendica
|
2044862eb9
|
Merge pull request #607 from fermionic/20130204-attach-types-are-too-coarse
add support for more file attachment types
|
2013-02-05 17:19:53 -08:00 |
|
friendica
|
ff8c1be987
|
Merge pull request #609 from fermionic/20130204-move-tpl-scripts-to-util
move tpl scripts to util
|
2013-02-05 17:19:23 -08:00 |
|
friendica
|
79e9214a75
|
Merge https://github.com/friendica/friendica into pull
|
2013-02-05 15:10:23 -08:00 |
|
friendica
|
9bf8364506
|
rev update
|
2013-02-05 15:09:28 -08:00 |
|
fermionic
|
6690cd3fd8
|
Merge pull request #599 from fermionic/20130129-colorbox
Switch to Colorbox
|
2013-02-05 07:55:07 -08:00 |
|
Zach Prezkuta
|
53e5592f9a
|
move tpl scripts to util
|
2013-02-04 22:55:15 -07:00 |
|
Zach Prezkuta
|
6152cbd5ac
|
add support for more file attachment types
|
2013-02-04 22:15:16 -07:00 |
|
Zach Prezkuta
|
2b94590bbf
|
elastic transitions
|
2013-02-04 18:20:47 -07:00 |
|
Zach Prezkuta
|
0e67ba2bd4
|
update minified javascripts
|
2013-02-04 18:16:13 -07:00 |
|
Zach Prezkuta
|
bde68bd8ca
|
add colorbox
|
2013-02-04 18:09:57 -07:00 |
|
Zach Prezkuta
|
1033e8896f
|
finish updating themes for colorbox
|
2013-02-04 18:09:56 -07:00 |
|
Zach Prezkuta
|
0f25455d1b
|
starting switching to colorbox
|
2013-02-04 18:09:56 -07:00 |
|
|
|
9dbe7efce5
|
ZH-CN: update to the strings
|
2013-02-03 15:14:57 +01:00 |
|
zzottel
|
7d173a24f4
|
Merge pull request #598 from zzottel/master
Reset network when showing a contact's posts
|
2013-02-01 11:40:14 -08:00 |
|
zottel
|
7db626b1b5
|
also reset network in mobile themes, smarty3 updates
|
2013-02-01 20:37:16 +01:00 |
|
zottel
|
e2949ab913
|
Merge remote branch 'upstream/master'
|
2013-02-01 20:31:55 +01:00 |
|
|
|
bfe7b5e1c3
|
ZH-CN: update to the strings
|
2013-02-01 10:49:32 +01:00 |
|
zottel
|
c0af9b2938
|
Reset network when showing a contact's posts
There is similar stuff in the mobile themes, but I didn't touch
them because I wasn't sure if I should and how the smarty3 stuff
works.
|
2013-02-01 09:12:37 +01:00 |
|
fermionic
|
0eeda1de5d
|
Merge pull request #597 from fermionic/20130131-update-minified-js
script for minifying javascript files
|
2013-01-31 18:08:09 -08:00 |
|
Zach Prezkuta
|
7d3a923294
|
script for minifying javascript files
|
2013-01-31 19:05:27 -07:00 |
|
|
|
303e5e1b10
|
ZH-CN: update to the strings
|
2013-01-31 06:42:10 +01:00 |
|
Thomas Willingham
|
d0d9ae3096
|
Dispy - remove head.tpl. It isn't actually required, and is the main cause of breakage in the theme.
|
2013-01-30 02:51:47 +00:00 |
|
friendica
|
be29ae0bce
|
poco xml returning 500 - but with contents?
|
2013-01-29 18:36:10 -08:00 |
|
friendica
|
de0098a6b4
|
rev update
|
2013-01-29 18:35:25 -08:00 |
|
fermionic
|
1c1902d37c
|
Merge pull request #596 from fermionic/20130129-call-by-reference-error
remove deprecated call by reference
|
2013-01-29 17:46:09 -08:00 |
|
Zach Prezkuta
|
22c962f1fa
|
remove deprecated call by reference
|
2013-01-29 18:44:42 -07:00 |
|
friendica
|
a804f2b5b5
|
Merge pull request #595 from fermionic/20130127-profile-permissions
don't block private posts to logged in users on the local hub
|
2013-01-28 13:55:55 -08:00 |
|
|
|
50a64a47fc
|
ZH-CN: update to the strings
|
2013-01-28 15:23:09 +01:00 |
|
|
|
612af04b1c
|
DE: update to the strings
|
2013-01-28 15:21:57 +01:00 |
|
|
|
5c3bce30d6
|
Merge branch 'master' of git://github.com/friendica/friendica
|
2013-01-28 07:00:07 +01:00 |
|
|
|
28e4b8512a
|
ZH-CN: update to the strings
|
2013-01-28 06:57:44 +01:00 |
|
Zach Prezkuta
|
2635c59c83
|
don't block private posts to logged in users on the local hub
|
2013-01-27 22:42:36 -07:00 |
|
friendica
|
ccb465eccd
|
Merge pull request #594 from fermionic/20130127-add-event-id-index
add event-id index to prevent large CPU loads when visiting the events page
|
2013-01-27 19:11:58 -08:00 |
|
friendica
|
a5ac69c65e
|
Merge pull request #591 from fermionic/20130126-javascript-free-theme
Decaf mobile: an (almost) Javascript-free theme
|
2013-01-27 19:11:36 -08:00 |
|
friendica
|
b58189bb98
|
Merge pull request #592 from fermionic/20130126-richtext-feature-fixes
make the richtext feature work for events, wall messages, and contact notes
|
2013-01-27 19:11:06 -08:00 |
|
friendica
|
d4984bff8d
|
Merge pull request #593 from fermionic/20130127-tinymce-update-and-fixes
TinyMCE 3.5.8 update; some fixes
|
2013-01-27 19:10:32 -08:00 |
|
friendica
|
38238972b5
|
really nitty permission tweaking
|
2013-01-27 18:10:26 -08:00 |
|
Zach Prezkuta
|
3f77eb80fe
|
add event-id index to prevent large CPU loads when visiting the events page
|
2013-01-27 17:52:44 -07:00 |
|
Zach Prezkuta
|
e0dd8944ce
|
some deleted files for tinymce update
|
2013-01-27 17:34:10 -07:00 |
|
Zach Prezkuta
|
6668d22d37
|
try to improve TinyMCE block handling
|
2013-01-27 14:41:48 -07:00 |
|
Zach Prezkuta
|
d39a2e8a9d
|
TinyMCE 3.5.8 update; some fixes
|
2013-01-27 14:26:43 -07:00 |
|
friendica
|
c9cce9873d
|
search privacy enhancements for those with blocked walls
|
2013-01-27 13:14:13 -08:00 |
|
friendica
|
ce8f31504e
|
rev update
|
2013-01-27 13:13:08 -08:00 |
|
Zach Prezkuta
|
a15fff2fc6
|
mark experimental
|
2013-01-26 13:10:10 -07:00 |
|
Zach Prezkuta
|
acc4d66cd3
|
update smart templates
|
2013-01-26 13:07:54 -07:00 |
|
Zach Prezkuta
|
187b6441c1
|
make the richtext feature work for events, wall messages, and contact notes
|
2013-01-26 13:03:01 -07:00 |
|
Zach Prezkuta
|
488a38cd85
|
Decaf mobile: an (almost) Javascript-free theme
|
2013-01-26 13:01:57 -07:00 |
|
friendica
|
8e62c8b27c
|
Merge pull request #590 from balderino/master
Added new files
|
2013-01-25 16:55:01 -08:00 |
|
friendica
|
37a5ff848d
|
Merge https://github.com/friendica/friendica into pull
|
2013-01-25 13:50:27 -08:00 |
|
friendica
|
04b48688b6
|
add form security to invite page and set maximum per user invites
|
2013-01-25 13:48:57 -08:00 |
|
