Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-24 13:20:15 +00:00
Code Issues Projects Releases Packages Wiki Activity
6356 commits 3 branches 64 tags 237 MiB
Commit graph

2149 commits

Author SHA1 Message Date
fabrixxm
2f5e891cd1 quattro theme: show uncollapsed comments on display page 2012-06-14 09:25:18 -04:00
friendica
4229debff8 ajax append placeholder, fix some html warnings 2012-06-13 21:40:02 -07:00
friendica
920ea2e1c7 archive widget 2012-06-12 20:46:30 -07:00
Vasudev Kamath
11974b4d94 Merge branch 'master' of git://github.com/friendica/friendica 2012-06-11 20:47:11 +05:30
Simon L'nu
1605bcd901 minor template update 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-09 18:07:19 -04:00
friendica
52d90674ea better events-reminder theming 2012-06-07 18:08:15 -07:00
fabrixxm
1d832618a4 fix a random profile error message 2012-06-07 08:49:33 -04:00
friendica
d2e86bdabc Merge https://github.com/friendica/friendica into pull 2012-06-06 22:29:35 -07:00
friendica
3b49035636 admin page untranslated strings, remove empty list element for update 2012-06-06 22:28:30 -07:00
zottel
6a95d483c7 A few corrections in German translations. 2012-06-07 01:43:32 +02:00
friendica
dd001e32f4 rev update 2012-06-06 16:02:10 -07:00
friendica
ae08d2c49b Merge https://github.com/friendica/friendica into pull 2012-06-05 17:59:49 -07:00
Tobias Diekershoff
c7b1b4b752 DE: update for the strings 2012-06-05 11:42:57 +02:00
Vasudev Kamath
079fdecff1 Merge branch 'master' of git://github.com/friendica/friendica 2012-06-04 19:59:23 +05:30
friendica
fe1dc1bf98 named anchors on display page 2012-06-04 04:28:20 -07:00
Tobias Diekershoff
b13c6ea9ad quattro: added editor buttons to comments 2012-06-04 11:49:16 +02:00
Vasudev Kamath
12474e3c2e Merge branch 'master' of git://github.com/friendica/friendica 2012-06-04 12:04:17 +05:30
Tobias Diekershoff
ca105f1c66 quattro: cleanup the less file 2012-06-04 07:17:23 +02:00
Simon L'nu
34f210bc2d fix mini photo-menu bug 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-03 18:10:04 -04:00
Zach Prezkuta
77962aa79d Fix bugs in the retraction code 
Currently, the following seems to be the functional status:
	For a Diaspora top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete for top-level owner
		Diaspora comments show up for non-owner
		Diaspora comments sometimes don't delete for non-owner
			-> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log

		Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora)
		Diaspora likes show up
		Diaspora non-owner can't unlike
			-> Same as comments, seems to be Diaspora's fault

	For a Friendica top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete

		Friendica likes don't show up in Diaspora sometimes
		Friendica doesn't even message Diaspora for unlikes (sometimes?)
		Diaspora likes and unlikes work
 2012-06-03 14:53:30 -06:00
Zach Prezkuta
c0af6dbb1a Implement relaying of relayable_retractions 
Also: some whitespace cleanup, fix Diaspora parent DB query
 2012-06-03 14:53:29 -06:00
Tobias Diekershoff
959b264c44 quattro: admin panel styling and 1st buttons for addon/theme overview 2012-06-03 22:32:42 +02:00
Tobias Diekershoff
2741ce67f8 privacy settings: make submit button translateable 2012-06-03 17:38:05 +02:00
Tobias Diekershoff
283524d990 DE: update to the strings 2012-06-03 17:33:28 +02:00
Tobias Diekershoff
6fbeafc843 prv messages: make submit translateable 2012-06-03 17:16:29 +02:00
friendica
d27c6de84e add hometown to profiles 2012-06-02 20:58:20 -07:00
friendica
608d424b0b "howlong" added to marital status. 2012-06-02 02:30:26 -07:00
friendica
1180919c89 some zero theming on settings page 2012-05-30 16:30:51 -07:00
friendica
bdcb8d27dd transition to beta for private forums 2012-05-30 15:52:17 -07:00
friendica
88a0d6a1d5 private group tests, cont. 2012-05-29 22:57:15 -07:00
friendica
b6fe837a64 hide private group if desired 2012-05-29 18:43:56 -07:00
Simon
43c185ce04 Merge pull request #316 from annando/master 
Speed improvements
 2012-05-29 13:13:10 -07:00
