tony baldwin
|
e5c29fcc78
|
Merge remote branch 'upstream/master'
|
2012-03-21 01:36:23 -04:00 |
|
tony baldwin
|
cf17606d0f
|
added Vijay's theme from facepark.in
|
2012-03-21 01:33:48 -04:00 |
|
Simon L'nu
|
de0298e67e
|
some tweakings for intro boxes (finally got an intro i could see :). dispy synced with dispy-dark
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-20 11:37:51 -04:00 |
|
friendica
|
cca524495c
|
community discovery cont., cleanup of DB debugging
|
2012-03-18 22:12:36 -07:00 |
|
friendica
|
c286681158
|
Merge pull request #147 from CatoTH/master
CSRF-Protection in the group-related form
|
2012-03-18 17:54:12 -07:00 |
|
Simon L'nu
|
e84095182f
|
fix the comment box being too wide and looking off-kilter
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-18 18:33:38 -04:00 |
|
Tobias Hößl
|
453b5b46a3
|
CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it)
|
2012-03-18 15:44:33 +00:00 |
|
Simon L'nu
|
87fdae2dd8
|
[fix] whitespace in photo_view and like_noshare. dispy-dark clean up
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-17 01:55:40 -04:00 |
|
Simon L'nu
|
75883b196e
|
remove auto-complete from darkzero-NS, dispys, since the comment one is now global
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-16 21:23:24 -04:00 |
|
Simon L'nu
|
368d93625d
|
make auto-complete in darkzero-NS. other themes can use this easily. might need to edit the id it hooks into
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-16 20:29:02 -04:00 |
|
Simon L'nu
|
91fee866b7
|
make profiles-menu disappear when clicked outside it
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-16 16:43:34 -04:00 |
|
Simon
|
1246a40ec2
|
Merge pull request #141 from CatoTH/master
Private messages - tabindex
|
2012-03-16 10:54:20 -07:00 |
|
Tobias Hößl
|
90bb32ab73
|
Bugfix of old IEs
|
2012-03-16 17:47:40 +00:00 |
|
Tobias Hößl
|
27054964fe
|
Forgot to remove a debug line
|
2012-03-16 17:46:26 +00:00 |
|
Tobias Hößl
|
75823c2353
|
Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button
|
2012-03-16 17:45:07 +00:00 |
|
Simon L'nu
|
7b15f27ba4
|
weee, dispys get another update
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-16 13:31:59 -04:00 |
|
Simon L'nu
|
d965f73ef1
|
missing close double quote in mail_list.tpl
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-16 01:57:27 -04:00 |
|
Simon L'nu
|
6bdb71f01c
|
more changes in dispy-dark
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-16 01:55:34 -04:00 |
|
friendica
|
33e03a8df0
|
Merge branch 'pull'
|
2012-03-15 19:56:32 -07:00 |
|
friendica
|
5a12383b78
|
undo git stuffup
|
2012-03-15 19:55:58 -07:00 |
|
tommy tomson
|
02395c8af5
|
added icons to profile_side, fixes in css
|
2012-03-16 03:49:43 +01:00 |
|
friendica
|
5d2c590fa9
|
Merge pull request #136 from annando/master
Mail improvements, item caching and so on
|
2012-03-15 15:30:52 -07:00 |
|
Simon L'nu
|
5c75d40c0b
|
fixed the sidebar edit thingy. haven't synced dispy yet.
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-15 17:27:06 -04:00 |
|
Michael Vogel
|
9243c9fc14
|
Merge commit 'upstream/master'
|
2012-03-15 21:11:58 +01:00 |
|
Simon L'nu
|
5b757e4e0e
|
commit latest to dispy-dark. fixes in html css and js
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-15 15:07:17 -04:00 |
|
friendica
|
a7fd3a8b24
|
Merge branch 'pull'
|
2012-03-15 01:48:10 -07:00 |
|
friendica
|
4cd3d5cd02
|
Merge https://github.com/friendica/friendica into pull
|
2012-03-15 01:48:07 -07:00 |
|
tommy tomson
|
6dbee45d92
|
add links to wall, photos, events, etc to aside on networkpage, fixes in css
|
2012-03-15 08:29:39 +01:00 |
|
friendica
|
93a8907f43
|
force login to ssl on SSL_POLICY_SELFSIGN
|
2012-03-14 21:29:44 -07:00 |
|
friendica
|
f0a62d8908
|
ssl_policy stuff
|
2012-03-14 20:36:23 -07:00 |
|
friendica
|
531201f2a1
|
Merge pull request #132 from campino/master
Test cases
|
2012-03-14 15:16:30 -07:00 |
|
friendica
|
959aa13de0
|
Merge pull request #133 from tonybaldwin/master
slack-NS
|
2012-03-14 15:15:34 -07:00 |
|
friendica
|
2dc527609e
|
Merge https://github.com/friendica/friendica into pull
|
2012-03-14 14:34:48 -07:00 |
|
Simon
|
c95deb4839
|
Merge pull request #134 from simonlnu/master
PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
|
2012-03-14 08:02:04 -07:00 |
|
Alexander Kampmann
|
70709a8825
|
Merge branch 'master' of git://github.com/friendica/friendica
Conflicts:
view/de/strings.php
|
2012-03-14 12:57:35 +01:00 |
|
tommy tomson
|
f03c57007a
|
fix in nav
|
2012-03-14 12:56:59 +01:00 |
|
tommy tomson
|
42462cc1f0
|
add links to home, profile, photos, events, notes to aside in network-stream
|
2012-03-14 12:50:11 +01:00 |
|
Simon
|
fb77bfa648
|
Merge pull request #131 from simonlnu/master
massive work done to both dispys, mostly -dark
|
2012-03-13 22:10:02 -07:00 |
|
Simon L'nu
|
975781d3e2
|
massive work done to both dispys, mostly -dark
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-14 01:05:08 -04:00 |
|
friendica
|
4972d7ef6e
|
more work on filer, comment level and file tag removal
|
2012-03-13 20:46:37 -07:00 |
|
Tony Baldwin
|
1ae740535d
|
added slack-NS, non-scrolly, slackr-based theme.
|
2012-03-13 23:05:04 -04:00 |
|
friendica
|
be48fff157
|
file as widget and basic filing implementation for duepuntozero,slackr
much more work needed - this is just for test/evaluation currently
|
2012-03-13 18:13:03 -07:00 |
|
friendica
|
427362c324
|
Merge branch 'pull'
|
2012-03-13 15:41:13 -07:00 |
|
friendica
|
dc84da520d
|
invite potential connectees to the free social web
|
2012-03-13 15:40:16 -07:00 |
|
friendica
|
acc4bbeb6e
|
Merge pull request #129 from CatoTH/master
CSRF-Protection and minor changes
|
2012-03-13 14:36:52 -07:00 |
|
friendica
|
bf7425c591
|
click anywhere to close notifications -> zeros and bubbles
|
2012-03-12 20:21:32 -07:00 |
|
tommy tomson
|
8358b9247f
|
fix css
|
2012-03-13 00:38:38 +01:00 |
|
tomtom84
|
ecc9f4ba70
|
Merge pull request #127 from tomtom84/master
fixes in diabook-derivates
|
2012-03-12 16:06:15 -07:00 |
|
tommy tomson
|
27bc8052d0
|
use fancybox instead of lightbox
|
2012-03-13 00:04:19 +01:00 |
|
tomtom84
|
8a85914e1d
|
Merge pull request #126 from tomtom84/master
fixes in diabook-derivates
|
2012-03-12 15:33:29 -07:00 |
|