summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | get all display names from users in a given groupBjörn Schießle2013-01-256-7/+54
| * | | | | | get all display namesBjörn Schießle2013-01-254-5/+53
| * | | | | | add display name to title instead if login-IDBjörn Schießle2013-01-242-2/+2
| * | | | | | new branch which introduces display namesBjörn Schießle2013-01-243-2/+60
* | | | | | | Merge pull request #1352 from mjkent/masterLukas Reschke2013-01-291-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Add robot.txtMichael Kent2013-01-281-0/+2
* | | | | | | | Merge pull request #1324 from owncloud/permanent-share-iconsMichael Gapczynski2013-01-283-6/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Change file action text for files inside shared folders as wellMichael Gapczynski2013-01-281-0/+1
| * | | | | | | | Change file action text to 'Shared'Michael Gapczynski2013-01-281-0/+3
| * | | | | | | | fix color change on clickJan-Christoph Borchardt2013-01-281-1/+1
| * | | | | | | | Merge branch 'master' into permanent-share-iconsJan-Christoph Borchardt2013-01-28189-4746/+5319
| |\| | | | | | |
| * | | | | | | | Permanently display shared status iconsMichael Gapczynski2013-01-262-5/+18
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-29138-6224/+6942
| |/ / / / / / |/| | | | | |
| | | | | | * Files: Dont get maxUploadSize if the filecache needs to be upgradedRobin Appelman2013-01-301-3/+2
| | | | | | * Cache: don't insert duplicated during upgradeRobin Appelman2013-01-301-5/+18
| | | | | | * Make zip downloads use actual folder names, fix spelling mistakesMichael Gapczynski2013-01-281-6/+9
| | | | | | * Sharing: partailly fix searchByMimeRobin Appelman2013-01-281-27/+28
| | | | | | * Files: fix sharing newly uploaded filesRobin Appelman2013-01-281-17/+20
| | | | | | * fix files_version hooksRobin Appelman2013-01-281-17/+17
| | | | | | * change required ownCloud version to 4.91Robin Appelman2013-01-286-6/+6
| | | | | | * merge master into filesystemRobin Appelman2013-01-2817-75/+50
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Fix phpdocRobin Appelman2013-01-281-2/+2
* | | | | | | Merge pull request #1313 from owncloud/updater-CSPLukas Reschke2013-01-283-27/+27
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into updater-CSPThomas Mueller2013-01-28217-5235/+5896
| |\ \ \ \ \ \ \
| * | | | | | | | Move update inline JSLukas Reschke2013-01-253-27/+26
| * | | | | | | | Move checkMaintenance and checkUpgradeLukas Reschke2013-01-251-2/+3
* | | | | | | | | Merge pull request #1318 from j-ed/masterThomas Müller2013-01-282-0/+6
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Update lib/mail.phpj-ed2013-01-261-0/+2
| * | | | | | | | Update config/config.sample.phpj-ed2013-01-261-0/+4
* | | | | | | | | Merge pull request #1321 from owncloud/csp-fixesThomas Müller2013-01-2811-46/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use HTML5 data attribute + fix undefined variableLukas Reschke2013-01-266-27/+5
| * | | | | | | | | Remove outdated commentsLukas Reschke2013-01-263-11/+0
| * | | | | | | | | Fix undefined variableLukas Reschke2013-01-262-8/+7
* | | | | | | | | | Merge pull request #1337 from owncloud/fix-issue-780Thomas Müller2013-01-271-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add create permission, fixes #780Michael Gapczynski2013-01-271-0/+3
|/ / / / / / / / / /
| | | | | | | | | * add oc:// streamwrapper to provide access to ownCloud's virtual filesystemRobin Appelman2013-01-283-0/+149
| | | | | | | | | * Move streamwrappers to seperate files and put them in a namespaceRobin Appelman2013-01-2814-204/+242
| | | | | | | | | * Merge branch 'master' into filesystemRobin Appelman2013-01-28173-4671/+5269
| | | | | | | | | |\ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2824-151/+187
* | | | | | | | | | Merge pull request #1326 from owncloud/event-source-tokenLukas Reschke2013-01-262-2/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use global oc_requesttoken for Event SourceMichael Gapczynski2013-01-262-2/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* / | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-27165-4555/+5118
|/ / / / / / / / /
| | | | | | | | * Filesystem: use the updated Mount::findById in getPath to ensure we get the c...Robin Appelman2013-01-281-3/+11
| | | | | | | | * Filesystem: return all matching mounts in Mount::findByIdRobin Appelman2013-01-282-5/+10
| | | | | | | | * Filesystem: also add getPath to \OC\FilesystemRobin Appelman2013-01-271-0/+12
| | | | | | | | * Filesystem: add View->getPath to the cache apiRobin Appelman2013-01-272-0/+38
| | | | | | | | * Cache: add function to get storage id and internal path of a file by idRobin Appelman2013-01-272-0/+31
| | | | | | | | * Test cases for new mount managementRobin Appelman2013-01-271-0/+37
| | | | | | | | * Filesystem: add Mount::findByIdRobin Appelman2013-01-271-1/+17
| | | | | | | | * Don't check for updates for sub storages, these scans should be done in the b...Michael Gapczynski2013-01-261-3/+0