masensio 5ff0989eb4 Merge remote-tracking branch 'origin/develop' into refresh_folder_contents_when_browsed_into		2013-10-01 12:58:17 +02:00
..
authentication	Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired	2013-08-27 13:49:31 +02:00
datamodel	Merge remote-tracking branch 'origin/develop' into refresh_folder_contents_when_browsed_into	2013-10-01 12:58:17 +02:00
db	Recover name of instant_uploads table	2013-09-30 13:29:18 +02:00
extensions	Merge branch 'develop' into oauth_login	2013-04-25 19:39:22 +02:00
files	Check and creation for InstantUploads folder fixed and rewritten	2013-09-27 14:34:43 +02:00
location	Merge branch 'develop' into oauth_login	2013-04-25 19:39:22 +02:00
media	REFACTORING: FileDetailActivity never more - simplifies transitions and removes bugs in orientation changes	2013-05-30 17:53:21 +02:00
network	Fixed condition to determine expiration of SAML SSO	2013-08-22 19:25:15 +02:00
operations	Merge remote-tracking branch 'origin/develop' into refresh_folder_contents_when_browsed_into	2013-10-01 12:58:17 +02:00
providers	Merge branch 'develop' into refresh_folder_contents_when_browsed_into	2013-09-20 10:19:44 +02:00
syncadapter	OC-1508: App crashes when changing the orientation	2013-10-01 12:56:28 +02:00
ui	Merge remote-tracking branch 'origin/develop' into refresh_folder_contents_when_browsed_into	2013-10-01 12:58:17 +02:00
utils	OC-576: method updateSubtreeSize in FileDataStorageManager. OC-523	2013-07-09 13:16:41 +02:00
widgets	Copyright note fixes	2013-04-17 12:26:13 +02:00
DisplayUtils.java	Merge branch 'develop' into oauth_login	2013-04-25 19:39:22 +02:00
Log_OC.java	Cleaned stuff , add a history delete button and renamed	2013-04-01 10:26:40 +02:00
OwnCloudSession.java	Copyright note fixes	2013-04-17 12:26:13 +02:00
Uploader.java	Merge branch 'develop' into fixForCrashedSharedContents	2013-05-03 14:25:02 +02:00