Commits · e75c9988ebe33822e493ac225859bc593ff9b855 · gnu.io / gnu-social

10 Apr, 2011 1 commit
- Merge branch 'people_tags_rebase' into 1.0.x · e75c9988
  Zach Copley authored Apr 10, 2011
```
Conflicts:
	EVENTS.txt
```
  e75c9988
09 Apr, 2011 17 commits
- Fix incorrect parameter notation. · 396005ec
  Siebrand Mazeland authored Apr 10, 2011
  
  396005ec
- Update translator documentation. · d6aea8e3
  Siebrand Mazeland authored Apr 10, 2011
  
  d6aea8e3
- Hide RSVPs from threaded notice output · 638d29a8
  Evan Prodromou authored Apr 09, 2011
  
  638d29a8
- hide poll response notices from threaded view · b80ece16
  Evan Prodromou authored Apr 09, 2011
  
  b80ece16
- fix errant class in notice content · c382a1d8
  Evan Prodromou authored Apr 09, 2011
  
  c382a1d8
- Events for showing the 'tail' of a threaded notice · 4d0f42ae
  Evan Prodromou authored Apr 09, 2011
  
  4d0f42ae
- Revert "Add an indicator saying to whom a notice is addressed" · 8aacc4b8
  Evan Prodromou authored Apr 09, 2011
```
This reverts commit 2c14185a.
```
  8aacc4b8
- add classes to profile and group links in notices · ec157947
  Evan Prodromou authored Apr 09, 2011
  
  ec157947
- Add an indicator saying to whom a notice is addressed · 2c14185a
  Evan Prodromou authored Apr 09, 2011
  
  2c14185a
- Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x · 8b46624d
  Evan Prodromou authored Apr 09, 2011
  
  8b46624d
- Make sure something's an int before comparing to -1 · 070b0763
  Evan Prodromou authored Apr 09, 2011
  
  070b0763
- Fix incorrect translator documentation. Spotted by OsamaK. · 5a377a24
  Siebrand Mazeland authored Apr 09, 2011
  
  5a377a24
- Localisation updates from http://translatewiki.net . · 396a0c08
  Siebrand Mazeland authored Apr 09, 2011
  
  396a0c08
- Fix type conversion warnings caused when calling getUser / getProfile for the second time · fc21e5c7
  Shashi Gowda authored Apr 09, 2011
  
  fc21e5c7
- Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase · f47027ab
  Shashi Gowda authored Apr 09, 2011
```
Conflicts:
	lib/profileblock.php
	theme/default/css/display.css
```
  f47027ab
- use notifyDeferred for tag/untag so that it gets queued offline · a0ac51c2
  Shashi Gowda authored Apr 09, 2011
  
  a0ac51c2
- Remove debugging statement · 285c2ee7
  Zach Copley authored Apr 08, 2011
  
  285c2ee7
08 Apr, 2011 22 commits
- Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x · e3789488
  Zach Copley authored Apr 08, 2011
```
* '1.0.x' of gitorious.org:statusnet/mainline:
  use conversationnoticestream in conversationrepliesaction
  use conversationnoticestream in conversationaction
  make ConversationNoticeStream accept a profile parameter
  enable user directory and extended profile by default
  Remove incompatible theme victorian
  Remove incompatible theme shiny
  Remove incompatible theme pigeonthoughts
  Remove incompatible theme mnml
  Remove incompatible theme identica
  Remove incompatible theme h4ck3r
  Remove incompatible theme default
  Remove incompatible theme cloudy
  Remove incompatible theme cleaner
  Remove incompatible theme clean
  Remove incompatible theme biz
  correctly return for deleted items
  show event as deleted
  Use pkeyGet() instead of idStream() for fave caching
  store oft-requested stuff in the data object
```
  e3789488
- Add some more events to aside profile blocks and rework a bit · 3022d711
  Zach Copley authored Apr 08, 2011
  
  3022d711
- use conversationnoticestream in conversationrepliesaction · 9a86e64b
  Evan Prodromou authored Apr 08, 2011
  
  9a86e64b
- use conversationnoticestream in conversationaction · 79f3c093
  Evan Prodromou authored Apr 08, 2011
  
  79f3c093
- make ConversationNoticeStream accept a profile parameter · 85c4e11f
  Evan Prodromou authored Apr 08, 2011
  
  85c4e11f
- enable user directory and extended profile by default · dc255642
  Evan Prodromou authored Apr 08, 2011
  
  dc255642
- Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x · 8cb0d7e7
  Evan Prodromou authored Apr 08, 2011
  
  8cb0d7e7
- Remove incompatible theme victorian · af02de01
  Evan Prodromou authored Apr 08, 2011
  
  af02de01
- Remove incompatible theme shiny · 53df5470
  Evan Prodromou authored Apr 08, 2011
  
  53df5470
- Remove incompatible theme pigeonthoughts · c0697752
  Evan Prodromou authored Apr 08, 2011
  
  c0697752
- Remove incompatible theme mnml · 86d99f35
  Evan Prodromou authored Apr 08, 2011
  
  86d99f35
- Remove incompatible theme identica · 28d254e1
  Evan Prodromou authored Apr 08, 2011
  
  28d254e1
- Remove incompatible theme h4ck3r · eb4ec37a
  Evan Prodromou authored Apr 08, 2011
  
  eb4ec37a
- Remove incompatible theme default · 0079a000
  Evan Prodromou authored Apr 08, 2011
  
  0079a000
- Remove incompatible theme cloudy · 400f5033
  Evan Prodromou authored Apr 08, 2011
  
  400f5033
- Remove incompatible theme cleaner · ecf357f4
  Evan Prodromou authored Apr 08, 2011
  
  ecf357f4
- Remove incompatible theme clean · 6f8ecc2e
  Evan Prodromou authored Apr 08, 2011
  
  6f8ecc2e
- Remove incompatible theme biz · 7ad0404e
  Evan Prodromou authored Apr 08, 2011
  
  7ad0404e
- Don't try to show search and tag subs unless a user is logged in · 8335d234
  Zach Copley authored Apr 08, 2011
  
  8335d234
- Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x · bfc33f39
  Evan Prodromou authored Apr 08, 2011
  
  bfc33f39
- Update translator documentation. · ea820862
  Siebrand Mazeland authored Apr 08, 2011
```
Whitespace updates.
Header updates.
Break long lines in README.
Indentation updates.
```
  ea820862
- Fixed incorrect single quotes with newlines from Commit:3e8bf13a . · b7753189
  Siebrand Mazeland authored Apr 08, 2011
  
  b7753189