summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* PHPUnit support for Windows addedThomas Mueller2013-02-042-0/+464
* Merge pull request #1229 from owncloud/from_live_to_onThomas Müller2013-02-038-40/+39
|\
| * Merge branch 'master' into from_live_to_onThomas Mueller2013-01-31589-9506/+17539
| |\
| * | use on instead of live in users.jsJörn Friedrich Dreyer2013-01-301-1/+1
| * | attach to filelist which is present on .ready()Jörn Friedrich Dreyer2013-01-301-13/+13
| * | 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-308-38/+38
* | | Merge pull request #1340 from owncloud/fixing-js-errors-public-link-masterThomas Müller2013-02-033-1/+6
|\ \ \
| * | | 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-31686-18789/+28813
| |\ \ \ | | | |/ | | |/|
| * | | 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
* | | | Merge pull request #1435 from owncloud/make_BlacklistConfigurableMichael Gapczynski2013-02-032-1/+4
|\ \ \ \
| * | | | Make fileblacklist configurableLukas Reschke2013-02-032-1/+4
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0455-440/+600
|/ / / /
* | | | fix CSS to coding guidelineJan-Christoph Borchardt2013-02-031-0/+13
* | | | Password Toggle Support for Loginraghunayyar2013-02-035-4/+76
* | | | Merge pull request #1416 from herbrechtsmeier/set_include_path_earlyThomas Müller2013-02-031-6/+7
|\ \ \ \
| * | | | initPaths: set include path before any owncloud function is calledherbrechtsmeier2013-02-021-6/+7
* | | | | Merge pull request #1422 from TheSFReader/masterThomas Müller2013-02-032-2/+3
|\ \ \ \ \
| * | | | | Remove a warning by making sure the renamed file is a dir before trying and o...TheSFReader2013-02-021-1/+1
| * | | | | Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-02-02384-2276/+2477
| |\| | | |
| * | | | | Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-02-01373-7004/+14837
| |\ \ \ \ \
| * | | | | | Correct itTheSFReader2013-02-011-1/+2
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-03148-4161/+5013
* | | | | | | Merge pull request #1419 from owncloud/etag_fixThomas Müller2013-02-022-2/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Dav: update etag in filecache when doing a PROPSETRobin Appelman2013-02-021-1/+3
| * | | | | | Dav: don't overwrite etag from filecache with old etag from properties tableRobin Appelman2013-02-021-1/+3
|/ / / / / /
* | | | | | Merge pull request #1415 from owncloud/ldap_fix_settingsLukas Reschke2013-02-012-20/+32
|\ \ \ \ \ \
| * | | | | | remove ugly whitespaceArthur Schiwon2013-02-011-1/+1
| * | | | | | LDAP: settings Advanced tab has grown too long by far. Structure it using acc...Arthur Schiwon2013-02-012-20/+32
| | |/ / / / | |/| | | |
* / | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-02382-2256/+2445
|/ / / / /
* | | | | Merge pull request #1413 from owncloud/enable_removing_search_providersFrank Karlitschek2013-02-011-0/+16
|\ \ \ \ \
| * | | | | add function to remove a search providerJörn Friedrich Dreyer2013-02-011-0/+16
* | | | | | Merge pull request #1395 from raghunayyar/webkit-scrollbar-534Jan-Christoph Borchardt2013-02-011-0/+5
|\ \ \ \ \ \
| * | | | | | More Visible webkit Scrollbar, syntax error solved.raghunayyar2013-02-011-3/+3
| * | | | | | Adds webkit scrollbar to ownCloudraghunayyar2013-01-311-0/+5
* | | | | | | Merge pull request #1384 from owncloud/upgrade_fixBart Visscher2013-02-011-70/+53
|\ \ \ \ \ \ \
| * | | | | | | Still load js files in maintance modeRobin Appelman2013-01-301-2/+6
| * | | | | | | Check for upgrade/maintance mode before trying to load an appRobin Appelman2013-01-301-70/+49
* | | | | | | | Merge pull request #1404 from owncloud/fixing-1276-masterblizzz2013-02-011-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | fix #1276 - use registerLoadedCallback()Thomas Mueller2013-02-011-3/+4
* | | | | | | | | Updateing -> UpdatingThomas Mueller2013-02-011-1/+1
* | | | | | | | | undelete -> restoreThomas Mueller2013-02-011-1/+1
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-01326-3231/+13981
* | | | | | | | | fix breadcrumbs for gallery and texteditorRobin Appelman2013-02-011-1/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #1171 from owncloud/move-datadirectory-checksThomas Müller2013-01-311-30/+28
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into move-datadirectory-checksMichael Gapczynski2013-01-18622-6831/+6456
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Move permissions check to new function checkDataDirectoryPermissions()Michael Gapczynski2013-01-181-28/+27