Simon L'nu
dd666e93d8 fix toolbar. more size dynamicism 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-29 16:09:02 -04:00
Michael Vogel
68757f2504 Merge remote branch 'upstream/master' 2012-05-29 16:09:26 +02:00
friendica
2eafa9a475 ability to only expire contacts, not self 2012-05-29 01:14:53 -07:00
friendica
2dc7e53435 more theme cleanup 2012-05-28 19:17:06 -07:00
Simon L'nu
cb259098dd fixed font-size/line-height stuffs 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-28 19:25:10 -04:00
friendica
6962989e52 slackr - tone down the shadows a smidgin 2012-05-27 23:02:25 -07:00
Michael Vogel
a71e3134bf Merge remote branch 'upstream/master' 2012-05-25 16:19:10 +02:00
friendica
d1345e5054 Merge https://github.com/friendica/friendica into pull 2012-05-25 00:43:09 -07:00
friendica
abb9fecf09 rev update 2012-05-25 00:42:38 -07:00
Tobias Diekershoff
07535692dc DE update to strings and templates 2012-05-25 06:04:33 +02:00
Simon
5bc0cfa067 Merge pull request #313 from fabrixxm/master 
install wizard: fix php executable path
 2012-05-24 16:30:22 -07:00
Simon L'nu
2a32917e3a update dark a bit. i messed up some buttons 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-24 19:28:12 -04:00
root
60df67b9e3 fix small js error when user not logged in 2012-05-24 04:29:33 -04:00
root
a5b8339a75 install wizard: fix php executable path 
- php executable not required
- "check again" button submit form instead of reload page via js
- checks form submit to install module without redirect
 2012-05-24 04:21:33 -04:00
friendica
f0ddcb979b slackr: improve interactivity 2012-05-23 23:29:45 -07:00
friendica
6c78d42050 slackr: hide calendar when posting 2012-05-23 18:20:24 -07:00
friendica
5d06e0060d Merge https://github.com/friendica/friendica into pull 2012-05-23 16:58:58 -07:00
friendica
60723702f1 more theme stuff 2012-05-23 16:58:31 -07:00
Simon L'nu
16f9d7fd35 clean up and more fixing 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-23 19:22:07 -04:00
friendica
19bf0aa283 slackr - better highlighting of current selections 2012-05-23 16:16:59 -07:00
friendica
5b7865f8f9 slackr - knock the sharp edges off the events calendar 2012-05-23 15:55:09 -07:00
Simon
5acd0a1c32 Merge pull request #309 from fabrixxm/master 
Update install wizard
 2012-05-23 15:10:24 -07:00
Simon L'nu
5198260e3a clean up and make nice the dispy photo edit stuff 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-23 18:06:49 -04:00
Simon L'nu
789063da39 add a placeholder attribute on search-text; dispy fixes 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-23 15:58:22 -04:00
root
325343a492 Update install wizard 
- writable .htconfig.php not required
- add test for working .htaccess/mod_rewrite configuration
- fix last pass: create tables, eventually show config text and print a "What next" section
 2012-05-23 07:38:31 -04:00
friendica
61dba985c1 photo rotation 2012-05-23 01:01:04 -07:00
friendica
8ffb65ceef event calendar theming 2012-05-22 22:34:35 -07:00
friendica
86a38cca24 import quattro event reminder 2012-05-22 22:06:52 -07:00
friendica
af495879af mark bubbles unsupported 2012-05-22 21:54:19 -07:00
friendica
3ac7c4e859 keep FB out of private notes 2012-05-22 21:20:31 -07:00
friendica
0da20ec9ef Merge https://github.com/friendica/friendica into pull 2012-05-22 18:06:34 -07:00
friendica
e70573f34c if identity (uid) changes - reload any other open browser windows on next ping. 2012-05-22 16:01:07 -07:00
Thomas Willingham
b962559570 Oops - but lets commit the right revision, sorry. There's a spare line in the last one. 2012-05-22 19:19:36 +01:00
Thomas Willingham
18983bb932 Fix darkzero/ns BB icon background colours. 2012-05-22 19:14:58 +01:00
friendica
f29f861d25 add queue totals to admin summary page 2012-05-22 03:44:03 -07:00
Tobias Diekershoff
be64437b14 DE: update to the strings and some mail templates 2012-05-22 12:17:01 +02:00
Simon L'nu
d466c9ab08 fix (min-)search-text text 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-21 21:38:53 -04:00
Simon L'nu
bd3c0edf34 updates to dispy family; fix typo in INSTALL.txt 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-21 21:29:18 -04:00
friendica
9ca3ac6e61 Merge https://github.com/friendica/friendica into pull 2012-05-21 16:43:07 -07:00
friendica
54e2c1ca81 rev update, bug 428, 429, and ability to block globaldir submissions from demo sites 2012-05-21 16:40:11 -07:00
Simon L'nu
627367e1ee more light fixes 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-21 06:48:08 -04:00
Simon L'nu
cb2702249f fix dumb mistake in light 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-21 02:47:43 -04:00
Simon L'nu
2ac55c9f21 fix dispy light 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-20 14:37:20 -04:00
Thomas Willingham
c6104fb856 Darkzero-NS + 'Friendicaland' countries. 2012-05-20 01:44:07 +01:00
Michael Vogel
8c80fe0bf5 Performance tests 2012-05-20 00:11:32 +02:00
Thomas Willingham
4484bd0e97 Darkzero, another missing part of "everything" 2012-05-19 17:30:55 +01:00
Thomas Willingham
b1c58511ad Diabook-dark - some more cleaning up 2012-05-19 17:20:27 +01:00
Thomas Willingham
a1b96d11a7 Okay, so maybe not *everything* 2012-05-19 15:17:35 +01:00
Thomas Willingham
d6ca4a1b42 Give Darkzero some loving. 
Everything that used to be hidden with light text on light backgrounds is legible now.
 2012-05-19 14:51:10 +01:00
