summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-192-2/+6
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-184-6/+42
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-1724-34/+206
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-16234-78/+312
* Merge pull request #13323 from owncloud/move-searchLukas Reschke2015-01-157-4/+554
|\
| * adjust paths for searchMorris Jobke2015-01-144-7/+7
| * move search folder into core/Morris Jobke2015-01-134-0/+550
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-152-0/+22
* | Read version and product name from update templateVincent Petry2015-01-142-5/+9
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-146-0/+24
|/
* Merge pull request #13271 from owncloud/fix-table-prefix-oracle-masterMorris Jobke2015-01-131-1/+2
|\
| * Use a special filter expression for Oracle to filter the prefix - fixes #13220Thomas Müller2015-01-121-1/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-1324-4/+86
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-1246-122/+10
* 32-bit typo fixVolkan Gezer2015-01-111-3/+3
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-116-10/+12
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-106-4/+8
* Merge pull request #13195 from owncloud/resharepermfixMorris Jobke2015-01-092-0/+158
|\
| * Fix reshare permission issueVincent Petry2015-01-092-0/+158
* | Merge pull request #13205 from owncloud/remove-shared-iconThomas Müller2015-01-092-3/+4
|\ \
| * | replace outdated 'shared' people icon with regular share icon as fallbackJan-Christoph Borchardt2015-01-092-3/+4
| |/
* | Merge pull request #12995 from owncloud/tbelau666-masterThomas Müller2015-01-091-1/+3
|\ \ | |/ |/|
| * add default for dbtableprefixMorris Jobke2014-12-231-1/+1
| * use injected config object and fix typosMorris Jobke2014-12-221-1/+1
| * Use Doctrines filter by table nametbelau6662014-12-221-0/+2
* | Merge pull request #12984 from owncloud/ldap-user-cleanup-masterLukas Reschke2015-01-092-0/+48
|\ \
| * | inject and use user manager to delete command instead of using old static oc_...Arthur Schiwon2015-01-072-2/+13
| * | LDAP User Cleanup: Port from stable7 without further adjustementsArthur Schiwon2014-12-192-0/+37
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-0928-46/+92
* | | Merge pull request #13179 from owncloud/fix-fatal-php-error-for-not-existing-...Lukas Reschke2015-01-091-16/+12
|\ \ \
| * | | Verify whether type is correctLukas Reschke2015-01-081-16/+12
* | | | Add timeout for notificationsMorris Jobke2015-01-082-0/+134
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-082-2/+2
* | | Merge pull request #13016 from owncloud/sharing_fixesMorris Jobke2015-01-071-2/+2
|\ \ \
| * | | shareType and permissions are integersBjoern Schiessle2015-01-071-2/+2
* | | | Merge pull request #12687 from owncloud/auto-escape-t-placeholdersMorris Jobke2015-01-073-15/+43
|\ \ \ \
| * | | | Autoescape of placeholders in t() and p() - for JSMorris Jobke2015-01-073-15/+43
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-072-0/+8
* | | | | Merge pull request #13126 from owncloud/update-jquery-strengthifyThomas Müller2015-01-062-50/+52
|\ \ \ \ \
| * | | | | bower update for jquery.strengthify 0.4.1Morris Jobke2015-01-062-50/+52
| |/ / / /
* | | | | Merge pull request #12653 from owncloud/full_content_search_resultsMorris Jobke2015-01-063-64/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | make OCA.Search.Files available in tests and for other appsJörn Friedrich Dreyer2015-01-021-1/+2
| * | | | move search results below filelist, show hint when results are off screen, us...Jörn Friedrich Dreyer2015-01-021-36/+1
| * | | | add paged providerJörn Friedrich Dreyer2015-01-021-1/+1
| * | | | move code from js.js to search.js in the search appJörn Friedrich Dreyer2015-01-021-58/+3
| * | | | new OC.Search, add search result formatters and handlers, use full content wi...Jörn Friedrich Dreyer2015-01-022-21/+58
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-062-14/+14
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-0510-16/+334
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-046-58/+98
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-036-18/+24
|/ / / /