summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2012-11-1736-384/+457
* Merge pull request #471 from owncloud/461_drag_drop_upload_to_folderBart Visscher2012-11-163-4/+20
|\
| * adding comments on the form array indexesThomas Mueller2012-11-161-0/+3
| * normalize the path once in upload.php is enough - THX Robin for this hintThomas Mueller2012-11-162-8/+2
| * refs #461 - drag'n'drop upload to a sub folder is working nowThomas Mueller2012-11-164-4/+23
|/
* Merge pull request #454 from Raydiation/masterThomas Müller2012-11-152-2/+8
|\
| * removed unneeded callback checks in routes_request that could potentially failBernhard Posselt2012-11-151-4/+0
| * fixed: this.routes_request is a deferred/promiseBernhard Posselt2012-11-151-5/+1
| * When using routing in apps, no apps are loaded in the left navigation tree. T...Bernhard Posselt2012-11-151-0/+1
| * instead of warning via popup, write to console.warnBernhard Posselt2012-11-151-1/+1
| * Prevent ajax race conditions when using routes by offering a callback that is...Bernhard Posselt2012-11-151-2/+15
* | Merge pull request #458 from owncloud/js_console_switchThomas Tanghus2012-11-154-0/+19
|\ \
| * | Very simple js console switcher.Thomas Tanghus2012-11-154-0/+19
* | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-16154-369/+473
* | | Merge pull request #433 from owncloud/user_setting_fixesThomas Müller2012-11-153-17/+18
|\ \ \ | |/ / |/| |
| * | Better place to check for user removalBart Visscher2012-11-151-1/+4
| * | Better check and handing of user deletionBart Visscher2012-11-142-1/+3
| * | Better check and handling of user creationBart Visscher2012-11-142-3/+6
| * | Always have the username as string in user adminBart Visscher2012-11-141-6/+6
| * | Cleanup user settings jsBart Visscher2012-11-141-8/+1
* | | port of approved pull request #442 - 'Always set renaming to false, also if r...Björn Schießle2012-11-151-1/+1
| |/ |/|
* | really check if mod_deflate is loadedArthur Schiwon2012-11-151-1/+1
* | coding styleArthur Schiwon2012-11-151-3/+3
* | Fix remote.php CSS+JS garbish on some systemsArthur Schiwon2012-11-151-0/+6
* | [tx-robot] updated from transifexJenkins for ownCloud2012-11-15227-2333/+6028
* | Revert "Prevent ajax race conditions when using routes by offering a callback...Bernhard Posselt2012-11-141-15/+2
* | Prevent ajax race conditions when using routes by offering a callback that is...Bernhard Posselt2012-11-141-2/+15
|/
* Merge pull request #271 from owncloud/239_webdav_999_filesLukas Reschke2012-11-141-10/+16
|\
| * adding comments to explain what's going on hereThomas Mueller2012-11-061-0/+4
| * fixes #329: query the database in chunks of 200Thomas Mueller2012-11-051-10/+12
* | Merge pull request #402 from zimba12/masterThomas Müller2012-11-142-9/+10
|\ \
| * | fix translation issues with previous commitAlessandro Cosentino2012-11-132-6/+6
| * | uncomment hours entries in relative date functionsAlessandro Cosentino2012-11-132-8/+9
* | | Fixing syntax error - closes #406Thomas Müller2012-11-141-1/+1
* | | Fixing syntax error - closes #406Thomas Müller2012-11-141-1/+1
|/ /
* | Merge pull request #41 from owncloud/vcategories_dbThomas Tanghus2012-11-1317-115/+1316
|\ \
| * | Bump version to trigger update.Thomas Tanghus2012-11-131-1/+1
| * | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-1393-1651/+1941
| |\ \
| * \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-127-60/+108
| |\ \ \
| * | | | Don't use indexes in test data as postgres complains over duplicate keys.Thomas Tanghus2012-11-121-41/+0
| * | | | Change insertIfNotExist() for sqlite. Not fast, but more reliable than previo...Thomas Tanghus2012-11-121-12/+36
| * | | | Correct SQL syntax.Thomas Tanghus2012-11-121-1/+1
| * | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-1237-185/+268
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-11442-12444/+8896
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-0723-73/+91
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-0627-59/+1675
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-054-3/+45
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | VCategories: Closing brace must be on a line by itself.Thomas Tanghus2012-11-051-2/+2
| * | | | | | | | VCategories: Line too long.Thomas Tanghus2012-11-051-1/+4
| * | | | | | | | VCategories: Line too long.Thomas Tanghus2012-11-051-1/+3