summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | Adapt token size to new generation and add an option for free length specific...kondou2014-09-041-16/+5
| * | | | | | Use a route instead of s.php and convert tokens asapkondou2014-09-0412-54/+69
| * | | | | | Initial work on shorter linkskondou2014-09-045-3/+53
* | | | | | | Merge pull request #10930 from owncloud/use-admincheckLukas Reschke2014-09-081-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Check for admin user instead of subadminLukas Reschke2014-09-081-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #10451 from k4k/login_logo_alignment_fixVolkan Gezer2014-09-082-3/+1
|\ \ \ \ \ \ \
| * | | | | | | improve logo flexibility to fix wide custom logo alignment, fix #9339twood82014-08-152-3/+1
* | | | | | | | Merge pull request #10938 from owncloud/useSecureMimetypeLukas Reschke2014-09-082-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Use secure mimetype for content deliveryLukas Reschke2014-09-082-2/+2
* | | | | | | | | Merge pull request #10827 from oparoz/patch-2Lukas Reschke2014-09-081-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | env:UserInstallation was already there in masterOlivier Paroz2014-09-031-2/+2
| * | | | | | | | | Libreoffice config folder needs to be setOlivier Paroz2014-09-031-1/+1
* | | | | | | | | | Merge pull request #10890 from owncloud/fix-10888Lukas Reschke2014-09-081-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | if only one attribute is requested, the returned array has 0 as key instead o...Arthur Schiwon2014-09-051-1/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #10911 from owncloud/template-funcsLukas Reschke2014-09-081-0/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add shortcut functions for style and scriptBernhard Posselt2014-09-061-0/+18
* | | | | | | | | | | Merge pull request #10935 from owncloud/who_knows_what_horrors_lie_in_the_dar...Clark Tomlinson2014-09-081-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | w͢͢͝h͡o͢͡ ̸͢k̵͟n̴͘ǫw̸̛s͘ ̀́w͘͢ḩ̵a҉̡͢t ̧̕h́o̵r͏...Jörn Friedrich Dreyer2014-09-081-0/+2
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #10891 from owncloud/files-moveoperationcatchexceptionVincent Petry2014-09-081-4/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Catch exceptions when moving filesVincent Petry2014-09-051-4/+10
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #10862 from chli1/masterVincent Petry2014-09-081-5/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix BadRequest error if CONTENT_LENGTH not setchli12014-09-041-5/+8
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-0719-16/+54
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-0617-43/+47