Michael Vogel
|
93143702ed
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
boot.php
database.sql
library/fancybox/jquery.fancybox-1.3.4.css
mod/search.php
update.php
|
2013-02-17 12:35:40 +01:00 |
|
|
|
2e6577fb32
|
DE; update to the strings, fixing #476
|
2013-02-17 11:19:12 +01:00 |
|
Michael Vogel
|
3e58060b30
|
API: beautify the output of repeated items
Vier: Birthday reminder looks better
|
2013-02-15 20:14:45 +01:00 |
|
Fabrixxm
|
64ca15f7f9
|
update it strings
|
2013-02-15 11:23:49 -05:00 |
|
|
|
c5b8082c31
|
ZH-CN: update to the strings to 100% thx Matthew
|
2013-02-11 06:23:55 +01:00 |
|
|
|
3eeee2525c
|
CA: update to the strings
|
2013-02-11 06:21:10 +01:00 |
|
fermionic
|
8e80755a47
|
Merge pull request #615 from fermionic/20130210-update-frost-mobile
add new Smarty3 templates
|
2013-02-10 16:12:50 -08:00 |
|
Zach Prezkuta
|
e377fd9d22
|
add new Smarty3 templates
|
2013-02-10 17:11:55 -07:00 |
|
fermionic
|
6b6f00c702
|
Merge pull request #613 from fermionic/20130210-update-frost
update to Frost v0.4
|
2013-02-10 14:02:53 -08:00 |
|
Zach Prezkuta
|
646c161506
|
added files for Frost Mobile v0.3
|
2013-02-10 15:00:20 -07:00 |
|
Zach Prezkuta
|
4d8678e523
|
update to Frost v0.4
|
2013-02-10 14:57:44 -07:00 |
|
Zach Prezkuta
|
c1c83115ad
|
Update Frost-mobile to v0.3
|
2013-02-10 10:21:52 -07:00 |
|
|
|
5195d99216
|
ZH-CN: update to the strings
|
2013-02-08 17:26:08 +01:00 |
|
Zach Prezkuta
|
c4e6cb916d
|
move all commands inside the duepuntozero_init() function
|
2013-02-08 09:03:50 -07:00 |
|
friendica
|
c273adf0fe
|
Merge pull request #608 from fermionic/20130204-diabook-reduce-css
Try to start reducing Diabook CSS
|
2013-02-05 17:36:33 -08:00 |
|
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 |
|
Zach Prezkuta
|
d8f7e9be26
|
make the diabook-aerith -wide.css variants inherit from the non-wide css files
|
2013-02-04 22:34:48 -07:00 |
|
Zach Prezkuta
|
665af33726
|
have the base -wide.css variants inherit from the non-wide version
|
2013-02-04 22:17:55 -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
|
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 |
|
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 |
|
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 |
|
|
|
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 |
|
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 |
|
Zach Prezkuta
|
6668d22d37
|
try to improve TinyMCE block handling
|
2013-01-27 14:41:48 -07: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
|
488a38cd85
|
Decaf mobile: an (almost) Javascript-free theme
|
2013-01-26 13:01:57 -07: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 |
|
|
|
ec58e106c2
|
ZH-CN: update to the strings
|
2013-01-24 07:38:13 +01:00 |
|
|
|
cb4edf3928
|
IT: update to the strings
|
2013-01-24 07:37:16 +01:00 |
|
fabrixxm
|
9b394dbe1e
|
Merge pull request #589 from fabrixxm/master
Update fancybox, remove tiptip
|
2013-01-23 01:19:05 -08:00 |
|
Fabrixxm
|
a875bec75c
|
update fancybox, remove tiptip from head.tpl
|
2013-01-22 08:17:23 -05:00 |
|
|
|
03ec6cabda
|
PL: update to the strings
|
2013-01-22 08:01:25 +01:00 |
|
|
|
da12177aea
|
PL: update to the strings
|
2013-01-21 08:05:57 +01:00 |
|
Michael - piratica.eu
|
cc9ce39e3f
|
Merge branch 'master' of https://github.com/annando/friendica
Conflicts:
include/poller.php
|
2013-01-20 14:17:09 +01:00 |
|
Michael - piratica.eu
|
7ab335c9d6
|
Diaspora: Auto-adding users as friend who already sharing with us
|
2013-01-20 14:08:28 +01:00 |
|