Simon L'nu
4a35a51724 fix -desc again 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-19 03:15:35 -04:00
friendica
3821744450 apply max-width to images in posts, duepuntozero 2012-05-18 01:46:02 -07:00
friendica
34b79b4f2b theming for default group selector 2012-05-18 01:38:11 -07:00
friendica
7b0ded3f14 more private forums, default privacy group for new contacts 2012-05-17 22:44:52 -07:00
Simon L'nu
331013f281 fix admin links... 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-16 13:33:20 -04:00
Simon L'nu
a8a3732f05 *sigh*. fix dark *again* 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-16 05:51:29 -04:00
Simon L'nu
7eb73bc600 get rid of the monstrosity for .button. need to find alternate solution 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-16 05:32:08 -04:00
Simon L'nu
fca09c9d4c slight re-design of wall stuff and css/font cleaning 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-16 01:58:55 -04:00
Tobias Diekershoff
68dc7c3568 DE strings 2012-05-15 10:44:01 +02:00
friendica
0faa0c2ab1 slackr drop shadows extended 2012-05-14 21:45:37 -07:00
Simon L'nu
db5fe14241 finish dipsy light colour fixes 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-14 00:30:25 -04:00
tommy tomson
303856ce01 diabook-theme: small fixes 2012-05-13 20:51:39 +02:00
friendica
eaf028c9fb Merge https://github.com/friendica/friendica into pull 2012-05-12 22:20:03 -07:00
friendica
e7813f22af slackr drop shadows 2012-05-12 22:19:29 -07:00
Simon L'nu
93dc96e2cf css fixes; new screenshots 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-12 18:53:01 -04:00
friendica
72d8e0459d Merge pull request #294 from mschmitt/master 
Esperanto at 100% again
 2012-05-12 15:01:05 -07:00
