summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into routingBart Visscher2012-09-284-8/+99
|\
| * Fix to preserve backward compatibility for apps creating static links contain...Christian Reiner2012-09-281-2/+2
| * Merge branch 'master' of git://github.com/owncloud/coreChristian Reiner2012-09-2810-7/+65
| |\
| * | Reimplementation of CSRF protection including autorefreshChristian Reiner2012-09-284-8/+99
* | | Merge branch 'master' into routingBart Visscher2012-09-2864-233/+981
|\ \ \ | | |/ | |/|
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-09-283-7/+33
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-09-278-0/+32
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-262-0/+35
| * Fix unsetting share expiration dateMichael Gapczynski2012-09-261-1/+8
| * Show share expiration date set for shared itemMichael Gapczynski2012-09-261-5/+13
| * Stop autocomplete selection event propogration so share dropdown doesn't disa...Michael Gapczynski2012-09-251-0/+1
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-262-0/+14
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-253-4/+52
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-247-0/+207
| * some js style fixesRobin Appelman2012-09-231-62/+65
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-235-0/+110
| * Added a missing CSRF checkLukas Reschke2012-09-221-0/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-221-0/+10
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-2250-51/+51
| * some characters in comments avoid finding some strings to translatescambra2012-09-212-4/+4
| * fix translating dialog buttons, they are translated in core not dialogs appscambra2012-09-211-6/+6
| * translate files_sharing appscambra2012-09-211-26/+26
| * float right element needs to be the first element, otherwise firefox will mov...Björn Schießle2012-09-201-2/+2
| * General style fixes for the share dropdownTom Needham2012-09-191-0/+2
| * Fix datepicker icons for all uses across ownCloudTom Needham2012-09-191-0/+4
| * Fix changing of share status icons, bug fix for oc-1631Michael Gapczynski2012-09-191-11/+22
| * Don't show the expiration option until a share occurs, bug fix for oc-1724Michael Gapczynski2012-09-192-1/+9
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-192-1/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-184-1/+21
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-171-0/+1
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-141-0/+64
| * show the current username. This confused some peopleFrank Karlitschek2012-09-121-1/+1
| * Merge branch 'master' into share_expirationMichael Gapczynski2012-09-1276-264/+497
| |\
| | * Add lock and clock icon for sharingMichael Gapczynski2012-09-125-2/+29
| | * Temporarily disable sharing with contacts and emails, will come in next releaseMichael Gapczynski2012-09-122-22/+22
| | * [tx-robot] updated from transifexJenkins for ownCloud2012-09-111-0/+17
| | * Don't display actions for children in shared collections, show the parent col...Michael Gapczynski2012-09-091-42/+61
| | * Fix shared collection item searchingMichael Gapczynski2012-09-091-1/+1
| | * move breadcrumb css to core so we can reuse itRobin Appelman2012-09-091-0/+5
| | * add breadcrumb controll to jsRobin Appelman2012-09-091-0/+43
| | * [tx-robot] updated from transifexJenkins for ownCloud2012-09-092-0/+2
| | * forgot a ,Robin Appelman2012-09-091-1/+1
| | * add js versions of basename and dirnameRobin Appelman2012-09-081-0/+6
| | * [tx-robot] updated from transifexJenkins for ownCloud2012-09-081-0/+1
| | * Move handling of core remotes to OC_TemplateLayoutBart Visscher2012-09-073-18/+0
| * | Add support for share expirationMichael Gapczynski2012-09-012-0/+33
* | | Merge branch 'master' into routingBart Visscher2012-09-0767-181/+238
|\ \ \ | | |/ | |/|
| * | adding space between) and {Thomas Mueller2012-09-077-10/+10
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-09-071-0/+1
| * | make icons look good on bright and dark backgroundsJan-Christoph Borchardt2012-09-066-33/+33