summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Improved right sidebarVincent Petry2015-08-079-74/+328
* Basic work for right sidebarVincent Petry2015-08-077-0/+508
* Merge pull request #18083 from owncloud/user-search-boxJan-Christoph Borchardt2015-08-074-45/+29
|\
| * use the main search box to filter users in user managementRobin Appelman2015-08-054-45/+29
* | Merge pull request #18091 from owncloud/add-backbonejsblizzz2015-08-077-1/+1947
|\ \
| * | load backbone universallyArthur Schiwon2015-08-064-7/+2
| * | make available as OC.Backbone to avoid conflictsArthur Schiwon2015-08-062-0/+17
| * | adjust gitignore for backbone.jsArthur Schiwon2015-08-063-3/+3
| * | files and sharing will require backbonejsArthur Schiwon2015-08-062-0/+2
| * | add backbone.jsArthur Schiwon2015-08-066-1/+1933
* | | Merge pull request #17680 from owncloud/ftp-rmdir-fileVincent Petry2015-08-061-1/+4
|\ \ \
| * | | handle rmdir on files for ftp storagesRobin Appelman2015-07-161-1/+4
* | | | Merge pull request #18106 from owncloud/enc-jsnamespaceconflictBjörn Schießle2015-08-062-12/+4
|\ \ \ \
| * | | | Fix namespace conflict in OC.Encryption JS codeVincent Petry2015-08-062-12/+4
* | | | | Merge pull request #18030 from owncloud/dav-upload-updaterVincent Petry2015-08-061-2/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | go trough the updater when uploading over webdavRobin Appelman2015-08-031-2/+1
* | | | | Merge pull request #18082 from owncloud/share-group-conflictVincent Petry2015-08-064-23/+50
|\ \ \ \ \
| * | | | | just pass the share instead of searching for itRobin Appelman2015-08-053-23/+11
| * | | | | add unit tests for share target conflict with group sharesRobin Appelman2015-08-051-0/+39
* | | | | | Merge pull request #16961 from owncloud/hardening-ldapJörn Friedrich Dreyer2015-08-063-1/+191
|\ \ \ \ \ \
| * | | | | | integration tests for hardening user home retrievalArthur Schiwon2015-08-061-0/+159
| * | | | | | Only throw exception if on new LDAP setupsMorris Jobke2015-07-292-2/+30
| * | | | | | Hardening home folder retrieval in user_ldapMorris Jobke2015-07-291-1/+4
* | | | | | | Merge pull request #17810 from owncloud/better-enc-warningsBernhard Posselt2015-08-062-3/+16
|\ \ \ \ \ \ \
| * | | | | | | condense doc warnings into small section that gets showed to the user before ...Bernhard Posselt2015-07-222-3/+16
* | | | | | | | Merge pull request #18084 from owncloud/ocs-anything-other-then-100-means-fai...Thomas Müller2015-08-052-6/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Following the spec:Thomas Müller2015-08-052-6/+2
* | | | | | | | Merge pull request #18077 from owncloud/fix_18055Morris Jobke2015-08-051-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Set proper mimetype for directoriesRoeland Jago Douma2015-08-051-1/+1
* | | | | | | | Merge pull request #18035 from owncloud/ocs-2.0Bernhard Posselt2015-08-0510-203/+211
|\ \ \ \ \ \ \ \
| * | | | | | | | Return 200 not null - we should return consistent typesThomas Müller2015-08-052-1/+4
| * | | | | | | | Fix unit test within OCSControllerThomas Müller2015-08-032-6/+9
| * | | | | | | | Remove duplicate and unused codeThomas Müller2015-08-035-175/+42
| * | | | | | | | Fix authorsThomas Müller2015-08-031-7/+1
| * | | | | | | | Reduce duplicate codeThomas Müller2015-08-033-15/+46
| * | | | | | | | Adding ocs/v2.php with status code mapperThomas Müller2015-08-033-8/+118
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #18057 from owncloud/import_root_certificatesThomas Müller2015-08-055-10/+72
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | also block certificate management in the back-end if external storages are di...Bjoern Schiessle2015-08-043-9/+53
| * | | | | | | only add the possibility to import ssl root certificates to the personalBjoern Schiessle2015-08-042-1/+19
* | | | | | | | Merge pull request #18068 from owncloud/update-pearThomas Müller2015-08-051-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Update submodule after merge in 3rdpartyThomas Müller2015-08-051-0/+0
| * | | | | | | remove old pear classesThomas Müller2015-08-051-0/+0
| * | | | | | | "pear/pear-core-minimal": "v1.10.0alpha2"Thomas Müller2015-08-051-0/+0
* | | | | | | | Merge pull request #17961 from owncloud/make_knowledgebase_configurableThomas Müller2015-08-053-1/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | make knowledge base url configurableBjoern Schiessle2015-07-293-1/+27
* | | | | | | | | Merge pull request #18062 from owncloud/use-full-namespaceThomas Müller2015-08-052-7/+7
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Use absolute namespaceLukas Reschke2015-08-052-7/+7
* | | | | | | | | Merge pull request #18059 from owncloud/use-hash-comparison-on-the-requesttokenThomas Müller2015-08-053-7/+103
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Remove "use" statementLukas Reschke2015-08-052-4/+6
| * | | | | | | | Use StringUtils::equals on CSRF token and add unit testsLukas Reschke2015-08-042-5/+99
|/ / / / / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-06 06:41:37 +0000