aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4270 from owncloud/fix_4253Björn Schießle2013-08-012-11/+14
|\
| * fix test and make warning translatableBjoern Schiessle2013-08-012-3/+9
| * cancel sharing if some users doesn't have a working encryption set-up.Bjoern Schiessle2013-08-011-9/+6
* | Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdocJörn Friedrich Dreyer2013-08-011-0/+15
|\ \
| * | added @var tagsChristian Berendt2013-08-011-0/+15
* | | Merge pull request #4266 from berendt/OC_Files_Storage_AmazonS3_loggingJörn Friedrich Dreyer2013-08-011-0/+14
|\ \ \ | |_|/ |/| |
| * | write all catched exception messages to the logChristian Berendt2013-08-011-0/+14
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2013-08-0123-3/+90
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-3111-1/+46
* Merge pull request #4225 from owncloud/better-404Thomas Müller2013-07-303-0/+30
|\
| * Use default cursor for list itemsVictor Dubiniuk2013-07-301-1/+1
| * RewordingVictor Dubiniuk2013-07-291-1/+1
| * Move styles from core to appVictor Dubiniuk2013-07-292-0/+13
| * Allow apps to have own 404 content, closes #3225Victor Dubiniuk2013-07-292-0/+17
* | added missing isEmpty ajax fileBjoern Schiessle2013-07-301-0/+14
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-3010-5/+70
* | Merge pull request #4203 from owncloud/trashbin_improvementsBjörn Schießle2013-07-298-48/+133
|\ \ | |/ |/|
| * remove whitespacesBjoern Schiessle2013-07-291-1/+1
| * reduce time for auto expire to 30 days by defaultBjörn Schießle2013-07-261-1/+1
| * found some more places where we can disable buttons while performing a actionBjörn Schießle2013-07-261-6/+18
| * Hide Delete Permanently button when Restore happensBjörn Schießle2013-07-261-0/+4
| * make 'restored' extension translatableBjörn Schießle2013-07-261-2/+3
| * fix typoBjörn Schießle2013-07-261-1/+1
| * expire trash bin if trash bin exceeds max size after a new file was added to ...Björn Schießle2013-07-262-7/+34
| * disable "deleted files" button if trash bin is emptyBjörn Schießle2013-07-266-7/+36
| * don't move empty folders to the trash binBjörn Schießle2013-07-251-0/+5
| * nicer format of unique names, use 'file (restored).txt' instead of 'files.txt...Björn Schießle2013-07-251-32/+39
* | [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