Martin Schmitt
ae300bceb9 Ĝisdatigis la esperantlingvan tradukaĵon al 100%. 2012-05-12 16:56:31 +02:00
Vasudev Kamath
3a45d4f9e0 Merge branch 'master' of git://github.com/friendica/friendica 2012-05-12 20:20:26 +05:30
tommy tomson
9699d9cd01 diabook-theme: fix in earthlayers 2012-05-12 16:11:46 +02:00
tommy tomson
2882012e1b diabook-theme: some fixes 2012-05-12 13:50:22 +02:00
Simon L'nu
c6897d0dc4 finished migrating dispy light - maybe 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-12 07:29:36 -04:00
Vasudev Kamath
10db2f00f9 Merge branch 'master' of git://github.com/friendica/friendica 2012-05-12 12:10:09 +05:30
Thomas Willingham
2454028ef6 Darkzero - fixed notifications bar. 2012-05-12 00:32:47 +01:00
tommy tomson
48c48d644f diabook-theme: update mapquery and small fix 2012-05-11 16:41:16 +02:00
tommy tomson
74e79a06a8 diabook-theme: add "population density 2010"-layer to EarthLayers-box 2012-05-11 14:56:59 +02:00
friendica
49cd3f615d Merge https://github.com/friendica/friendica into pull 2012-05-11 04:05:25 -07:00
tommy tomson
f9d5e602ac diabook-theme:small fix 2012-05-11 13:04:25 +02:00
friendica
7600b9b1ee Merge https://github.com/friendica/friendica into pull 2012-05-11 03:42:05 -07:00
friendica
496782e468 moderated comment templates 2012-05-11 03:41:29 -07:00
tommy tomson
e13e5070a7 diabook-theme: small fix 2012-05-11 09:01:58 +02:00
tommy tomson
a81faead6e diabook-theme: include prv_message autocomplete 2012-05-11 08:39:39 +02:00
friendica
8a5dcf64d8 fix PM replies after autocomplete changes 2012-05-10 20:01:13 -07:00
tommy tomson
b2bd25a470 Merge remote-tracking branch 'origin/master' 2012-05-11 02:40:09 +02:00
tommy tomson
ccc825ccbc diabook-theme: small fix 2012-05-11 02:39:54 +02:00
Thomas Willingham
e7b8e839ae Diabook-dark. More touchups. 2012-05-10 17:14:27 +01:00
friendica
c5f6755bdd specified background image does not exist 2012-05-10 05:49:48 -07:00
tommy tomson
3ac5d19b92 diabook-theme: some fixes 2012-05-10 12:19:51 +02:00
friendica
c9bb888611 priv mail autocomplete, improved contrast for darkzero, etc. 2012-05-10 02:01:08 -07:00
friendica
93ae6ee97b Merge https://github.com/friendica/friendica into pull 2012-05-10 01:46:29 -07:00
friendica
774c51cc19 email autocomplete 2012-05-10 01:45:51 -07:00
tommy tomson
7b41c0a555 Merge remote-tracking branch 'origin/master' 2012-05-10 09:54:47 +02:00
tommy tomson
69b43582d0 diabook-theme: some css/bug-fixes 2012-05-10 09:54:16 +02:00
Simon L'nu
a077e63fa5 don't make -desc so obnoxious looking 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-10 02:27:48 -04:00
Thomas Willingham
89d3ce7b5d Diabook-dark - do things the right way instead of the stupid way. 2012-05-09 04:54:17 +01:00
Thomas Willingham
d2bbd92889 Fix TinyMCE, but needs adding to theme.php 2012-05-09 03:42:09 +01:00
Thomas Willingham
8a1f8515ca Fix jquery.fancybox, but still needs adding to theme.php 2012-05-09 03:31:56 +01:00
Thomas Willingham
a0293ae442 Diabook-dark cleaned up a bit. 2012-05-09 03:21:26 +01:00
friendica
a048fd806a don't provide 'show more' on remote friends in common unless there are actually more 2012-05-08 17:40:56 -07:00
Tobias Diekershoff
d2c2063084 DE update for the strings 2012-05-08 09:56:05 +02:00
tommy tomson
88443ed3fb diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie. 2012-05-08 03:29:25 +02:00
friendica
e8b9b8a403 separate poll_interval from delivery_interval - default is the same. 2012-05-07 04:21:54 -07:00
Simon L'nu
e554530430 more css tweaks. nothing major 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-07 01:20:32 -04:00
tommy tomson
e417f083b5 diabook-theme: small fix 2012-05-07 02:49:44 +02:00
tommy tomson
3d0a0b6abf diabook-theme: add "Earth Layers"-box at right_side 2012-05-07 02:24:43 +02:00
tommy tomson
66b9b60792 diabook-theme: twitterbox-bugfix 2012-05-06 23:26:44 +02:00
tommy tomson
f09b3cfbf8 diabook: small fix 2012-05-06 12:25:09 +02:00
tommy tomson
8bdbfdc853 Merge remote-tracking branch 'origin/master' 2012-05-06 12:09:22 +02:00
tommy tomson
abbb4c2f36 diabook-theme: bugfix 2012-05-06 12:08:46 +02:00
Simon L'nu
f32c3d74a4 fixing widths to be more dynamic where possible. font size fixes. add README.md 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-06 06:05:31 -04:00
tommy tomson
e1ab3a93cc diabook-theme: small fix 2012-05-06 00:36:46 +02:00
tommy tomson
c421f35da7 diabook-theme: twitter-box-update at right_aside 2012-05-06 00:10:35 +02:00
tommy tomson
f297751437 diabook-theme: can now set the twitter search term in theme-settings & small fixes 2012-05-05 20:01:38 +02:00
Vasudev Kamath
b5e857c0e7 Merge branch 'master' of git://github.com/friendica/friendica 2012-05-05 20:48:16 +05:30
friendica
8f26e698e6 Merge pull request #289 from cvogeley/master 
Option to set theme width added. Minor layout changes
 2012-05-05 05:04:05 -07:00
Tobias Diekershoff
f9f62ee7ec DE: new email templates translated 2012-05-05 09:11:25 +02:00
Christian Vogeley
7f061c255c Option to set theme width added. Minor layout changes 2012-05-05 00:45:35 +02:00
Simon L'nu
20ea1b7d4b fix lightbox; finished dark, now on to light 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-04 17:06:17 -04:00
Martin Schmitt
52f4563f30 Esperanto 100% 2012-05-04 12:02:05 +02:00
friendica
9ecd128e5e "show more" friends in common 2012-05-04 01:46:36 -07:00