summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-14305-1338/+1352
|
* Merge pull request #10396 from owncloud/kill-filesyncThomas Müller2014-08-132-65/+0
|\ | | | | Kill filesync.php in files/appinfo
| * Kill filesync.php in files/appinfoMorris Jobke2014-08-132-65/+0
| | | | | | | | * ref comment: https://github.com/owncloud/core/issues/10392#issuecomment-52050567
* | Merge pull request #10394 from owncloud/close-filehandle-lib-imageThomas Müller2014-08-131-0/+4
|\ \ | | | | | | Close file handle if exception occurs in image class
| * | Close file handle if exception occurs in image classMorris Jobke2014-08-131-0/+4
| |/ | | | | | | ref #10392
* | Merge pull request #10403 from owncloud/getid-cast-intLukas Reschke2014-08-132-2/+3
|\ \ | | | | | | Cast file id's to int so we can compare them properly
| * | Cast file id's to int so we can compare them properlyRobin Appelman2014-08-132-2/+3
|/ /
* | Merge pull request #10323 from gekmihesg/masterblizzz2014-08-131-0/+3
|\ \ | |/ |/| Load authentication backends before tryBasicAuth
| * Load authentication backends before tryBasicAuthgekmihesg2014-08-101-0/+3
| |
* | Merge pull request #10387 from owncloud/quick_fix_for_unit_testsThomas Müller2014-08-131-14/+17
|\ \ | | | | | | don't clean up the test environment if a data provider was finished
| * | don't clean up the test environment if a data provider was finishedBjoern Schiessle2014-08-131-14/+17
| | |
* | | Merge pull request #9754 from owncloud/enc_support_aes_256Vincent Petry2014-08-1315-167/+501
|\ \ \ | |/ / |/| | [encryption] support aes 256
| * | add unit test for aes256/aes128Bjoern Schiessle2014-07-232-0/+192
| | |
| * | update existing unit testsBjoern Schiessle2014-07-235-127/+16
| | |
| * | support aes 256Bjoern Schiessle2014-07-2311-84/+337
| | |
* | | Merge pull request #10333 from owncloud/tar-55Thomas Müller2014-08-132-6/+0
|\ \ \ | | | | | | | | Fix Tar support for php >=5.5
| * | | Fix Tar support for php >=5.5Robin Appelman2014-08-112-6/+0
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-1358-211/+291
| | | |
* | | | Merge pull request #10377 from owncloud/git-fixesMorris Jobke2014-08-121-2/+0
|\ \ \ \ | | | | | | | | | | fixes from git push force
| * | | | fixes from git push forceMorris Jobke2014-08-121-2/+0
|/ / / /
* | | | fix broken variable name, recoveryPasswordSupported is now ↵Bjoern Schiessle2014-08-121-3/+3
| | | | | | | | | | | | | | | | recoveryEnabledForUser
* | | | add unit testsBjoern Schiessle2014-08-121-0/+49
| | | |
* | | | fix detection of system wide mount pointsBjoern Schiessle2014-08-121-8/+33
| | | |
* | | | Merge pull request #9762 from owncloud/owner-publicRobin Appelman2014-08-122-0/+16
|\ \ \ \ | | | | | | | | | | Return the proper owner for home storages
| * | | | Add test for homestorage getOwnerRobin Appelman2014-07-221-0/+6
| | | | |
| * | | | Return the proper owner for home storagesRobin Appelman2014-07-211-0/+10
| | | | |
* | | | | Merge pull request #10357 from owncloud/l10n-alert-fixVolkan Gezer2014-08-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix alert text
| * | | | | Fix alert textVolkan Gezer2014-08-121-1/+1
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-12449-11284/+11486
|/ / / / /
* | | | | Merge pull request #10347 from owncloud/fix-grammarVolkan Gezer2014-08-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Transifex suggestion by mnestis
| * | | | | Transifex suggestion by mnestisVolkan Gezer2014-08-111-1/+1
| | | | | |
* | | | | | Merge pull request #10335 from owncloud/fix-emptyapplistClark Tomlinson2014-08-111-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix issue when no apps are enabled
| * | | | | | Fix issue when no apps are enabledVincent Petry2014-08-111-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Properly initialize $apps array
* | | | | | Merge pull request #9890 from owncloud/check-php-charset-masterThomas Müller2014-08-113-6/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | | setting and checking default_charset in php.ini to be UTF-8
| * | | | | Removing ini charset override due to shared hosting issuesClark Tomlinson2014-08-111-3/+0
| | | | | |
| * | | | | setting and checking default_charset in php.ini to be UTF-8Thomas Müller2014-07-254-6/+31
| | | | | |
* | | | | | Merge pull request #10336 from owncloud/fix_share_drop_downBjörn Schießle2014-08-111-12/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove 'no people found' entry in share dialog
| * | | | | | remove 'no people found' entryBjoern Schiessle2014-08-111-12/+1
| | | | | | |
* | | | | | | Merge pull request #9848 from dupondje/masterblizzz2014-08-111-12/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix memberOf detection. Fixes: #9835
| * | | | | | | Fix initializing in #9848Jean-Louis Dupond2014-08-111-0/+1
| | | | | | | |
| * | | | | | | Fix remarks in #9848Jean-Louis Dupond2014-08-111-11/+13
| | | | | | | |
| * | | | | | | Fix memberOf detection. Fixes: #9835Jean-Louis Dupond2014-07-241-7/+10
| | | | | | | |
* | | | | | | | Merge pull request #10066 from marc0s/issues/10065-fix-null-checkClark Tomlinson2014-08-111-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOT
| * | | | | | | | Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOTmarc0s2014-07-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #10065
* | | | | | | | | Merge pull request #10251 from owncloud/fix-dav-attributes-masterThomas Müller2014-08-111-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | shared files/folders are not mounted
| * | | | | | | | shared files/folders are not mountedThomas Müller2014-08-071-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #10301 from owncloud/fix-internal-mail-share-linksVincent Petry2014-08-111-5/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Don't use /Shared as a base for links in share email
| * | | | | | | | | Add scrollto to the url if sharing a file for long file listsTom Needham2014-08-091-3/+9
| | | | | | | | | |
| * | | | | | | | | Fix link to files and folders in internal share emailsTom Needham2014-08-091-4/+3
| | | | | | | | | |
* | | | | | | | | | Merge pull request #10096 from owncloud/fix-6971-masterJörn Friedrich Dreyer2014-08-111-1/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | in case $_POST['itemSourceName'] does not exist we simply default it to ...
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-27 00:38:44 +0000