summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2013-01-15154-727/+999
|\
| * Merge pull request #1087 from owncloud/ldap_multiple_dnsblizzz2013-01-154-45/+105
| |\
| | * dechex not necessary, do not waste time with itArthur Schiwon2013-01-081-1/+1
| | * Code styleArthur Schiwon2013-01-081-6/+10
| | * support LDAP search using multiple base DNs also with paged results, implemen...Arthur Schiwon2013-01-041-33/+50
| | * support multiple base DNsArthur Schiwon2013-01-031-5/+42
| | * Base DNs will be used as array, now, to support usage of multiple DNsArthur Schiwon2013-01-031-3/+3
| | * Switch to textarea to enable configuration of multiple DNsArthur Schiwon2013-01-032-4/+6
| | * LDAP: fix spellingArthur Schiwon2013-01-031-1/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1573-184/+40
| * | Merge pull request #1169 from owncloud/webdav_L10nBart Visscher2013-01-141-2/+2
| |\ \
| | * | The => ThisLukas Reschke2013-01-131-1/+1
| | * | Improved the help textLukas Reschke2013-01-131-1/+1
| | * | legend - l10nLukas Reschke2013-01-131-1/+1
| * | | Merge pull request #1135 from owncloud/allow_default_click_behaviourLukas Reschke2013-01-141-1/+2
| |\ \ \
| | * | | allow default click behaviourJörn Friedrich Dreyer2013-01-091-1/+2
| * | | | Merge pull request #1170 from owncloud/correctIndentionThomas Müller2013-01-142-78/+78
| |\ \ \ \
| | * | | | Remove ugly indentationLukas Reschke2013-01-132-78/+78
| * | | | | Merge branch 'master' of github.com:owncloud/coreBjörn Schießle2013-01-1469-174/+467
| |\ \ \ \ \
| | * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-141-0/+6
| | | |_|/ / | | |/| | |
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-132-1/+10
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-126-4/+37
| | |/ / /
| | * | | Merge pull request #1133 from owncloud/add_linebreaks_in_sharingThomas Müller2013-01-101-17/+35
| | |\ \ \
| | | * | | add more linebreaks, replace SQL LIMIT with paramJörn Friedrich Dreyer2013-01-091-17/+35
| | | |/ /
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1117-42/+169
| | * | | Merge pull request #1127 from owncloud/fixing-641-for-webdav-masterThomas Müller2013-01-101-0/+1
| | |\ \ \
| | | * | | webdav returns "503 Service Unavailable" in case the ownCloud server is curre...Thomas Mueller2013-01-091-0/+1
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1050-19/+125
| | * | | | Merge pull request #1131 from owncloud/more_translationsLukas Reschke2013-01-092-5/+6
| | |\ \ \ \
| | | * | | | more translationsJörn Friedrich Dreyer2013-01-092-5/+6
| | | | |/ / | | | |/| |
| | * | | | Merge pull request #1124 from schiesbn/sabredav2Lukas Reschke2013-01-091-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Upstream merged my patch to add additional ssl root certificates to the webda...Björn Schießle2013-01-081-1/+1
| | | |/ /
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-0940-41/+13
| | * | | Merge pull request #938 from owncloud/fix_minor_files_annoyancesThomas Tanghus2013-01-084-52/+72
| | |\ \ \ | | | |/ / | | |/| |
| | | * | fixing string concatenation in javascriptThomas Mueller2013-01-081-1/+1
| | | * | attach max upload tipsy to div instead of a to fix tooltip not showing due to...Jörn Friedrich Dreyer2013-01-072-3/+7
| | | * | remove aborted uploadsJörn Friedrich Dreyer2013-01-071-0/+3
| | | * | adapt to isFileNameValid, whitespace cleanupJörn Friedrich Dreyer2013-01-072-28/+19
| | | * | Merge branch 'master' into fix_minor_files_annoyancesThomas Mueller2013-01-0655-18/+158
| | | |\ \
| | | * | | reverse z-index of a and input to make upload work again in ie8/9Jörn Friedrich Dreyer2013-01-041-2/+2
| | | * | | remove initial iframe, is added automatically by jquery upload mechanismJörn Friedrich Dreyer2013-01-041-2/+0
| | | * | | input/form switching cleanupJörn Friedrich Dreyer2013-01-022-3/+3
| | | * | | abort rename on ESC keyupJörn Friedrich Dreyer2013-01-021-0/+7
| | | * | | show notification when renaming a file to ''Jörn Friedrich Dreyer2013-01-021-0/+4
| | | * | | enable enter in ie by using .submit()+form instead of .change(), use notifica...Jörn Friedrich Dreyer2013-01-021-12/+25
| | | * | | whitespace cleanupJörn Friedrich Dreyer2013-01-021-14/+14
| * | | | | merge conflict fixed, settings-personal.php is no longer neededBjörn Schießle2013-01-149-257/+292
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | - code clean-upBjörn Schießle2013-01-111-64/+58
| | * | | | function description fixedBjörn Schießle2013-01-111-5/+2
| | * | | | some more clean-up, isVersioned() is no longer needed; rename hook fixed if a...Björn Schießle2013-01-115-59/+53