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 |
|
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 |
|
tommy tomson
|
caffb217c1
|
fixes
|
2012-03-12 23:31:54 +01:00 |
|
Tobias Hößl
|
59766b944c
|
Some security against XSRF-attacks
|
2012-03-12 20:17:37 +00:00 |
|
tomtom84
|
a1305433b8
|
Merge pull request #125 from tomtom84/master
fixes in diabook-derivates
|
2012-03-12 13:11:19 -07:00 |
|
tommy tomson
|
9436175746
|
add lightbox, fixex in css
|
2012-03-12 21:09:16 +01:00 |
|
Simon L'nu
|
9f52e3df8d
|
fix dispy-dark photo album stuff
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-11 21:34:51 -04:00 |
|
Simon L'nu
|
e9b82bb5ee
|
fix dispys' css and layout
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-11 20:36:16 -04:00 |
|
Simon L'nu
|
258a8c0871
|
screwed up on the font-size for screen last push
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-11 10:29:12 -04:00 |
|
Simon L'nu
|
fa0cb8514d
|
add some '@media handheld' types for dispys
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-11 10:24:49 -04:00 |
|
Simon L'nu
|
62fe48f064
|
fix more stuff
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-11 10:14:31 -04:00 |
|
Simon L'nu
|
57d8370376
|
fix some stuff right away
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-11 09:12:31 -04:00 |
|
Simon L'nu
|
f7ade749b8
|
preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-11 01:32:11 -05:00 |
|
friendica
|
1bddd48661
|
bug #327 - composed private message is lost if no recip specified.
|
2012-03-10 15:50:51 -08:00 |
|
tomtom84
|
c79cb57e1e
|
Merge pull request #118 from tomtom84/master
fixes in diabook-derivates
|
2012-03-10 04:24:49 -08:00 |
|
tommy tomson
|
0f3255467e
|
fixed login-fields, fixed. notofication.png, changed locations
|
2012-03-10 13:22:41 +01:00 |
|
|
|
1e37477fdc
|
German translation
|
2012-03-10 10:36:20 +01:00 |
|
Michael Johnston
|
fd1f8fb436
|
allow user to set number of items to show on network page
|
2012-03-09 21:29:39 -05:00 |
|
tomtom84
|
68ca29719e
|
Merge pull request #116 from tomtom84/master
fixes in diabook-derivates
|
2012-03-09 09:17:01 -08:00 |
|
tommy tomson
|
8fe4645a5d
|
add js to hide nav-menus, when clicked outside
|
2012-03-09 18:15:27 +01:00 |
|
tomtom84
|
68541b5dd2
|
Merge pull request #115 from tomtom84/master
fixes in diabook-derivates
|
2012-03-09 04:24:59 -08:00 |
|
tommy tomson
|
9f441731af
|
fixes in css
|
2012-03-09 13:23:38 +01:00 |
|
Alexander Kampmann
|
af34cf019c
|
Merge branch 'master' of git://github.com/friendica/friendica
|
2012-03-09 12:17:19 +01:00 |
|
friendica
|
2ce78253ae
|
Merge branch 'pull'
|
2012-03-09 00:48:16 -08:00 |
|
friendica
|
3878b58f0d
|
bug #324 - tinymce used for mail even if editplain being used.
|
2012-03-09 00:47:10 -08:00 |
|
