summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* cleanup array value assignmentJörn Friedrich Dreyer2013-10-231-8/+4
* add missing ;Jörn Friedrich Dreyer2013-10-231-1/+1
* cleanup precondition checking when creating new files / foldersJörn Friedrich Dreyer2013-10-232-19/+50
* use correct filename in error result jsonJörn Friedrich Dreyer2013-10-231-1/+1
* fix message dialog titles in IE8Jörn Friedrich Dreyer2013-10-231-1/+1
* Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_exist...Thomas Müller2013-10-223-3/+48
|\
| * Merge pull request #5473 from owncloud/files-startviewerfuncThomas Müller2013-10-221-0/+25
| |\
| | * Added FileList.setViewerMode to hide controlsVincent Petry2013-10-221-0/+25
| * | Merge pull request #5476 from owncloud/admin-showwarningwhenhomeexistsThomas Müller2013-10-222-0/+19
| |\ \ | | |/ | |/|
| | * Added warning notification when user home already existsVincent Petry2013-10-222-0/+19
| |/
* | fixing js syntax errorThomas Müller2013-10-221-2/+2
* | fixing undefined variable $newnameThomas Müller2013-10-221-1/+1
* | adding PHPDoc commentsThomas Müller2013-10-221-0/+7
* | prevent user from creating or renaming sth. to an existing filenameJörn Friedrich Dreyer2013-10-227-436/+524
|/
* Merge pull request #5455 from owncloud/fixing-2423-masterThomas Müller2013-10-2210-15/+32
|\
| * use OC_Helper::linkToDocs() in lib/private/config.phpThomas Müller2013-10-211-1/+1
| * introduce OC_Helper::linkToDocs()Thomas Müller2013-10-213-6/+18
| * introduce link_to_docs() and migrate linksThomas Müller2013-10-219-15/+20
* | Merge pull request #5437 from owncloud/create-custom-logfileThomas Müller2013-10-221-1/+11
|\ \
| * | Try to create custom log file before falling back to default.Andreas Fischer2013-10-201-1/+11
* | | Merge pull request #5426 from owncloud/fix-3612Vincent Petry2013-10-221-0/+4
|\ \ \
| * | | Takes Import button to next line.raghunayyar2013-10-211-1/+4
| * | | Adds margin to the SSL root certificate buttonraghunayyar2013-10-191-0/+1
* | | | Merge pull request #5446 from frisco82/fixNotifyUserFrank Karlitschek2013-10-212-12/+11
|\ \ \ \
| * | | | fix notify user, and made js more resiliant to changesRamiro Aparicio2013-10-212-12/+11
* | | | | Merge pull request #5249 from owncloud/activities-apiThomas Müller2013-10-216-0/+184
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into activities-apiThomas Müller2013-10-1626-476/+233
| |\ \ \ \ \
| * | | | | | remove test codeThomas Müller2013-10-161-4/+0
| * | | | | | Merge branch 'master' into activities-apiThomas Müller2013-10-16990-21642/+19802
| |\ \ \ \ \ \
| * | | | | | | adding OC6 public API for activitiesThomas Müller2013-10-093-5/+44
| * | | | | | | Merge branch 'master' into activities-apiThomas Müller2013-10-091177-19806/+34007
| |\ \ \ \ \ \ \
| * | | | | | | | initial implementation of activity managerThomas Müller2013-09-294-0/+73
| * | | | | | | | Merge branch 'appframework-master' into activities-apiThomas Müller2013-09-29689-9922/+23573
| |\ \ \ \ \ \ \ \
| * | | | | | | | | adding basic interfaces for the activities apiThomas Müller2013-09-203-0/+77
* | | | | | | | | | Merge pull request #5120 from frisco82/sendEmailJSVincent Petry2013-10-211-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix disabled status after sending the emailRamiro Aparicio2013-10-041-4/+4
* | | | | | | | | | | Merge pull request #5444 from frisco82/fixDisplayGroupVincent Petry2013-10-212-8/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix user displayName not being shown after add, added class for improved styl...Ramiro Aparicio2013-10-212-8/+11
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #5452 from owncloud/fixing-4548-masterFrank Karlitschek2013-10-212-3/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | New OCS route:Thomas Müller2013-10-212-3/+19
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #5441 from owncloud/files-sharewithlinkasnormaluserfixVincent Petry2013-10-213-12/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fixed share with link checkbox missing as regular userVincent Petry2013-10-213-12/+4
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-21215-1193/+1486
* | | | | | | | | | | Merge pull request #5424 from owncloud/sharing-directlinkVincent Petry2013-10-213-0/+14
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | unbold the 'Direct link' labelJan-Christoph Borchardt2013-10-211-1/+4
| * | | | | | | | | | reduce width of direct link input fieldJan-Christoph Borchardt2013-10-211-1/+1
| * | | | | | | | | | Added direct link in public share pageVincent Petry2013-10-183-0/+11
* | | | | | | | | | | Merge pull request #5434 from owncloud/fix5209blizzz2013-10-212-1/+19
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Test that dispayNamesInGroup(s) always returns uid as key in the result arrayArthur Schiwon2013-10-201-0/+18
| * | | | | | | | | | dispayNamesInGroup(s) should always return uid as key in the result attr, fix...Arthur Schiwon2013-10-201-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-19 15:09:44 +0000