GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
8,097 Commits 8 Branches 4 Tags 309 MiB
Commit Graph

8097 Commits

Author SHA1 Message Date
Craig Andrews 057ec1fcea Merge branch '0.9.x' into 1.0.x 
Conflicts:
	EVENTS.txt
	lib/imqueuehandler.php
	lib/jabber.php
	lib/util.php
	plugins/Xmpp/Sharing_XMPP.php
 2010-02-02 17:00:10 -05:00
Siebrand Mazeland f60f2c523f Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-02-02 20:26:21 +01:00
Brion Vibber f4c81fa1e1 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-02-02 09:57:50 -08:00
Brion Vibber 027c7e61fd Fix regression breaking file attachments. This is what I get for rushing fixes and not properly testing them. :P 2010-02-02 09:30:15 -08:00
Sarven Capadisli 245610d2e1 Removed entity flag stylesheet and icons from plugin to core. 2010-02-02 16:27:58 +01:00
Sarven Capadisli a1f55c3f80 Added flag icon to core 2010-02-02 16:14:37 +01:00
Sarven Capadisli 7cecd7f722 Added single icon for Clear 2010-02-02 16:09:39 +01:00
Sarven Capadisli f2bbff24e5 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-02 16:07:35 +01:00
Sarven Capadisli 65c5d7813b Added icon to Clear label for UserFlag plugin 2010-02-02 16:06:22 +01:00
Brion Vibber 5f14301c55 setconfig.php: list all current settings if no parameters given 2010-02-02 06:15:01 -08:00
Sarven Capadisli 7b690dab8f Minor alignment notice form alignment for default theme 2010-02-02 13:16:30 +01:00
Sarven Capadisli cc256aaa67 Updated StatusNet logos 2010-02-02 13:12:03 +01:00
Zach Copley dae28d98d1 Linkify notice source when posting from registered OAuth apps 2010-02-02 08:51:01 +00:00
Zach Copley 3906713b2a Suppress notice input box on OAuth authorization page 2010-02-02 08:50:45 +00:00
Zach Copley 8191273078 Better token revocation 2010-02-02 08:50:33 +00:00
Zach Copley f0875ceea1 Allow developers to delete OAuth applications 2010-02-02 08:50:18 +00:00
Zach Copley df2a081265 OAuth app names should be unique. 2010-02-02 08:50:01 +00:00
Zach Copley 2be00ce642 Merge branch 'oauth-continued' into 0.9.x 2010-02-02 08:48:52 +00:00
Zach Copley 5e90f744a6 Linkify notice source when posting from registered OAuth apps 2010-02-02 08:47:14 +00:00
Zach Copley c03883fc88 Suppress notice input box on OAuth authorization page 2010-02-02 07:59:28 +00:00
Zach Copley f1094185e4 Better token revocation 2010-02-02 07:35:54 +00:00
Zach Copley 38bebb4c0d Allow developers to delete OAuth applications 2010-02-02 06:26:03 +00:00
Sarven Capadisli dabfe19098 Fixed margin-left on lists inside .hentry and .form_settings 2010-02-01 23:17:12 +00:00
Sarven Capadisli 803c6d954c Revert "Removed hAtom pattern from registration page." 
This reverts commit d6fe865133.

Screws up list rendering when registration is complete.
 2010-02-01 23:10:44 +00:00
Ciaran Gultnieks 952b580698 Create new field in consumer table in 08to09.sql 2010-02-01 21:05:50 +00:00
Zach Copley 59d16cf16a OAuth app names should be unique. 2010-02-01 20:58:30 +00:00
Sarven Capadisli 95e70f5e53 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-01 20:32:48 +01:00
Sarven Capadisli d40e72beca Prevents app statistic text from wrapping around avatar 2010-02-01 20:32:18 +01:00
Sarven Capadisli 0e49b3525d Sentence case for app statistics 2010-02-01 20:31:56 +01:00
Evan Prodromou f964357de9 readme and version for beta5 2010-02-01 13:44:06 -05:00
Brion Vibber c14ac57b19 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-02-01 10:30:45 -08:00
Brion Vibber fba4153346 Don't enqueue into plugin or SMS queues when disabled (breaks unqueuehandler if SMS queue isn't attached) 2010-02-01 10:16:19 -08:00
Ciaran Gultnieks 85544d369d Added oauth_appication tables to 08to09.sql 2010-02-01 17:28:15 +00:00
Brion Vibber 1625a13b93 Merge remote branch 'statusnet/master' into testing 2010-02-01 09:04:13 -08:00
Brion Vibber 6159edcebb Improve name validation checks on local File references 2010-02-01 08:49:59 -08:00
Evan Prodromou 0787daff2c Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-01 11:49:50 -05:00
Brion Vibber d9e7d4c4ad Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-01 08:49:19 -08:00
Brion Vibber 84ab0156b4 Improve name validation checks on local File references 2010-02-01 08:48:31 -08:00
Evan Prodromou 7390b1d1ac Merge branch 'master' into testing 2010-02-01 11:21:50 -05:00
Evan Prodromou 57d8f22a3a fix local file include vulnerability in doc.php 
Conflicts:

	actions/doc.php
 2010-02-01 11:20:22 -05:00
Evan Prodromou d264db6119 fix local file include vulnerability in doc.php 
Conflicts:

	actions/doc.php
 2010-02-01 11:10:36 -05:00
Sarven Capadisli d73746641b Reusing fixed selector name for 'processing' in util.js 2010-02-01 15:13:54 +01:00
Sarven Capadisli d6fe865133 Removed hAtom pattern from registration page. 2010-02-01 13:14:35 +01:00
Evan Prodromou f9cb1c3265 restructuring of User::registerNew() lost password munging 2010-02-01 00:47:50 -05:00
Evan Prodromou 5d2c083899 Add a script to clear the cache for a given key 
Like showcache.php, clearcache.php clears the cache for a given key.
 2010-01-31 22:58:29 -05:00
Evan Prodromou fb36094eb1 buggy fetch for site owner 2010-01-31 22:55:07 -05:00
Sarven Capadisli 0c838f82b0 Added missing concat of </li> in Realtime response 2010-01-31 23:57:35 +01:00
Sarven Capadisli 91b99863fa Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-01-31 22:42:50 +00:00
Sarven Capadisli 7558e2fd61 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-01-31 23:42:19 +01:00
Sarven Capadisli 9f36c10001 Updated XHR binded events to work better in jQuery 1.4.1. Using 
.live() for event delegation instead of jQuery.data() and checking to
see if an element was previously binded.
 2010-01-31 22:37:22 +00:00