Evan Prodromou
356022f45c
Merge branch '0.8.x' into userdesign
2009-05-22 20:53:34 -04:00
Evan Prodromou
9a7dbbc781
reformat laconica.sql
2009-05-22 20:53:22 -04:00
Evan Prodromou
3a44885b7f
reformat designsettings.php
2009-05-22 20:50:08 -04:00
Sarven Capadisli
456f3eeb50
Removed unnecessary link to base stylesheet because default stylesheet calls base in 0.8.x
2009-05-22 16:38:06 +00:00
Sarven Capadisli
ef2a5c794e
Fixed in reply to JS link for Conversation page. Handles nested
...
notices better.
2009-05-22 16:19:14 +00:00
Sarven Capadisli
f1a61cf629
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-05-22 16:18:48 +00:00
Evan Prodromou
677434b113
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-05-22 10:21:22 -04:00
Evan Prodromou
ebc16062ed
Merge branch 'review/master' into 0.8.x
2009-05-22 10:21:01 -04:00
Sarven Capadisli
47d475d66a
Merge branch '0.7.x' into 0.8.x
2009-05-22 14:18:15 +00:00
Evan Prodromou
b118ef633a
Add Gravity to notice sources
2009-05-22 10:03:47 -04:00
Sarven Capadisli
1e04e68044
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
2009-05-21 22:50:27 -04:00
Sarven Capadisli
9f23807af4
Removed inline styles from notice list items
2009-05-22 02:47:34 +00:00
Sarven Capadisli
69e88546fd
Init styles for conversation page
2009-05-22 02:46:22 +00:00
Sarven Capadisli
0b9c65ce4f
Facebook Connect account setup markup and CSS rearrangement for
...
license information (it comes before and applies to both connection
options)
2009-05-22 01:53:58 +00:00
Sarven Capadisli
5b1ba5619c
Form markup for Facebook Connect
2009-05-22 01:43:01 +00:00
Sarven Capadisli
eeb54ec97a
Minor alignment for FB logo
2009-05-22 01:29:16 +00:00
Sarven Capadisli
a418958a01
Styles for Facebook logo and user avatar
2009-05-22 01:25:43 +00:00
Zach Copley
b134784df9
Custom stylesheet for the Facebook Connect plugin
2009-05-22 01:22:07 +00:00
Zach Copley
eaf2a98daf
- Show Facebook profile pic and favicon as dictated by Facebook Connnect policy
...
- Logout fixed, again (cleans up Facebook cookies now)
2009-05-22 00:54:22 +00:00
Sarven Capadisli
5975084019
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
2009-05-21 19:42:26 -04:00
Evan Prodromou
f25990cf8e
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-05-21 12:40:52 -04:00
Evan Prodromou
966f1c6169
Merge branch 'conversationtree' into 0.8.x
2009-05-21 11:43:28 -04:00
Evan Prodromou
62711ae2ba
show conversation as a hierarchical list
2009-05-21 11:43:09 -04:00
Zach Copley
07de94ca99
Merge branch '0.8.x' into fbconnect
2009-05-21 05:46:38 +00:00
Zach Copley
54cd0a2046
- Reworked login / logout workflow
...
- Added Facebook Connect tab to login nav
- Show Facebook mini-avatar when logged in
- Added Facebook Connect tab to connect settings nav
- Option to disconnect from Facebook
2009-05-21 05:43:11 +00:00
Sarven Capadisli
f4e01f1444
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
2009-05-20 20:18:58 -04:00
Sarven Capadisli
689dd9ee5f
Updated primary and secondary styles for biz, cloudy, h4ck3r, otalk,
...
pigeonthoughts themes.
2009-05-21 00:18:11 +00:00
Sarven Capadisli
56a8a255ff
Changed No/Yes and Reset/Save locations. They are now a little more
...
usable by first offering the option to undo and than do.
2009-05-21 00:12:48 +00:00
Sarven Capadisli
7ae2ed7cfc
Merge branch '0.7.x' into 0.8.x
2009-05-20 23:40:44 +00:00
Sarven Capadisli
d835267cc7
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
2009-05-20 19:40:29 -04:00
Sarven Capadisli
b23d423081
Added licensing information for jcrop.go and farbtastic.go scripts
2009-05-20 23:37:20 +00:00
Sarven Capadisli
6fb36edea3
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-05-20 23:13:10 +00:00
Sarven Capadisli
b561962b59
Color picker reset: Resetting form values will also dynamically update
...
the page colors back to their original.
2009-05-20 23:11:35 +00:00
Zach Copley
1a5ef90ea0
Preserve order of imported Tweets
2009-05-20 22:08:08 +00:00
Eric Helgeson
a3280961d2
Removed return from 1st line of runDbScript()
...
fixed broken html tag on success page.
handlePost() now will show as many errors as it can (instead of one at a time)
checkPrereqs() will show all errors at once instead of failing on first one, installer will be able to try to fix all instead of fixing one at a time and trying again.
writeConf(): added if LACONICA is !defined exit
Tests: drop database and remove config.php, ran installer. Passed.
2009-05-20 16:39:08 -05:00
Eric Helgeson
dbf82f7c1e
fixed missing closing php tag when installer.php wrote to config.php
2009-05-20 15:14:04 -05:00
Zach Copley
8545a1c5fe
Reorganized some stuff and made new Facebook Login tab
2009-05-20 06:46:11 +00:00
Zach Copley
f90d0ac6c8
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-05-20 00:56:35 +00:00
Zach Copley
f841dd6af4
Fixed sporatic problem with logout.
2009-05-20 00:55:59 +00:00
Evan Prodromou
b58edbcc4e
Merge branch '0.7.x' into conversationtree
2009-05-19 17:28:19 -04:00
Evan Prodromou
dd916abd8c
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-05-19 15:08:01 -04:00
Evan Prodromou
8cc8f9fd0c
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
...
Conflicts:
config.php.sample
2009-05-19 14:42:19 -04:00
Evan Prodromou
003c63e587
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into dev/0.8.x
2009-05-19 17:43:14 +00:00
Sarven Capadisli
09e95cc33f
Fixed array index
2009-05-19 17:31:43 +00:00
Sarven Capadisli
0c442e459e
Added reset button
...
Rearranged swatch layout
Added background image upload input file
2009-05-19 17:05:30 +00:00
Sarven Capadisli
62d2229573
Removed visited and vcard background (matches identica theme)
2009-05-19 01:24:35 +00:00
Sarven Capadisli
4676171162
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
2009-05-18 21:23:11 -04:00
Zach Copley
4186dd2691
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-05-19 01:08:28 +00:00
Zach Copley
35b3934233
Logout works properly now.
2009-05-19 01:07:45 +00:00
Sarven Capadisli
8c5d1b63df
Removed visited and vcard a background colors.
2009-05-19 00:09:06 +00:00
