summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | remove hover hide/show stuff for share dropdown to make things more obviousJan-Christoph Borchardt2013-10-201-26/+3
| * | | | | | | bold share usernameJan-Christoph Borchardt2013-10-201-0/+1
| * | | | | | | properly align checkboxes to textJan-Christoph Borchardt2013-10-201-0/+1
| * | | | | | | more breathing space in share listJan-Christoph Borchardt2013-10-201-1/+2
* | | | | | | | beta 1Frank Karlitschek2013-10-231-2/+2
* | | | | | | | Merge pull request #5442 from owncloud/extstorage-ignoreduplicateinsertsThomas Müller2013-10-232-14/+38
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Catch duplicate insertion errors while scanning filesVincent Petry2013-10-232-14/+38
| | |/ / / / / | |/| | | | |
* | | | | | | run first getUsersItemShared() with the ownerBjoern Schiessle2013-10-231-1/+1
* | | | | | | update etags for user we haven't checked yetBjoern Schiessle2013-10-231-1/+1
* | | | | | | keep a list of users we already checked to avoid loopsBjoern Schiessle2013-10-231-3/+3
* | | | | | | fix infinite loop while updating etags, fix for #4365Bjoern Schiessle2013-10-231-2/+4
* | | | | | | Merge branch 'master' of github.com:owncloud/coreBjoern Schiessle2013-10-232-1/+35
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #5478 from owncloud/core-logexceptionstacktraceThomas Müller2013-10-232-1/+35
| |\ \ \ \ \ \
| | * | | | | | Added $app parameter to logExceptionVincent Petry2013-10-232-5/+5
| | * | | | | | Moved logException to OCP\Util classVincent Petry2013-10-232-29/+34
| | * | | | | | Expand exception stack trace in log in debug modeVincent Petry2013-10-221-1/+30
* | | | | | | | files_encryption: Fix getFileSize()Markus Goetz2013-10-232-3/+38
|/ / / / / / /
* | | | | | | Merge pull request #5458 from owncloud/fixing-5222-masterVicDeo2013-10-234-4/+105
|\ \ \ \ \ \ \
| * | | | | | | add missing file headerThomas Müller2013-10-231-0/+6
| * | | | | | | fixing php 5.3.3 error:Thomas Müller2013-10-221-2/+3
| * | | | | | | Merge branch 'master' into fixing-5222-masterThomas Müller2013-10-222-12/+11
| |\ \ \ \ \ \ \
| * | | | | | | | php 5.3 compatibility regarding OC\DB\Connection fixedThomas Müller2013-10-213-2/+96
* | | | | | | | | Update CONTRIBUTING.mdJohannes Twittmann2013-10-231-1/+4
* | | | | | | | | Merge pull request #5404 from owncloud/ldap_settings_wizardblizzz2013-10-2320-481/+2721
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | LDAP Wizard: proper strings and translations for user and group count textArthur Schiwon2013-10-233-5/+11
| * | | | | | | | merge master with resolved conflictsArthur Schiwon2013-10-23439-4410/+8340
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #5472 from owncloud/enc_init_status_on_enableBjörn Schießle2013-10-234-1/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove debug outputBjoern Schiessle2013-10-221-1/+0
| * | | | | | | | | set the init status to "NOT_INITIALIZED" if the encryption app gets enabledBjoern Schiessle2013-10-223-1/+14
| * | | | | | | | | add post_enable hook if a app gets enabledBjoern Schiessle2013-10-221-0/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #5482 from owncloud/fix_weird_http_namespaceThomas Müller2013-10-2313-10/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix namespace for OCP\Appframework\HttpThomas Tanghus2013-10-2313-10/+18
* | | | | | | | | | Merge pull request #5391 from owncloud/undefined-property-in-schema-masterThomas Müller2013-10-221-3/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Use quoteIdentifier with proper objectsVictor Dubiniuk2013-10-211-0/+5
| * | | | | | | | | removing pointless calls on quoteIdentifier() - reason: name on $tableDiff do...Thomas Müller2013-10-171-6/+2
* | | | | | | | | | Merge pull request #5451 from owncloud/reuse-session-ocs-masterThomas Müller2013-10-221-3/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Support existing sessions within OCS API callsThomas Müller2013-10-211-3/+19
* | | | | | | | | | | Merge pull request #5310 from owncloud/hide_filestable-header_when_emptyChristopher Schäpers2013-10-223-10/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed empty content logicVincent Petry2013-10-212-2/+2
| * | | | | | | | | | | Fix mind-boggling emptycontent logickondou2013-10-213-6/+8
| * | | | | | | | | | | Fix shared folder still showing fileheaderkondou2013-10-212-3/+3
| * | | | | | | | | | | Improve updateEmptyContent logickondou2013-10-201-1/+1
| * | | | | | | | | | | Create FileList.updateEmptyContent() and fix not showing emptycontent after d...kondou2013-10-201-5/+10
| * | | | | | | | | | | Hide files list header, when theres no files to seekondou2013-10-123-5/+12
* | | | | | | | | | | | Merge pull request #5479 from owncloud/fixing-4502-masterThomas Müller2013-10-223-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | - delete properties on node deleteThomas Müller2013-10-223-0/+19
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5466 from owncloud/files-thumbnailloadingdelaystyleThomas Müller2013-10-221-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed ugly white space while loading file thumbnailVincent Petry2013-10-221-2/+10
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #5467 from owncloud/fixing-5063-masterThomas Müller2013-10-221-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | display the original file name - this will change in case of renamesThomas Müller2013-10-221-3/+3
| |/ / / / / / / / / /