summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Create CONTRIBUTING.mdLukas Reschke2013-01-111-0/+32
* Merge pull request #1150 from owncloud/EnableSSL-AdminMenuLukas Reschke2013-01-115-0/+56
|\
| * Removed uneeded HTML tagLukas Reschke2013-01-111-1/+1
| * Add security section to admin menuLukas Reschke2013-01-115-0/+56
* | Merge pull request #1155 from owncloud/remove-setContentTypeHeaderLukas Reschke2013-01-112-2/+0
|\ \
| * | Remove setContentTypeHeader()Lukas Reschke2013-01-112-2/+0
* | | Merge pull request #1154 from owncloud/remove-uneededFileFrank Karlitschek2013-01-111-1/+0
|\ \ \ | |/ / |/| |
| * | Remove uneeded fileLukas Reschke2013-01-111-1/+0
|/ /
* / Correct link to the bugtracker in exception.phpLukas Reschke2013-01-111-1/+1
|/
* Merge pull request #1133 from owncloud/add_linebreaks_in_sharingThomas Müller2013-01-102-113/+519
|\
| * add more linebreaks, replace SQL LIMIT with paramJörn Friedrich Dreyer2013-01-092-113/+519
* | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1162-593/+792
* | Merge pull request #1127 from owncloud/fixing-641-for-webdav-masterThomas Müller2013-01-103-0/+79
|\ \
| * | webdav returns "503 Service Unavailable" in case the ownCloud server is curre...Thomas Mueller2013-01-093-0/+79
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-10144-523/+1543
* | | 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-092-174/+1
|\ \ \ | |/ / |/| |
| * | Upstream merged my patch to add additional ssl root certificates to the webda...Björn Schießle2013-01-082-174/+1
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2013-01-09132-2707/+2951
* | Merge pull request #938 from owncloud/fix_minor_files_annoyancesThomas Tanghus2013-01-087-57/+84
|\ \ | |/ |/|
| * fixing string concatenation in javascriptThomas Mueller2013-01-081-1/+1
| * ie8 ignores rgba, show button border in ie8 by adding second border css rowJörn Friedrich Dreyer2013-01-071-1/+1
| * attach max upload tipsy to div instead of a to fix tooltip not showing due to...Jörn Friedrich Dreyer2013-01-073-4/+8
| * 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-06196-3876/+7238
| |\
| * | 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
| * | use jQuery.parseJSON fallback for IE6/7/8Jörn Friedrich Dreyer2013-01-021-2/+9
| * | input/form switching cleanupJörn Friedrich Dreyer2013-01-022-3/+3
| * | remove , at end of js. IE8 chokes on thisJörn Friedrich Dreyer2013-01-021-1/+1
| * | 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
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-0852-152/+220
* | | Update apps/user_webdavauth/user_webdavauth.phpFrank Karlitschek2013-01-071-1/+1
* | | Merge pull request #1061 from owncloud/remove_css_not_selector_to_fix_ie8_inp...Jörn Friedrich Dreyer2013-01-071-1/+1
|\ \ \
| * | | remove css not selector - incompatible with ie8Jörn Friedrich Dreyer2013-01-021-1/+1
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-07142-2773/+3626
* | | Merge pull request #632 from owncloud/fix_629Thomas Müller2013-01-061-1/+1
|\ \ \ | |_|/ |/| |
| * | use regex which was suggested by dragotinGeorg Ehrke2012-12-171-1/+1
| * | fix pattern for database namesGeorg Ehrke2012-11-291-1/+1
* | | Merge pull request #1092 from owncloud/rename_dotThomas Müller2013-01-063-6/+18
|\ \ \
| * | | rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has ...Thomas Mueller2013-01-062-5/+17
| * | | Files: prevent people from renaming files to '.'Robin Appelman2013-01-052-2/+2
* | | | Merge pull request #1079 from owncloud/update-progressMichael Gapczynski2013-01-057-49/+159
|\ \ \ \
| * \ \ \ Merge branch 'master' into update-progressMichael Gapczynski2013-01-05149-3387/+4619
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1066 from owncloud/fix-388-masterThomas Müller2013-01-053-21/+85
|\ \ \ \ \ | |_|/ / / |/| | | |