aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* This fixes the double scrollbars issueBernhard Posselt2014-09-091-1/+0
* 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
|\ \ \ \ \ \ \ \
| * | | | | | | | Do not load extra user backends when an upgrade is dueVincent Petry2014-09-081-1/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #10944 from owncloud/fix-nojavascript-styleJan-Christoph Borchardt2014-09-084-15/+17
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | also add no-JavaScript notice to log in and sharing pages because they do not...Jan-Christoph Borchardt2014-09-083-2/+4
| * | | | | | | fix styling and wording of no-JavaScript messageJan-Christoph Borchardt2014-09-082-14/+14
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #10739 from owncloud/eventsource-publicLukas Reschke2014-09-088-52/+108
|\ \ \ \ \ \ \
| * | | | | | | Better phpdoc and method namingRobin Appelman2014-09-047-8/+10
| * | | | | | | Explicitly cast id and validate typeRobin Appelman2014-09-041-3/+6
| * | | | | | | Use the public api to get event sourcesRobin Appelman2014-09-034-9/+8
| * | | | | | | Add event source to the public apiRobin Appelman2014-09-034-1/+49
| * | | | | | | Initialize an event source when we start using it, not in the constructorRobin Appelman2014-09-031-42/+46
| |/ / / / / /
* | | | | | | Merge pull request #10740 from owncloud/fix-everyone-group-countLukas Reschke2014-09-085-21/+82
|\ \ \ \ \ \ \
| * | | | | | | Using countUsers method to return true count of usersClark Tomlinson2014-09-055-21/+82
* | | | | | | | Merge pull request #10885 from owncloud/swift-hasupdatedLukas Reschke2014-09-082-20/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix hasUpdated for folders in swift backendRobin Appelman2014-09-051-0/+22
| * | | | | | | | Fix configuration of rackspaceRobin Appelman2014-09-052-20/+30
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #10755 from owncloud/shorter_sharing_linksLukas Reschke2014-09-0810-17/+74
|\ \ \ \ \ \ \ \
| * | | | | | | | Match \OC_Helper::linkToPublic() to new links and fit unittestskondou2014-09-042-10/+28
| * | | | | | | | Readd TOKEN_LENGTHkondou2014-09-042-1/+3
| * | | | | | | | Use base62 and remove configuration options for link lengthkondou2014-09-042-21/+2
| * | | | | | | | Change config.sample entry and use MediumSecuritykondou2014-09-042-8/+10