summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2012-12-02243-3250/+3475
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-0256-483/+653
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-01144-2399/+2119
| * Merge pull request #603 from owncloud/store_plain_groupnameBart Visscher2012-11-302-2/+2
| |\
| | * Group name does't need to be sanitized before storing it in the databaseBart Visscher2012-11-272-2/+2
| * | Merge pull request #644 from butonic/checkstyle_fixesBart Visscher2012-11-3010-73/+152
| |\ \
| | * | fix checkstyle for files appJörn Friedrich Dreyer2012-11-2911-74/+153
| * | | Merge pull request #605 from owncloud/fix_false_positive_share_2Bart Visscher2012-11-301-1/+1
| |\ \ \
| | * | | Sharing: Fix false positived v. 2Thomas Tanghus2012-11-271-1/+1
| * | | | Merge pull request #619 from samtuke/versions_cacheBart Visscher2012-11-302-5/+31
| |\ \ \ \
| | * | | | OC_FSV->copy now only caches files which are copied from data/user/filesSam Tuke2012-11-282-5/+31
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-3081-394/+651
* | | | | | fail gracefully when no old filecache is present during upgradeRobin Appelman2012-12-011-1/+8
* | | | | | add upgrade path from old cache to preserve file id'sRobin Appelman2012-11-303-3/+63
* | | | | | merge master into filesystemRobin Appelman2012-11-30120-816/+3103
|\| | | | |
| * | | | | Merge pull request #635 from owncloud/ob_endThomas Müller2012-11-296-8/+17
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | use new obEnd function instead of ob_end_cleanRobin Appelman2012-11-295-5/+5
| | * | | | add function to safely end output bufferingRobin Appelman2012-11-291-3/+12
| |/ / / /
| * | | | Merge pull request #620 from owncloud/fix_600Georg Ehrke2012-11-292-7/+8
| |\ \ \ \
| | * | | | use attr instead of dataGeorg Ehrke2012-11-291-7/+2
| | * | | | Revert "fix group and subadmin managing for 'ajax-loaded' users"Georg Ehrke2012-11-291-2/+7
| | * | | | add a client side checkGeorg Ehrke2012-11-281-0/+3
| | * | | | fix group and subadmin managing for 'ajax-loaded' usersGeorg Ehrke2012-11-281-7/+2
| | * | | | make some checks server-sideGeorg Ehrke2012-11-282-3/+6
| | |/ / /
| * | | | Merge pull request #617 from samtuke/fix_docblocksblizzz2012-11-291-21/+15
| |\ \ \ \
| | * | | | Cleaned up docblock commentsSam Tuke2012-11-281-21/+15
| | |/ / /
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-2916-28/+36
| * | | | Merge pull request #540 from Raydiation/masterThomas Müller2012-11-281-0/+68
| |\ \ \ \
| | * | | | added more unittests for the group fileBernhard Posselt2012-11-281-0/+68
| | |/ / /
| * | | | Merge pull request #601 from butonic/add_drag_shadow_in_firefoxBart Visscher2012-11-281-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | show drag shadow in firefox by using helper:'clone'Jörn Friedrich Dreyer2012-11-271-1/+1
| | |/ /
| * | | Merge pull request #401 from owncloud/share_hooksJörn Friedrich Dreyer2012-11-284-14/+34
| |\ \ \
| | * | | Rename install hook functions to register hookBart Visscher2012-11-153-11/+11
| | * | | Create functions to install standard hooksBart Visscher2012-11-134-14/+34
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-2836-246/+366
| | |/ / | |/| |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-2750-240/+1995
| | |/ | |/|
| * | Merge pull request #380 from butonic/feature_share_link_with_tokenJörn Friedrich Dreyer2012-11-267-186/+296
| |\ \
| | * | readd fallback code for pre token linksJörn Friedrich Dreyer2012-11-233-148/+216
| | * | implement share via link tokenJörn Friedrich Dreyer2012-11-207-141/+183
| * | | Merge pull request #573 from owncloud/more_indexesJörn Friedrich Dreyer2012-11-261-0/+14
| |\ \ \
| | * | | remove the index on the share table because of problems with the index size. ...Frank Karlitschek2012-11-251-15/+0
| | * | | add a few more indexes. This is just a first step. More work is needed here b...Frank Karlitschek2012-11-241-0/+29
| * | | | use normalizePath to have a proper target pathArthur Schiwon2012-11-261-3/+1
| * | | | remove debug outputArthur Schiwon2012-11-261-3/+0
| * | | | coding styleArthur Schiwon2012-11-261-1/+2
| * | | | check whether to join url with ? or &Arthur Schiwon2012-11-261-2/+13
| * | | | all but the first parameter are introduced by &Arthur Schiwon2012-11-262-4/+4
| * | | | make sure path starts with /Arthur Schiwon2012-11-261-0/+3
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-2636-204/+284
* | | | | better check if we are passing a fileid to Cache::getRobin Appelman2012-11-251-1/+1