summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Remove wrongly committed filesBart Visscher2012-10-272-180/+0
|
* remove remaining line from merge conflictBjörn Schießle2012-10-271-2/+1
|
* Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'Bart Visscher2012-10-272-0/+180
|\ | | | | | | | | Conflicts: lib/base.php
| * Update Sabre to version 1.7.1Susinthiran Sithamparanathan2012-10-172-0/+180
| |
* | fix broken paths in versions appBjörn Schießle2012-10-271-280/+279
| |
* | don't call $('#found_versions').chosen(); after opening the history ↵Björn Schießle2012-10-271-1/+0
| | | | | | | | drop-down since no version is selected at the beginning
* | Fix download url generationBart Visscher2012-10-271-1/+1
| |
* | LDAP: let result processing in Access::search slice the array for ↵Arthur Schiwon2012-10-272-14/+11
| | | | | | | | not-paginated search. getUsers e.g. does not need to take care of it anymore. adjustments in group_ldap to follow.
* | LDAP: debug messagedArthur Schiwon2012-10-271-3/+4
| |
* | LDAP: sourced out paged search init into initPagedSearch method, making ↵Arthur Schiwon2012-10-271-28/+46
| | | | | | | | search slicker again
* | Merge branch 'routing'Bart Visscher2012-10-274-4/+16
|\ \ | | | | | | | | | | | | | | | Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php
| * \ Merge branch 'master' into routingBart Visscher2012-10-17132-381/+1314
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php
| * | | Implement route for download in OC_Search_Provider_FileBart Visscher2012-09-281-0/+12
| | | |
| * | | Merge branch 'master' into routingBart Visscher2012-09-281-1/+1
| |\ \ \
| * \ \ \ Merge branch 'master' into routingBart Visscher2012-09-28177-391/+1695
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php
| * \ \ \ \ Merge branch 'master' into routingBart Visscher2012-09-07158-1249/+1675
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js lib/base.php lib/helper.php lib/ocs.php
| * \ \ \ \ \ Merge branch 'master' into routingBart Visscher2012-08-301302-298022/+773
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/js/contacts.js apps/contacts/lib/search.php apps/files_archive/js/archive.js apps/gallery/lib/tiles.php apps/gallery/templates/index.php lib/ocs.php
| * \ \ \ \ \ \ Merge remote-tracking branch 'gitorious/master' into routingBart Visscher2012-08-29745-3070/+124866
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js apps/files_archive/js/archive.js
| * | | | | | | | Fix gallery image viewBart Visscher2012-08-151-3/+1
| | | | | | | | |
| * | | | | | | | Fix linkTo calls for new routingBart Visscher2012-08-158-11/+11
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-277-7/+51
| | | | | | | | |
* | | | | | | | | LDAP: let getUsers make use of paged searchArthur Schiwon2012-10-261-15/+29
| | | | | | | | |
* | | | | | | | | LDAP: add support for paged searches.Arthur Schiwon2012-10-261-20/+115
| | | | | | | | |
* | | | | | | | | LDAP: know, wether server supports paged searchArthur Schiwon2012-10-261-0/+3
| | | | | | | | |
* | | | | | | | | LDAP: check for resource before unbindingArthur Schiwon2012-10-261-1/+3
| | | | | | | | |
* | | | | | | | | separate buttons for new file and uploadJan-Christoph Borchardt2012-10-261-6/+5
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-264-7/+59
| | | | | | | | |
* | | | | | | | | dir in newfile has to start with /Bart Visscher2012-10-251-1/+1
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-251-0/+6
| | | | | | | | |
* | | | | | | | | Merge pull request #81 from fmms/masterLukas Reschke2012-10-2415-53/+53
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Codestyle add some needed spaces.
| * | | | | | | | | NoSpaceAfterComma IIFelix Moeller2012-10-233-6/+6
| | | | | | | | | |
| * | | | | | | | | Checkstyle: NoSpaceAfterCommaFelix Moeller2012-10-2314-49/+49
| | | | | | | | | |
* | | | | | | | | | Forget to urlencode the pathLukas Reschke2012-10-241-1/+1
| | | | | | | | | |
* | | | | | | | | | urlencodeLukas Reschke2012-10-241-6/+6
| | | | | | | | | |
* | | | | | | | | | Revert e1a4fe98908dbf8f9e795fd852b231381d4f3ce4Lukas Reschke2012-10-241-1/+1
| | | | | | | | | |
* | | | | | | | | | urldecode target directoryBjörn Schießle2012-10-241-1/+1
| | | | | | | | | |
* | | | | | | | | | Apply coding style guideThomas Müller2012-10-241-1/+2
| | | | | | | | | |
* | | | | | | | | | fix copy&paste bug from previous commitBjörn Schießle2012-10-241-1/+1
| | | | | | | | | |
* | | | | | | | | | Shared files are not stored in the file cache. Therefore we need toBjörn Schießle2012-10-241-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use the share table from the db to find the item source if the public link re-shares a already shared file.
* | | | | | | | | | Place the brackets in the first lineLukas Reschke2012-10-241-60/+59
| | | | | | | | | |
* | | | | | | | | | Apply coding style guideThomas Müller2012-10-241-203/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://owncloud.org/dev/coding-style-guide/
* | | | | | | | | | calling OC_Filesystem at this point will initialize file system with wrong ↵Björn Schießle2012-10-241-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user (for public shared links if another user is logged in). Therefore remove trailing slashes without the help of OC_Filesystem.
* | | | | | | | | | Merge pull request #76 from fmms/masterLukas Reschke2012-10-233-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkstyle: some more cleanups
| * | | | | | | | | Codestyle: FunctionCallArgumentSpacingFelix Moeller2012-10-233-3/+3
| | | | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-244-23/+58
| | | | | | | | | |
* | | | | | | | | | LDAP: properly check if Groups-feature is enabledArthur Schiwon2012-10-241-3/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #75 from fmms/masterLukas Reschke2012-10-231-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | More Checkstyle cleanup
| * | | | | | | | | More Checkstyle cleanupFelix Moeller2012-10-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for all LowerCaseConstant warnings
* | | | | | | | | | Remove uneeded vendor prefixesLukas Reschke2012-10-241-2/+0
| | | | | | | | | |
* | | | | | | | | | Format the CSS in a readable wayLukas Reschke2012-10-231-11/+73
| | | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-02 19:04:35 +0000