summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Correct indentation for default language.Andreas Fischer2013-10-231-4/+4
* 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
| |/ / / /
* | | | | Merge pull request #5473 from owncloud/files-startviewerfuncThomas Müller2013-10-221-0/+25
|\ \ \ \ \
| * | | | | Added FileList.setViewerMode to hide controlsVincent Petry2013-10-221-0/+25
| |/ / / /
* | | | | Merge pull request #5476 from owncloud/admin-showwarningwhenhomeexistsThomas Müller2013-10-222-0/+19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added warning notification when user home already existsVincent Petry2013-10-222-0/+19
|/ / / /
* | | | Merge pull request #5455 from owncloud/fixing-2423-masterThomas Müller2013-10-2210-15/+32
|\ \ \ \
| * | | | use OC_Helper::linkToDocs() in lib/private/config.phpThomas Müller2013-10-211-1/+1
| * | | | introduce OC_Helper::linkToDocs()Thomas Müller2013-10-213-6/+18
| * | | | introduce link_to_docs() and migrate linksThomas Müller2013-10-219-15/+20
* | | | | Merge pull request #5437 from owncloud/create-custom-logfileThomas Müller2013-10-221-1/+11
|\ \ \ \ \
| * | | | | Try to create custom log file before falling back to default.Andreas Fischer2013-10-201-1/+11
* | | | | | Merge pull request #5426 from owncloud/fix-3612Vincent Petry2013-10-221-0/+4
|\ \ \ \ \ \
| * | | | | | Takes Import button to next line.raghunayyar2013-10-211-1/+4
| * | | | | | Adds margin to the SSL root certificate buttonraghunayyar2013-10-191-0/+1
* | | | | | | Merge pull request #5446 from frisco82/fixNotifyUserFrank Karlitschek2013-10-212-12/+11
|\ \ \ \ \ \ \
| * | | | | | | fix notify user, and made js more resiliant to changesRamiro Aparicio2013-10-212-12/+11
* | | | | | | | Merge pull request #5249 from owncloud/activities-apiThomas Müller2013-10-216-0/+184
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into activities-apiThomas Müller2013-10-1626-476/+233
| |\ \ \ \ \ \ \ \
| * | | | | | | | | remove test codeThomas Müller2013-10-161-4/+0
| * | | | | | | | | Merge branch 'master' into activities-apiThomas Müller2013-10-16990-21642/+19802
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | adding OC6 public API for activitiesThomas Müller2013-10-093-5/+44
| * | | | | | | | | | Merge branch 'master' into activities-apiThomas Müller2013-10-091177-19806/+34007
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | initial implementation of activity managerThomas Müller2013-09-294-0/+73
| * | | | | | | | | | | Merge branch 'appframework-master' into activities-apiThomas Müller2013-09-29689-9922/+23573
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | adding basic interfaces for the activities apiThomas Müller2013-09-203-0/+77
* | | | | | | | | | | | | Merge pull request #5120 from frisco82/sendEmailJSVincent Petry2013-10-211-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \