summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Save mountpoints relative to the userRobin Appelman2014-06-141-6/+15
* Generate a unique nameRobin Appelman2014-06-141-0/+2
* Update for changes in masterRobin Appelman2014-06-141-1/+0
* exclude mounted server-to-server shares from encryptionBjoern Schiessle2014-06-141-4/+28
* make sure to enable incognito mode when mounting a public link and update ini...Bjoern Schiessle2014-06-142-0/+3
* Scan the entire remote share at once by requesting the full file tree from th...Robin Appelman2014-06-144-1/+147
* Improve detection of whether we're in the files appRobin Appelman2014-06-141-1/+1
* Dont return false for internalPathRobin Appelman2014-06-141-0/+3
* Fix removing remote sharesRobin Appelman2014-06-141-0/+18
* Support path lengths up to 4000 charsRobin Appelman2014-06-141-1/+1
* Fix exposing single files over webdavRobin Appelman2014-06-142-3/+7
* Add interface for adding a public share to a different ownCloud instanceRobin Appelman2014-06-146-6/+84
* Add interface for accpeting external sharesRobin Appelman2014-06-145-0/+87
* Add coments to database and dont use sql keywords as table namesRobin Appelman2014-06-142-5/+14
* add remote/add external shares to managerRobin Appelman2014-06-141-0/+27
* Add server<->server sharing backendRobin Appelman2014-06-1413-17/+351
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-14358-5450/+1627
* remove double spaceMorris Jobke2014-06-141-1/+1
* Merge pull request #8978 from owncloud/movie_preview_improvementsMorris Jobke2014-06-141-8/+17
|\
| * movie previews: use file directly when it's stored locally and encryption is ...Georg Ehrke2014-06-101-8/+17
* | Merge pull request #9025 from owncloud/fix-mail-settingsVolkan Gezer2014-06-131-2/+2
|\ \
| * | fix mail settings save function - ref #8854Morris Jobke2014-06-131-2/+2
* | | Merge pull request #9018 from owncloud/dbms-socket-supportFrank Karlitschek2014-06-132-26/+20
|\ \ \ | |/ / |/| |
| * | Don't specify host when using a socket.Andreas Fischer2014-06-121-1/+1
| * | Rename variable to indicate that it can be port and socket.Andreas Fischer2014-06-121-4/+4
| * | No need to check the port number as this will fail anyway.Andreas Fischer2014-06-121-1/+1
| * | Move getValue() to where required. This actually is not required "global data".Andreas Fischer2014-06-121-9/+5
| * | Move check for : to where it belongs, getting rid of $socket = false;Andreas Fischer2014-06-121-8/+5
| * | Extract common variables of $connectionParams.Andreas Fischer2014-06-121-11/+8
| * | Inline $port expression, getting rid of $port variable.Andreas Fischer2014-06-121-2/+1
| * | Fixes based on suggestionsjosh4trunks2014-06-111-11/+7
| * | Update notes on dbhostjosh4trunks2014-06-051-1/+1
| * | Fix variable not always being defined.josh4trunks2014-06-041-0/+2
| * | Work with MySQL Socketsjosh4trunks2014-06-041-1/+8
* | | Merge pull request #9010 from owncloud/fix_8941_admin_settings_messageMorris Jobke2014-06-1310-457/+0
|\ \ \
| * | | move mail template editor from core to standalone templateeditor repoJörn Friedrich Dreyer2014-06-1310-457/+0
| * | | access admin settings result message correctlyJörn Friedrich Dreyer2014-06-131-1/+1
|/ / /
* | | Merge pull request #8714 from owncloud/minor-fixesMorris Jobke2014-06-132-4/+4
|\ \ \
| * | | fix some minor issuesVolkan Gezer2014-06-132-4/+4
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-1342-186/+263
* | | | Merge pull request #9017 from owncloud/maxheartbeatintervalMorris Jobke2014-06-132-1/+28
|\ \ \ \ | |/ / / |/| | |
| * | | Added unit tests for heartbeat interval min/max valuesVincent Petry2014-06-121-1/+23
| * | | Added max heartbeat interval to prevent integer overflowVincent Petry2014-06-121-0/+5
* | | | Merge pull request #8968 from owncloud/scanner-parent-repairVincent Petry2014-06-122-39/+89
|\ \ \ \ | |/ / / |/| | |
| * | | remove unused argumentRobin Appelman2014-06-101-3/+2
| * | | add some commentsRobin Appelman2014-06-101-0/+2
| * | | Repair broken parent link in the scannerRobin Appelman2014-06-102-36/+85
| | |/ | |/|
* | | Revert "Merge pull request #8998 from macjohnny/master"Morris Jobke2014-06-122-13/+6
* | | Merge pull request #9004 from owncloud/cleanup-storagesVincent Petry2014-06-121-0/+26
|\ \ \
| * | | Added check and cleanup for storage/filecacheVincent Petry2014-06-121-0/+26