summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* OC_Defaults is only used in error reportingBart Visscher2013-10-041-1/+1
* Add L10N interface to server containerBart Visscher2013-10-045-13/+125
* Merge pull request #5068 from owncloud/improved_requestBart Visscher2013-10-044-47/+110
|\
| * Fix fix of POST :PThomas Tanghus2013-10-031-10/+11
| * Fix POST decodingThomas Tanghus2013-10-031-2/+2
| * Modified PUT behaviourThomas Tanghus2013-10-021-26/+30
| * Remove getContent() from IRequestThomas Tanghus2013-10-011-8/+0
| * Remove JSON request parsing from ServerThomas Tanghus2013-10-012-13/+1
| * Implement PUT an PATCH supportThomas Tanghus2013-10-012-29/+74
| * Add interface docs to IRequest.Thomas Tanghus2013-10-011-0/+22
| * Add patch method to OC_RouteThomas Tanghus2013-10-011-0/+8
| * Check if accessor matched request method.Thomas Tanghus2013-10-011-0/+3
* | Merge pull request #5087 from owncloud/templatefunction-relativedateVincent Petry2013-10-042-10/+39
|\ \
| * | Removed $fromTime argument from public template APIVincent Petry2013-10-041-2/+2
| * | Fixed missing default valuesVincent Petry2013-10-032-3/+3
| * | Added unit tests for relative_modified_date, changed method signatureVincent Petry2013-10-032-9/+15
| * | Removed stray debug log writeVincent Petry2013-10-021-1/+0
| * | Added dateOnly argument to relative_modified_dateVincent Petry2013-10-022-10/+34
* | | Merge pull request #5091 from guruz/webdav_connector_use_cache_for_etagMarkus Goetz2013-10-041-1/+8
|\ \ \
| * | | DAV: Use fileinfo_cache for ETagMarkus Goetz2013-10-031-1/+8
| |/ /
* | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-041-0/+30
|\ \ \
| * | | ups. remove debugFrank Karlitschek2013-10-041-2/+0
| * | | use Filesystem::isIgnoredDirFrank Karlitschek2013-10-041-1/+1
| * | | fix typoFrank Karlitschek2013-10-041-1/+1
| * | | add public staticFrank Karlitschek2013-10-041-1/+1
| * | | make it possible to prepopulate a new user gome with a skeletonFrank Karlitschek2013-10-031-0/+32
* | | | Merge branch 'master' into sharing_mail_notification_masterThomas Müller2013-10-022-1/+10
|\| | |
| * | | only perform files upgrade in case there are actually entries in the old fsca...Thomas Müller2013-10-021-1/+9
| |/ /
| * | Merge pull request #5071 from owncloud/fix-autoloader-masterThomas Müller2013-10-021-0/+1
| |\ \
| | * | Fix autoloader regressionVictor Dubiniuk2013-10-021-0/+1
| | |/
* | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-02340-1098/+5904
|\| |
| * | Merge branch 'master' into fixing-4620-masterThomas Müller2013-10-01340-1200/+6325
| |\|
| | * Merge branch 'master' into lib-private-master-2Thomas Müller2013-10-013-7/+51
| | |\
| | | * use public api for session access from server containerThomas Müller2013-09-301-12/+18
| | | * Merge branch 'master' into channelsThomas Müller2013-09-30166-1774/+10827
| | | |\
| | | * | put the current version and edition into a seperate file to simplify packagin...Frank Karlitschek2013-09-301-5/+38
| | | * | use ===Frank Karlitschek2013-09-301-1/+6
| | | * | prepare the updater for the new update channelsFrank Karlitschek2013-09-301-1/+1
| | * | | Merge branch 'master' into lib-private-master-2Thomas Müller2013-09-302-0/+23
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabledThomas Müller2013-09-302-0/+23
| | | |\ \
| | | | * | check every enabled app if the remember login feature needs to be disabledBjoern Schiessle2013-09-261-3/+13
| | | | * | introduce OC_Util::rememberLoginAllowed()Bjoern Schiessle2013-09-242-2/+13
| | | | * | don't remember login if the encrypion app is enabled because the userBjoern Schiessle2013-09-242-6/+8
| | * | | | reorganize file in libThomas Müller2013-09-303-0/+0
| | * | | | move the private namespace OC into lib/private - OCP will stay in lib/publicThomas Müller2013-09-30309-5/+5
| | |/ / /
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-303-6/+20
| | * | | Merge pull request #5012 from owncloud/check_keyfiles_existsMorris Jobke2013-09-301-8/+12
| | |\ \ \
| | | * | | check not only if the keyfile folder exists but also if it contains keyfilesBjoern Schiessle2013-09-271-8/+12
| | * | | | Merge pull request #4459 from owncloud/appframework-masterThomas Müller2013-09-3065-990/+5505
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' into appframework-masterThomas Müller2013-09-306-14/+77
| | | |\ \ \ \