|
5babf5c8b4
|
Merge branch 'quattrofiler'
|
2012-03-22 13:42:10 +01:00 |
|
|
6df7fae4b5
|
non static filer text
|
2012-03-22 13:41:41 +01:00 |
|
|
54c08b2b0f
|
adding filer functionality to quattro(-green)
|
2012-03-22 12:41:51 +01:00 |
|
friendica
|
808180ce5f
|
missing tooltip for "file as"
|
2012-03-22 04:07:37 -07:00 |
|
tommy tomson
|
e37c4f69b4
|
add file_as-option to diabook-derivates
|
2012-03-22 06:54:18 +01:00 |
|
tommy tomson
|
72d0756fa6
|
add icons to aside diabook, fixes in css
|
2012-03-22 04:33:21 +01:00 |
|
friendica
|
89028f2e2f
|
add comix-plain
|
2012-03-21 13:55:37 -07:00 |
|
friendica
|
56495e04b2
|
smooth the comix comment box
|
2012-03-21 06:48:04 -07:00 |
|
friendica
|
1a98f3c067
|
ika to ica
|
2012-03-21 00:35:33 -07:00 |
|
friendica
|
adcf52d02d
|
facepark is unsupported ATM
|
2012-03-21 00:08:06 -07:00 |
|
friendica
|
db02eebde1
|
Merge branch 'pull'
|
2012-03-20 23:59:02 -07:00 |
|
friendica
|
6c7b619b34
|
remove stray template variable from old code
|
2012-03-20 23:57:33 -07:00 |
|
friendica
|
efd7c14c24
|
Merge pull request #154 from tonybaldwin/master
added theme
|
2012-03-20 23:31:12 -07:00 |
|
friendica
|
0dc4c3f484
|
add comix theme
|
2012-03-20 22:54:20 -07:00 |
|
friendica
|
4d39b0658f
|
use password field for DB input
|
2012-03-20 22:53:19 -07:00 |
|
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 |
|