summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-0515-3/+179
|
* Merge pull request #1432 from owncloud/add_requesttokenThomas Tanghus2013-02-042-1/+4
|\ | | | | [user_webdavauth] add requesttoken
| * [user_webdavauth] add requesttokenLukas Reschke2013-02-032-1/+4
| |
* | Merge pull request #1434 from owncloud/trashbin_CSRFBjörn Schießle2013-02-041-3/+2
|\ \ | | | | | | [files_trashbin] Add CSRF token
| * | OCP\JSON instead of OCP\UserLukas Reschke2013-02-041-1/+1
| | |
| * | [files_trashbin] Add CSRF tokenLukas Reschke2013-02-031-3/+2
| |/
* | Merge pull request #1229 from owncloud/from_live_to_onThomas Müller2013-02-035-16/+15
|\ \ | | | | | | replace live() with on() in core js
| * \ Merge branch 'master' into from_live_to_onThomas Mueller2013-01-31164-1310/+4003
| |\ \ | | | | | | | | | | | | | | | | Conflicts: apps/files_external/js/google.js
| * | | attach on to filelist instead of individual td elements for file link behaviourJörn Friedrich Dreyer2013-01-301-1/+1
| | | |
| * | | replace live() with on() in core jsJörn Friedrich Dreyer2013-01-305-15/+15
| | | |
* | | | Merge pull request #1340 from owncloud/fixing-js-errors-public-link-masterThomas Müller2013-02-033-1/+6
|\ \ \ \ | | | | | | | | | | Fixing js errors public link master
| * | | | call ajax scan only if a user is logged in - otherwise we'll get a 500Thomas Mueller2013-01-311-0/+4
| | | | |
| * | | | Merge branch 'master' into fixing-js-errors-public-link-masterThomas Mueller2013-01-31176-1305/+4159
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js apps/files/templates/part.list.php
| * | | | call ajax scan only if a user is logged in - otherwise we'll get a 500Thomas Mueller2013-01-281-5/+7
| | | | |
| * | | | include keyboardshortcuts.jsThomas Mueller2013-01-281-0/+1
| | | | |
| * | | | fixing href for foldersThomas Mueller2013-01-281-1/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0415-35/+135
| |_|_|/ |/| | |
* | | | Merge pull request #1422 from TheSFReader/masterThomas Müller2013-02-031-1/+2
|\ \ \ \ | | | | | | | | | | Correct the Cache Scanner so that it doesn't try and scan subdirs of a non-dir path when renaming
| * \ \ \ Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-02-0271-37/+299
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-02-0169-11/+452
| |\ \ \ \ \
| * | | | | | Correct itTheSFReader2013-02-011-1/+2
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0346-204/+260
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #1415 from owncloud/ldap_fix_settingsLukas Reschke2013-02-012-20/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | LDAP settings Advanced tab has grown too long by far. Structure it using accordion.
| * | | | | | remove ugly whitespaceArthur Schiwon2013-02-011-1/+1
| | | | | | |
| * | | | | | LDAP: settings Advanced tab has grown too long by far. Structure it using ↵Arthur Schiwon2013-02-012-20/+32
| | |/ / / / | |/| | | | | | | | | | | | | | | | accordion
* / | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0269-17/+267
|/ / / / /
* | | | | undelete -> restoreThomas Mueller2013-02-011-1/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0162-2/+411
| | | | |
* | | | | Merge pull request #1351 from owncloud/navigationMichael Gapczynski2013-01-313-7/+10
|\ \ \ \ \ | |_|_|/ / |/| | | | New navigation design
| * | | | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-3172-242/+1335
| |\| | |
| * | | | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-31137-1069/+2641
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-3030-10/+172
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | merge stylesJan-Christoph Borchardt2013-01-28198-1214/+4814
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | merge changes in navigationJan-Christoph Borchardt2013-01-281-2/+1
| |\ \ \ \ \
| | * | | | | More Style Fixesraghunayyar2013-01-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Repeating Background behind folder names in files app part.breadcrumb.php
| * | | | | | fix up content and content-wrapper merge ...Jan-Christoph Borchardt2013-01-1851-100/+117
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | merge master into navigationJan-Christoph Borchardt2013-01-15227-846/+1786
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge master into navigationJan-Christoph Borchardt2012-12-18249-1889/+3222
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2012-11-0252-51/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2012-11-019-11/+52
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2012-10-3014-105/+103
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ merge breadcrumb root into navigationJan-Christoph Borchardt2012-10-285-121/+114
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | first version of breadcrumb 'root', still have a weird feeling about thisJan-Christoph Borchardt2012-10-283-7/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into navigationJan-Christoph Borchardt2012-10-2819-377/+597
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | first icon update. Next step: make sprited hover state (like for home already)Jan-Christoph Borchardt2012-10-271-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | first base on navigation rework, less obtrusive, icons need to be updated, ↵Jan-Christoph Borchardt2012-10-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings moved
* | | | | | | | | | | | | | Merge pull request #1099 from herbrechtsmeier/ssl-proxyThomas Müller2013-01-312-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add multiple domains reverse SSL proxy support
| * | | | | | | | | | | | | | add multiple domains reverse proxy supportStefan Herbrechtsmeier2013-01-312-1/+3
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for a reverse proxy that handles multiple domains via different web roots (http[s]://proxy.tld/domain.tld/owncloud). As the reverse proxy web root is transparent for the web server the REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace the direct use of this _SERVER variables with function calls and extend this functions to overwrite the web root. Additionally it adds a Sabre request backend that extends the Sabre_HTTP_Request to use the same functions.
* | | | | | | | | | | | | | spell checkThomas Mueller2013-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :+1:
* | | | | | | | | | | | | | LDAP: implement getDisplayName and getDisplayNames also for UserProxy ↵Arthur Schiwon2013-01-311-0/+27
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (multiple server support)
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-13 08:36:28 +0000