aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-11-26260-1783/+2525
* Merge pull request #5937 from owncloud/calc_version_sizeMorris Jobke2013-11-251-12/+11
|\
| * Merge branch 'master' into calc_version_sizeBjoern Schiessle2013-11-26792-11808/+13458
| |\ | |/ |/|
* | Merge pull request #6044 from owncloud/extstorage-ftpunittestfixVincent Petry2013-11-251-4/+4
|\ \
| * | Fixed FTP storage unit tests to use the correct classVincent Petry2013-11-251-4/+4
* | | Merge pull request #6036 from owncloud/single-user-modeMorris Jobke2013-11-256-1/+84
|\ \ \
| * \ \ merge master into single-user-modeRobin Appelman2013-11-2546-62/+530
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #6034 from owncloud/fix-api-documentationOwen Winkler2013-11-2529-25/+231
|\ \ \ \
| * | | | fix some capital lettersMorris Jobke2013-11-255-5/+14
| * | | | page level doc blocks and class descriptionsMorris Jobke2013-11-2515-0/+95
| * | | | AppFramework(Controller|HTTP|HTTP-Responses|Middleware), IContainer API fixesMorris Jobke2013-11-257-4/+58
| * | | | fix defaults.php docMorris Jobke2013-11-251-10/+18
| * | | | fix defaults.php docMorris Jobke2013-11-251-6/+44
| * | | | fix db.php docMorris Jobke2013-11-251-0/+2
* | | | | Merge pull request #6038 from owncloud/occ-app-enableicewind19912013-11-254-0/+126
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add occ command to list all appsRobin Appelman2013-11-252-0/+48
| * | | | rename app_id to app-idRobin Appelman2013-11-252-4/+4
| * | | | add occ commands for enabling and disabling appsRobin Appelman2013-11-253-0/+78
* | | | | Merge pull request #6035 from owncloud/fixing-rawpath-reverseproxy-oc6Jörn Friedrich Dreyer2013-11-252-1/+54
|\ \ \ \ \
| * | | | | in case uri and script name don't match we better throw an exceptionThomas Müller2013-11-252-2/+32
| * | | | | handle duplicate slashes in case of reverse proxy configurationThomas Müller2013-11-252-1/+24
| |/ / / /
* | | | | Merge pull request #6037 from owncloud/fix-6007-oc6Thomas Müller2013-11-251-0/+12
|\ \ \ \ \
| * | | | | adding chunked upload handlingThomas Müller2013-11-251-0/+12
* | | | | | Merge pull request #6040 from owncloud/fix-navbar-cssRaghu Nayyar2013-11-251-1/+1
|\ \ \ \ \ \
| * | | | | | Fix navbar issueMorris Jobke2013-11-251-1/+1
|/ / / / / /
* | | | | | Merge pull request #6030 from owncloud/cli-errorsicewind19912013-11-251-6/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | provide more cli friendly error messagesRobin Appelman2013-11-251-6/+21
| |/ / / /
* | | | | Merge pull request #5641 from owncloud/filestrash-emptytrashBjörn Schießle2013-11-255-26/+77
|\ \ \ \ \
| * | | | | Deleting all files in trash now only sends a single flagVincent Petry2013-11-115-26/+77
* | | | | | Merge pull request #6028 from owncloud/extstorage-touchoperationreturnvalueVincent Petry2013-11-253-3/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fixed ext storage touch function to return true on successVincent Petry2013-11-253-3/+8
| | | | * | add documentation for single user config option to config.sample.phpRobin Appelman2013-11-251-0/+3
| | | | * | Add template for single user mode messageRobin Appelman2013-11-251-0/+10
| | | | * | Add occ command to enable and disable single user modeRobin Appelman2013-11-252-0/+52
| | | | * | Add "single user mode" which restricts access to users in the admin groupRobin Appelman2013-11-252-1/+19
| |_|_|/ / |/| | | |
* | | | | Merge pull request #5960 from owncloud/enc_small_visual_improvementsVincent Petry2013-11-251-5/+5
|\ \ \ \ \
| * | | | | - show a spinner while decrypting files if the encryption app was disabledBjoern Schiessle2013-11-201-5/+5
* | | | | | Merge pull request #6025 from owncloud/typoVincent Petry2013-11-251-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | fix typoBjoern Schiessle2013-11-251-1/+1
|/ / / / /
* | | | | Merge pull request #5991 from owncloud/extstorage-mountpointvalidationMorris Jobke2013-11-252-0/+56
|\ \ \ \ \
| * | | | | Now also preventing the user of "Shared" as mountpointVincent Petry2013-11-222-2/+4
| * | | | | Added unit test for root mount point validationVincent Petry2013-11-211-0/+49
| * | | | | Prevent using root as mount point for external storageVincent Petry2013-11-211-0/+5
* | | | | | Merge pull request #5998 from owncloud/navigation-fixThomas Müller2013-11-241-5/+6
|\ \ \ \ \ \
| * | | | | | fix navigation scrollbarMorris Jobke2013-11-221-5/+6
| * | | | | | Doesn't Cut the top arrow from navigationraghunayyar2013-11-221-3/+3
* | | | | | | Merge pull request #6021 from owncloud/show_buildThomas Müller2013-11-244-2/+16
|\ \ \ \ \ \ \
| * | | | | | | remove logic from template and fix syntax errorThomas Mueller2013-11-242-2/+2
| * | | | | | | add new function to generate the human readable version string based on versi...Thomas Mueller2013-11-241-0/+13
| * | | | | | | replace echo with pFrank Karlitschek2013-11-242-2/+2