Commit Graph

176 Commits

Author SHA1 Message Date
Zach Copley
76cbeff33c Update background image settings to use bitflags 2009-06-17 02:35:51 -07:00
Zach Copley
7b7f119428 Added background image tile flag to Design 2009-06-16 21:36:15 -07:00
Zach Copley
92f095f589 Merge branch '0.8.x' into userdesign
* 0.8.x: (32 commits)
  updates to Status_network
  makeadmin action
  make admins of groups
  show aliases when showing a group
  Link and distribute notices tagged for a group alias
  Code for adding and saving group aliases
  Styles for group block
  add correct li for css magic for block stuff
  typo in profileminilist class
  return count from show
  try to get the right class for profileminilist
  fix perms for classes/statusnet.ini
  fixup perms for classes
  Added Group_alias class
  add a table for group aliases
  Cross-browser notice_attach
  Allow users to be unblocked from a group
  Some UI improvements for blocking and unblocking
  The rest of the things necessary to make group block work
  Make group block work
  ...

Conflicts:
	db/laconica.sql
	lib/common.php
2009-06-15 11:50:08 -07:00
Evan Prodromou
eb6a60ef88 updates to Status_network 2009-06-15 08:54:52 -07:00
Evan Prodromou
0deb2928e6 add a table for group aliases 2009-06-14 21:40:47 -07:00
Evan Prodromou
10b7e8ff69 Merge branch '0.8.x' into groupblock 2009-06-14 14:55:08 -07:00
Robin Millette
21e89d6f72 Commented all .sql fields for file/url related tables. 2009-06-14 16:06:52 -04:00
Evan Prodromou
754b610ac4 added group_block table to database 2009-06-14 12:04:45 -07:00
Evan Prodromou
4df1ea49ec Merge branch '0.8.x' into userdesign
Conflicts:
	actions/designsettings.php
2009-06-09 21:51:24 -07:00
Evan Prodromou
adfb79a9bb Merge branch '0.7.x' into 0.8.x
Conflicts:
	classes/Notice.php
	classes/Profile.php
	lib/common.php
	lib/util.php
	scripts/getvaliddaemons.php
	scripts/stopdaemons.sh
2009-06-08 11:55:32 -07:00
Evan Prodromou
79ede2afdb add get2gnow 2009-05-30 01:30:10 -04:00
Zach Copley
6885f082ea Added Afficheur to notice sources 2009-05-28 17:51:45 -07:00
Sarven Capadisli
a456ceb47c Merge branch '0.7.x' into 0.8.x 2009-05-29 00:10:23 +00:00
Evan Prodromou
047038959c Add any.io to sources 2009-05-28 17:37:17 -04:00
Zach Copley
3d13a44b66 Upgraded foreign_id column to handle new 64-bit Facebook user IDs.
See: http://developers.facebook.com/news.php?blog=1&story=226
2009-05-27 17:59:49 -07:00
Evan Prodromou
648d967226 Merge branch '0.8.x' into userdesign
Conflicts:
	lib/attachmentlist.php
	lib/noticelist.php
2009-05-26 23:24:01 -04:00
Zach Copley
a497114a55 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-05-26 23:22:29 +00:00
Zach Copley
e149404210 Add EventBox to notice sources 2009-05-26 21:36:17 +00:00
Evan Prodromou
0b53a820c2 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-05-26 17:28:12 -04:00
Evan Prodromou
74b08bff53 Added AgentSolo.com 2009-05-26 15:27:13 -04:00
Evan Prodromou
1306deff38 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-05-26 15:22:59 -04:00
Evan Prodromou
a1f83b2933 added qtwitter 2009-05-26 15:22:12 -04:00
Zach Copley
18b1304562 Add EventBox to notice sources 2009-05-25 14:23:00 -07:00
Evan Prodromou
b0e92c75cc move design items before timestamps 2009-05-23 23:16:52 -04:00
Evan Prodromou
78564c21d4 schema changes for user support of designs 2009-05-22 23:43:38 -04:00
Evan Prodromou
2f0fe8e33a add design table to DB 2009-05-22 20:54:07 -04:00
Evan Prodromou
9a7dbbc781 reformat laconica.sql 2009-05-22 20:53:22 -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
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
Robin Millette
6c4e26fe61 Added sql files to handle attachments (not yet tested) Hoping someone will improve the postgres version. 2009-05-15 16:17:44 -04:00
Sarven Capadisli
9a566c51cd Merge branch '0.7.x' into 0.8.x 2009-05-10 23:13:22 +00:00
Sarven Capadisli
d6ec21fbc6 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-05-10 23:12:52 +00:00
CiaranG
9a8095079d PostgreSQL - added dirty dates to Foreign_link - see 3e7b1e69e3 2009-05-08 08:14:50 +01:00
Zach Copley
3e7b1e69e3 Added dirty dates to Foreign_link 2009-05-07 15:55:04 -07:00
Zach Copley
4b0e5ff271 Added Twitter to notice sources 2009-05-07 14:07:03 -07:00
Sarven Capadisli
aaeed091d2 Merge branch '0.7.x' into 0.8.x 2009-05-05 22:54:46 +00:00
Evan Prodromou
6a12598695 add pingvine notice source 2009-05-03 21:36:03 -07:00
Sarven Capadisli
d30df07908 Merge branch '0.7.x' into 0.8.x
Resolved Conflicts:
	lib/queuehandler.php
	lib/util.php
	theme/base/css/display.css
2009-05-01 00:16:25 +00:00
Zach Copley
f798d1ea43 Added dirty dates to Foreign_link 2009-04-28 17:08:20 -07:00
CiaranG
4cb0a92980 Add feed2omb to notice sources 2009-04-21 20:43:57 +01:00
Sarven Capadisli
8d4738d956 Merge branch '0.7.x' into 0.8.x 2009-04-19 23:40:26 +00:00
Evan Prodromou
e9213043a8 add reply_to index to notice 2009-04-18 19:36:25 -07:00
Sarven Capadisli
4c29cda000 Merge branch '0.7.x' into 0.8.x 2009-04-14 19:14:32 +00:00
Zach Copley
9f2e2e4b2c Notice sources: Fixed Nambu, added Tricklepost and sorted the list. 2009-04-14 11:50:59 -07:00
Sarven Capadisli
c9c5ec0e4b Merge branch '0.7.x' into 0.8.x 2009-04-10 17:39:56 +00:00
Evan Prodromou
fba0249932 add cliqset 2009-04-10 11:36:46 -04:00
Evan Prodromou
08c08d02aa Added maisha to notice_source 2009-04-10 10:47:53 -04:00
Evan Prodromou
4e3e4fcfff Merge branch '0.7.x' into 0.8.x 2009-04-07 17:14:23 -04:00
Evan Prodromou
5953d56fe2 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-04-07 17:12:53 -04:00