wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8296 commits 157 branches 562 tags 714 MiB
Commit graph

8296 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Mueller
9afdc14d40 adding accidentally removed line - THX @bartv2 2013-01-11 14:55:49 +01:00
Thomas Mueller
508b6a9fc7 displaying notification now centered 
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
 2013-01-11 11:52:07 +01:00
Thomas Mueller
364b1cd391 Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/js/files.js
 2013-01-11 10:00:12 +01:00
Thomas Müller
60489764f3 Merge pull request #1133 from owncloud/add_linebreaks_in_sharing 
add more linebreaks, replace SQL LIMIT with param
 2013-01-10 15:14:14 -08:00
Jenkins for ownCloud
d03dce1283 [tx-robot] updated from transifex 2013-01-11 00:06:14 +01:00
Thomas Müller
23dd7f1bea Merge pull request #1127 from owncloud/fixing-641-for-webdav-master 
webdav returns "503 Service Unavailable" in case the ownCloud server is ...
 2013-01-10 02:27:00 -08:00
Jenkins for ownCloud
912050afa0 [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
Lukas Reschke
fda1ada4f0 Merge pull request #1131 from owncloud/more_translations 
translate move and rename error messages
 2013-01-09 12:07:39 -08:00
Lukas Reschke
ca027f3749 Merge pull request #1124 from schiesbn/sabredav2 
OC_Connector_Sabre_Client no longer needed
 2013-01-09 12:06:25 -08:00
Jörn Friedrich Dreyer
42e3eaf45a add more linebreaks, replace SQL LIMIT with param 2013-01-09 13:57:51 +01:00
Jörn Friedrich Dreyer
a40c95242f more translations 2013-01-09 12:48:57 +01:00
Thomas Mueller
ccdaec6296 webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode. 2013-01-09 00:37:50 +01:00
Jenkins for ownCloud
533f0e8e25 [tx-robot] updated from transifex 2013-01-09 00:05:49 +01:00
Thomas Tanghus
dae8f15f9f Merge pull request #938 from owncloud/fix_minor_files_annoyances 
Fix minor files annoyances
 2013-01-08 15:02:06 -08:00
Björn Schießle
43415386a8 Upstream merged my patch to add additional ssl root certificates to the webdav client. 
This means that OC_Connector_Sabre_Client is no longer needed
 2013-01-08 17:44:28 +01:00
Thomas Mueller
7b9e6d2f2c fixing string concatenation in javascript 
refs ae54364d7c
 2013-01-08 00:32:41 +01:00
Jenkins for ownCloud
b69328e1d1 [tx-robot] updated from transifex 2013-01-08 00:31:36 +01:00
Thomas Mueller
bfc55fef89 bring back L250 as spotted by @tanghus - THX 2013-01-08 00:24:35 +01:00
Frank Karlitschek
861f32a22b Update apps/user_webdavauth/user_webdavauth.php 
Fixing wrong documentation. Fixes https://github.com/owncloud/core/issues/1110
 2013-01-07 16:45:03 +01:00
Jörn Friedrich Dreyer
0dda8f5d1c ie8 ignores rgba, show button border in ie8 by adding second border css row 2013-01-07 13:09:52 +01:00
Jörn Friedrich Dreyer
3bb7ee521f attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index 2013-01-07 12:23:29 +01:00
Jörn Friedrich Dreyer
da442b024c remove aborted uploads 2013-01-07 11:11:21 +01:00
Jörn Friedrich Dreyer
cbb118d4a3 adapt to isFileNameValid, whitespace cleanup 2013-01-07 10:39:35 +01:00
Jörn Friedrich Dreyer
3dbb148567 Merge pull request #1061 from owncloud/remove_css_not_selector_to_fix_ie8_input_fields 
remove css not selector - incompatible with ie8
 2013-01-07 01:17:19 -08:00
Jenkins for ownCloud
0b007235b9 [tx-robot] updated from transifex 2013-01-07 00:06:32 +01:00
Thomas Müller
7ca740fa3d Merge pull request #632 from owncloud/fix_629 
fix pattern for database names - #629
 2013-01-06 14:03:02 -08:00
Thomas Mueller
9671ace32e Merge branch 'master' into fix_minor_files_annoyances 
Conflicts:
	apps/files/js/files.js
 2013-01-06 22:46:40 +01:00
Thomas Mueller
07b3b23a39 Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/js/files.js
 2013-01-06 22:28:21 +01:00
Thomas Müller
08d7b8ce30 Merge pull request #1092 from owncloud/rename_dot 
Files: prevent people from renaming files to '.'
 2013-01-06 07:25:12 -08:00
Thomas Mueller
b4191b7da5 rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has changed! 
adding file name checks and notifications to isFileNameValid() for . and empty file name
 2013-01-06 12:52:00 +01:00
Thomas Mueller
7ebfcab49b Merge branch 'master' into fixing-998-master 
Conflicts:
	lib/helper.php
 2013-01-06 12:18:21 +01:00
Thomas Mueller
a867b36e7f js optimisations and style fixes 2013-01-06 10:41:07 +01:00
Thomas Mueller
6806484c16 Merge branch 'master' into fixing-998-master 2013-01-06 10:36:14 +01:00
Michael Gapczynski
da7a14e9a6 Merge pull request #1079 from owncloud/update-progress 
Updater progress feedback
 2013-01-05 09:33:29 -08:00
Michael Gapczynski
035d0aa9d5 Merge branch 'master' into update-progress 2013-01-05 12:24:21 -05:00
Michael Gapczynski
5ea8adc7c7 Reformat long line 2013-01-05 12:21:57 -05:00
Michael Gapczynski
f6426cee04 Tweak failure message and throw exceptions from updateDbFromStructure() 2013-01-05 12:13:36 -05:00
Michael Gapczynski
89823ef4f9 Modify and include additional update messages from updating apps 2013-01-05 11:28:01 -05:00
Michael Gapczynski
6b2216f0d6 Remove old data directory protection from update, should already have taken place or not working because the server isn't Apache 2013-01-05 11:09:48 -05:00
Thomas Müller
0c6213a371 Merge pull request #1066 from owncloud/fix-388-master 
workaround for 32-bit systems to handle filesizes bigger than 2GB
 2013-01-05 06:21:28 -08:00
Robin Appelman
a5dcbc3d8a Files: prevent people from renaming files to '.' 2013-01-05 03:30:05 +01:00
Michael Gapczynski
0b13b41189 Merge pull request #1053 from owncloud/ocs_api 
External API for ownCloud based on OCS
 2013-01-04 17:18:58 -08:00
Michael Gapczynski
a94405b4e4 Only show the version updating to instead of worrying about converting internal to a formatted version 2013-01-04 20:13:00 -05:00
Thomas Mueller
da28ae0069 remove duplicate return 2013-01-05 00:09:37 +01:00
Jenkins for ownCloud
934d9dcc42 [tx-robot] updated from transifex 2013-01-05 00:03:58 +01:00
Thomas Mueller
2cb6632752 enhanced log message 2013-01-04 23:44:01 +01:00
Thomas Mueller
b5d1dfcdc9 javascript syntax error fixed on the way 2013-01-04 23:38:07 +01:00
Thomas Mueller
594d388ad9 new javascript notification functions used within users.js 2013-01-04 23:37:21 +01:00
Thomas Mueller
ba475d4862 javascript notification functions have been moved to js.js for common use 2013-01-04 23:34:09 +01:00
Thomas Mueller
ac50c2f973 documentation adjusted on the way 2013-01-04 23:04:23 +01:00