summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11080 from owncloud/addheader-text-2Vincent Petry2014-10-306-39/+31
|\
| * Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the $text...Lukas Reschke2014-10-286-39/+31
* | Merge pull request #11659 from jknockaert/masterVincent Petry2014-10-301-38/+54
|\ \
| * | initialisation of cipherjknockaert2014-10-281-1/+1
| * | small fixjknockaert2014-10-201-0/+1
| * | bugfixesjknockaert2014-10-201-5/+6
| * | ok; still some bugs that had to be fixedjknockaert2014-10-201-39/+35
| * | small fixjknockaert2014-10-191-1/+2
| * | rework getFileSizejknockaert2014-10-191-28/+45
* | | Merge pull request #11740 from owncloud/update-archive-tarThomas Müller2014-10-302-2/+0
|\ \ \
| * | | Update pear/archive_tar to 1.3.13Thomas Müller2014-10-302-2/+0
* | | | Merge pull request #11867 from owncloud/settings-sidebar-adminJan-Christoph Borchardt2014-10-305-111/+169
|\ \ \ \
| * | | | admin settings: fix LDAP settings header layoutJan-Christoph Borchardt2014-10-301-2/+3
| * | | | fix loading of more log entriesThomas Müller2014-10-304-37/+39
| * | | | fixing ldap listing in admin sidebar - needs styling reviewThomas Müller2014-10-301-2/+3
| * | | | introduce sidebar for admin pageThomas Müller2014-10-302-74/+128
* | | | | Merge pull request #11864 from owncloud/clear-session-after-logoutLukas Reschke2014-10-301-0/+1
|\ \ \ \ \
| * | | | | Clear session after logoutLukas Reschke2014-10-301-0/+1
| |/ / / /
* | | | | Merge pull request #11858 from owncloud/fix-11064Morris Jobke2014-10-302-2/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Allow any outgoing XHR connectionsLukas Reschke2014-10-302-2/+3
* | | | | Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moroThomas Müller2014-10-301-1/+1
|\ \ \ \ \
| * | | | | Fix stupid copy paste failLukas Reschke2014-10-301-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #11821 from owncloud/generic-responseMorris Jobke2014-10-308-29/+292
|\ \ \ \ \
| * | | | | add dataresponseBernhard Posselt2014-10-298-29/+292
* | | | | | Merge pull request #11863 from owncloud/fix-enc-sharingtestsMorris Jobke2014-10-301-1/+7
|\ \ \ \ \ \
| * | | | | | Properly register sharing hooks and proxiesVincent Petry2014-10-301-1/+7
| | |/ / / / | |/| | | |
* / | | | | update 3rdparty to match it's master branchMorris Jobke2014-10-301-0/+0
|/ / / / /
* | / / / [tx-robot] updated from transifexJenkins for ownCloud2014-10-30366-780/+1561
| |/ / / |/| | |
* | | | fix style of generated documentationMorris Jobke2014-10-291-1/+2
* | | | Merge pull request #11409 from owncloud/watcher-reuseVincent Petry2014-10-295-43/+53
|\ \ \ \
| * | | | Better reuse of cache data for getFolderContentsRobin Appelman2014-10-242-8/+14
| * | | | Fix shared cache getFolderContentsRobin Appelman2014-10-241-17/+14
| * | | | also update shared watcherRobin Appelman2014-10-241-2/+4
| * | | | Pass the cached data to the filesystem watcherRobin Appelman2014-10-242-16/+21
* | | | | Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolderMorris Jobke2014-10-293-35/+42
|\ \ \ \ \
| * | | | | Added encryption test when moving file as non-ownerVincent Petry2014-10-291-2/+15
| * | | | | Fix warning with unset extension checkVincent Petry2014-10-291-1/+1
| * | | | | Fix moving share keys as non-owner to subdirVincent Petry2014-10-291-32/+26
* | | | | | Merge pull request #11831 from owncloud/make-search-non-blockingLukas Reschke2014-10-291-0/+1
|\ \ \ \ \ \
| * | | | | | Close session for searchLukas Reschke2014-10-291-0/+1
* | | | | | | just add merge commit of 3rdparty repoMorris Jobke2014-10-291-0/+0
* | | | | | | Merge pull request #11638 from owncloud/oc8-translationsThomas Müller2014-10-293017-48185/+95745
|\ \ \ \ \ \ \
| * | | | | | | Fix implementation of translation short cutThomas Müller2014-10-291-9/+2
| * | | | | | | Adding translations for settingsThomas Müller2014-10-291-1/+3
| * | | | | | | Fix language file detectionVincent Petry2014-10-291-1/+1
| * | | | | | | update all translation files to js and jsonThomas Müller2014-10-292983-47944/+95191
| * | | | | | | adding console command to generate javascript translation files based on exis...Thomas Müller2014-10-2911-56/+187
| * | | | | | | Include core translationsVincent Petry2014-10-293-11/+20
| * | | | | | | in case a translation javascript is not found we no longer bail outThomas Müller2014-10-295-45/+5
| * | | | | | | Added OC.L10N namespace with translation functionsVincent Petry2014-10-2917-130/+343
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-22 09:48:05 +0000