summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-298-2/+32
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-2840-28/+129
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-27131-656/+98
|/ / / /
* | | / new version drop downBjörn Schießle2013-07-259-211/+221
| |_|/ |/| |
* | | Merge pull request #3898 from owncloud/sabre-objecttreeicewind19912013-07-241-3/+4
|\ \ \
| * \ \ Merge branch 'master' into sabre-objecttreeRobin Appelman2013-07-24919-1328/+80532
| |\ \ \
| * | | | use new ObjectTree in sabredavRobin Appelman2013-06-301-3/+4
* | | | | use output buffering when including the irods librariesRobin Appelman2013-07-241-0/+2
| |/ / / |/| | |
* | | | use OC_Defaults directly from the templateBjörn Schießle2013-07-241-2/+2
* | | | Merge branch 'master' into move_defaults_to_template_constructorBjörn Schießle2013-07-241-2/+2
|\ \ \ \
| * | | | fix php syntaxThomas Müller2013-07-241-2/+2
* | | | | initialize OC_Defaults in template constructorXBjörn Schießle2013-07-241-5/+3
|/ / / /
* | | | Merge branch 'master' into more-themable-stringsThomas Müller2013-07-24806-921/+79554
|\ \ \ \
| * \ \ \ Merge pull request #3392 from owncloud/googledriveBart Visscher2013-07-2338-597/+8524
| |\ \ \ \
| | * | | | Remove root option from Google Drive storage, because it is only used for tes...Michael Gapczynski2013-07-232-10/+8
| | * | | | Fix 'most' Google Drive testsMichael Gapczynski2013-07-132-82/+148
| | * | | | Merge branch 'master' into googledriveThomas Müller2013-07-12297-1877/+4056
| | |\ \ \ \
| | * | | | | substr storage id to prevent problems with storing the change id in appconfigMichael Gapczynski2013-06-041-1/+1
| | * | | | | Implement hasUpdated() to watch for changes on Google Drive sideMichael Gapczynski2013-05-301-0/+59
| | * | | | | Merge branch 'master' into googledriveMichael Gapczynski2013-05-3042-1672/+2100
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into googledriveMichael Gapczynski2013-05-27244-3192/+8245
| | |\ \ \ \ \ \
| | * | | | | | | Fix require_once for 3rdparty in google ajax frontendMichael Gapczynski2013-05-181-2/+3
| | * | | | | | | Include 3rdparty Google Drive SDK 0.6.2Michael Gapczynski2013-05-1733-2/+7936
| | * | | | | | | Fix constant in last commitMichael Gapczynski2013-05-171-1/+1
| | * | | | | | | Prepare for #2013 fixMichael Gapczynski2013-05-171-1/+7
| | * | | | | | | Setting Redirect URI is not required hereMichael Gapczynski2013-05-161-1/+0
| | * | | | | | | Switch to using Google Drive SDK, closes #2047Michael Gapczynski2013-05-164-567/+431
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-232-1/+19
| * | | | | | | | Merge pull request #4126 from owncloud/parallel-autotest.sh-masterThomas Müller2013-07-221-17/+15
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into parallel-autotest.sh-masterThomas Müller2013-07-22677-242/+62637
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | don't rely on admin user but create a test user for Test_Encryption_KeymanagerThomas Müller2013-07-191-17/+15
| * | | | | | | | | | Merge pull request #3142 from owncloud/ext-fs-irods-masterThomas Müller2013-07-2284-1/+8130
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into ext-fs-irods-masterThomas Müller2013-07-22676-240/+62652
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | fixing / adding commentsThomas Müller2013-07-161-1/+3
| | * | | | | | | | | | Merge branch 'master' into ext-fs-irods-masterThomas Müller2013-07-1610-2/+49
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ext-fs-irods-masterThomas Müller2013-07-122-75/+109
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | update copy rightThomas Müller2013-07-121-1/+1
| | * | | | | | | | | | | | incorporate development branch of ssh://irodsguest@code.renci.org/gitroot/ir...Thomas Müller2013-07-1279-0/+7930
| | * | | | | | | | | | | | Merge branch 'master' into ext-fs-irods-masterThomas Müller2013-07-12195-889/+2056
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into ext-fs-irods-masterThomas Mueller2013-06-2851-183/+368
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ext-fs-irods-masterThomas Mueller2013-06-19357-3819/+9903
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | update to latest masterThomas Mueller2013-06-061-6/+0
| | * | | | | | | | | | | | | | - implement touch() to at least create a file which doesn't existThomas Mueller2013-06-061-12/+87
| | * | | | | | | | | | | | | | Merge branch 'master' into ext-fs-irods-masterThomas Mueller2013-05-15197-743/+1497
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | adding auth mode to ui and the urlThomas Mueller2013-04-262-0/+7
| | * | | | | | | | | | | | | | | adding $backupGlobals = FALSE because iRODS is heavily using $GLOBALSThomas Mueller2013-04-261-0/+2
| | * | | | | | | | | | | | | | | Merge branch 'master' into ext-fs-irods-masterThomas Mueller2013-04-2691-32/+261
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | test case for iRODS storage addedThomas Mueller2013-04-231-0/+30
| | * | | | | | | | | | | | | | | | checkbox in settings uiThomas Mueller2013-04-181-1/+2
| | * | | | | | | | | | | | | | | | in order to use the ownCloud login credentials we use a login hook to grab ui...Thomas Mueller2013-04-182-45/+17