summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* increase opacity of buttons, fix for dark backgrounds like header in public s...Jan-Christoph Borchardt2013-01-291-2/+3
* Merge pull request #1352 from mjkent/masterLukas Reschke2013-01-291-0/+2
|\
| * Add robot.txtMichael Kent2013-01-281-0/+2
* | Merge pull request #1324 from owncloud/permanent-share-iconsMichael Gapczynski2013-01-283-6/+23
|\ \
| * | Change file action text for files inside shared folders as wellMichael Gapczynski2013-01-281-0/+1
| * | Change file action text to 'Shared'Michael Gapczynski2013-01-281-0/+3
| * | fix color change on clickJan-Christoph Borchardt2013-01-281-1/+1
| * | Merge branch 'master' into permanent-share-iconsJan-Christoph Borchardt2013-01-28189-4746/+5319
| |\|
| * | Permanently display shared status iconsMichael Gapczynski2013-01-262-5/+18
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-29138-6224/+6942
| |/ |/|
* | Fix phpdocRobin Appelman2013-01-281-2/+2
* | Merge pull request #1313 from owncloud/updater-CSPLukas Reschke2013-01-283-27/+27
|\ \
| * \ Merge branch 'master' into updater-CSPThomas Mueller2013-01-28217-5235/+5896
| |\ \
| * | | Move update inline JSLukas Reschke2013-01-253-27/+26
| * | | Move checkMaintenance and checkUpgradeLukas Reschke2013-01-251-2/+3
* | | | Merge pull request #1318 from j-ed/masterThomas Müller2013-01-282-0/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Update lib/mail.phpj-ed2013-01-261-0/+2
| * | | Update config/config.sample.phpj-ed2013-01-261-0/+4
* | | | Merge pull request #1321 from owncloud/csp-fixesThomas Müller2013-01-2811-46/+12
|\ \ \ \
| * | | | Use HTML5 data attribute + fix undefined variableLukas Reschke2013-01-266-27/+5
| * | | | Remove outdated commentsLukas Reschke2013-01-263-11/+0
| * | | | Fix undefined variableLukas Reschke2013-01-262-8/+7
* | | | | Merge pull request #1337 from owncloud/fix-issue-780Thomas Müller2013-01-271-0/+3
|\ \ \ \ \
| * | | | | Add create permission, fixes #780Michael Gapczynski2013-01-271-0/+3
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2824-151/+187
* | | | | Merge pull request #1326 from owncloud/event-source-tokenLukas Reschke2013-01-262-2/+1
|\ \ \ \ \
| * | | | | Use global oc_requesttoken for Event SourceMichael Gapczynski2013-01-262-2/+1
| | |_|_|/ | |/| | |
* / | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-27165-4555/+5118
|/ / / /
* | | | Merge pull request #1320 from owncloud/implements-1316-masterLukas Reschke2013-01-261-1/+8
|\ \ \ \ | |/ / / |/| | |
| * | | lookup for OCA classes in all apps foldersThomas Mueller2013-01-261-1/+8
* | | | Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-2615-161/+205
|\ \ \ \
| * | | | replace #notification with OC.Notification callThomas Mueller2013-01-191-2/+1
| * | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-1922-173/+141
| |\ \ \ \
| * | | | | update used space percent after each ajax call and display the notificationThomas Mueller2013-01-192-4/+15
| * | | | | introducing class OCA/files/lib/Helper with new function to build an array wi...Thomas Mueller2013-01-194-76/+63
| * | | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-18763-8788/+8108
| |\ \ \ \ \
| * | | | | | relative storage info without decimalsThomas Mueller2013-01-171-1/+1
| * | | | | | rename space -> storageThomas Mueller2013-01-171-1/+1
| * | | | | | pin notification to the topThomas Mueller2013-01-111-1/+1
| * | | | | | fixing text-align on navigation menu - closing div was missing - THX LukasThomas Mueller2013-01-111-1/+1
| * | | | | | fixing indent - sorryy wrong setting on the IDE :-(Thomas Mueller2013-01-111-17/+15
| * | | | | | adding accidentally removed line - THX @bartv2Thomas Mueller2013-01-111-0/+1
| * | | | | | displaying notification now centeredThomas Mueller2013-01-115-7/+8
| * | | | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-11275-5553/+8278
| |\ \ \ \ \ \
| * | | | | | | bring back L250 as spotted by @tanghus - THXThomas Mueller2013-01-081-0/+1
| * | | | | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-063-6/+16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-0627-558/+1043
| |\ \ \ \ \ \ \ \
| * | | | | | | | | js optimisations and style fixesThomas Mueller2013-01-061-15/+16
| * | | | | | | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-06168-3312/+6177
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | javascript syntax error fixed on the wayThomas Mueller2013-01-041-3/+3