summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-1128-151/+774
* Merge pull request #10992 from oparoz/patch-3Robin McCorkell2014-09-101-0/+4
|\
| * Create .user.ini for PHP-FPMOlivier Paroz2014-09-101-0/+4
* | Merge pull request #10988 from owncloud/usetransactions-wrong-nameThomas Müller2014-09-101-1/+1
|\ \ | |/ |/|
| * Fix method nameRobin Appelman2014-09-101-1/+1
* | Merge pull request #10990 from owncloud/fix-testCallRegister-masterLukas Reschke2014-09-101-1/+1
|\ \
| * | requesttoken has now a length of 30 charsThomas Müller2014-09-101-1/+1
|/ /
* | Merge pull request #10929 from owncloud/issue/10514Vincent Petry2014-09-101-0/+1
|\ \ | |/ |/|
| * Set overwritewebroot when installing owncloud to avoid problemsJoas Schilling2014-09-081-0/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1039-41/+89
* | Merge pull request #9512 from libasys/patch-2Lukas Reschke2014-09-091-1/+2
|\ \
| * | Fix use Sharing Api with calendarlibasys2014-07-081-2/+3
* | | Merge pull request #10844 from owncloud/acceptance-enableappsLukas Reschke2014-09-094-9/+304
|\ \ \
| * | | Added acceptance tests for enabling appsVincent Petry2014-09-034-9/+304
* | | | Merge pull request #10972 from ppaysant/routes-defaultsBernhard Posselt2014-09-092-4/+28
|\ \ \ \
| * | | | Allow default values for route parameters.Patrick Paysant2014-09-092-4/+28
* | | | | Merge pull request #10922 from owncloud/explicit-scan-transactionsLukas Reschke2014-09-095-6/+35
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix typoLukas Reschke2014-09-081-1/+1
| * | | | Use bigger transactions when doing explicit file system scansRobin Appelman2014-09-085-6/+35
| | |_|/ | |/| |
* | | | Merge pull request #10969 from owncloud/set-eVincent Petry2014-09-092-0/+5
|\ \ \ \
| * | | | terminate script execution in case of failureThomas Müller2014-09-092-0/+5
* | | | | Merge pull request #10964 from owncloud/static-array-functionsBernhard Posselt2014-09-091-7/+29
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | more sugar for including lists of templatesBernhard Posselt2014-09-091-7/+29
|/ / / /
* | | | Merge pull request #10948 from owncloud/fix-zindexLukas Reschke2014-09-091-3/+3
|\ \ \ \
| * | | | fix z-index of header and dropdowns, fix user menu not showing on mobileJan-Christoph Borchardt2014-09-081-3/+3
* | | | | Merge pull request #10947 from owncloud/html-importsBernhard Posselt2014-09-091-0/+10
|\ \ \ \ \
| * | | | | append .html since componets always use html filesBernhard Posselt2014-09-081-1/+1
| * | | | | add template functions for html importsBernhard Posselt2014-09-081-0/+10
* | | | | | Merge pull request #9753 from owncloud/filepath-cssThomas Müller2014-09-092-1/+21
|\ \ \ \ \ \
| * | | | | | Add beforeeach and aftereachLukas Reschke2014-09-091-4/+6
| * | | | | | Add unittest for filePathLukas Reschke2014-09-091-0/+18
| * | | | | | Remove special case for css in OC.filePathRobin Appelman2014-07-211-1/+1
* | | | | | | Merge pull request #10949 from owncloud/allow_prefilling_loginJörn Friedrich Dreyer2014-09-091-2/+2
|\ \ \ \ \ \ \
| * | | | | | | allow prefilling loginJörn Friedrich Dreyer2014-09-081-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #7323 from owncloud/Jonny007-MKD-masterLukas Reschke2014-09-093-6/+41
|\ \ \ \ \ \ \
| * | | | | | | Also update sqliteadapterRobin Appelman2014-07-021-3/+11
| * | | | | | | add unit testJörn Friedrich Dreyer2014-07-011-0/+22
| * | | | | | | Update adapter.phpJonny007-MKD2014-07-011-3/+8
* | | | | | | | Merge pull request #10886 from owncloud/keep_fileid_on_move_in_objectstoreJörn Friedrich Dreyer2014-09-092-33/+88
|\ \ \ \ \ \ \ \
| * | | | | | | | make objectstore tests check fileid on renameJörn Friedrich Dreyer2014-09-081-0/+83
| * | | | | | | | Keep fileid on move in objectstore, fixes #10848Jörn Friedrich Dreyer2014-09-051-33/+5
* | | | | | | | | Merge pull request #10928 from owncloud/allow_dot_in_dbname_on_web_installLukas Reschke2014-09-091-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | allow . in dbname on web installJörn Friedrich Dreyer2014-09-081-0/+3
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-0990-156/+206
* | | | | | | | | Merge pull request #10863 from owncloud/removeWarningWhenCheckIsDisabledVicDeo2014-09-092-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't show warning when has_internet_connection is set to falseLukas Reschke2014-09-052-2/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #10858 from owncloud/issue/10847VicDeo2014-09-092-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix broken new lines in plain text mail templateJoas Schilling2014-09-041-1/+1
| * | | | | | | | | Use correct language package so the subject is correctly translatedJoas Schilling2014-09-041-1/+1
* | | | | | | | | | Merge pull request #10927 from owncloud/update-nosetupbackendsVincent Petry2014-09-081-1/+3
|\ \ \ \ \ \ \ \ \ \