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

288 commits

Author SHA1 Message Date
Thomas Tanghus
4648dcfa46 VCategories: Use correct variable. 2012-11-04 12:09:04 +01:00
Thomas Tanghus
5fc0c89a73 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-31 16:09:11 +01:00
Thomas Tanghus
3813ee78c3 Merge pull request #112 from libasys/Fix-strange-Isue-IE8 
Use $.each() instead of for(var...) in oc.dialogs. Fixes accessing undefined vars in IE8.
 2012-10-31 06:16:13 -07:00
libasys
b095e32227 UPDATE oc-dialogs.js and Fix some small Bugs Added in the description of form a select ecample 2012-10-31 09:42:26 +01:00
Thomas Tanghus
5550cde03b Merge branch 'master' of github.com:owncloud/core into vcategories_db 
Fix conflicts:
	core/ajax/vcategories/add.php
	core/ajax/vcategories/delete.php
 2012-10-30 06:53:49 +01:00
Bart Visscher
ed7accd237 Change search to use routing 2012-10-29 15:04:55 +01:00
Michael Gapczynski
e5a74903e4 Try to fix shared status icons again 2012-10-28 16:36:17 -04:00
Michael Gapczynski
60e5054ae8 Fix shared status icons 2012-10-28 16:02:05 -04:00
Björn Schießle
f2f2b8ba3b added some visual feedback is password was set 2012-10-28 14:57:36 +01:00
Björn Schießle
a4a1dad831 set password if user leaves password field (issue #57) 2012-10-28 14:31:34 +01:00
Bart Visscher
939b51e46f Fix download url generation 2012-10-27 15:10:21 +02:00
Bart Visscher
0120f3fd62 Merge branch 'routing' 
Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
 2012-10-27 11:58:02 +02:00
Jan-Christoph Borchardt
46871e9b2e update infieldlabel script from @zawaideh to fix autofill overlap, https://github.com/zawaideh/In-Field-Labels-jQuery-Plugin 2012-10-26 21:47:05 +02:00
Thomas Müller
628c7ca9cf closes #113 2012-10-26 21:18:03 +02:00
libasys
0cf1fef3fa Fix for problems using for() function instead of $.each for arrays with IE8 2012-10-26 20:34:04 +02:00
Thomas Tanghus
675a56c5ed Merge branch 'master' of github.com:owncloud/core into vcategories_db 
Conflicts:
	lib/vcategories.php
 2012-10-24 21:55:25 +02:00
Lukas Reschke
b1150f6a7f Urlencode the share URL 
Fixes #63
 2012-10-23 17:55:49 +02:00
Thomas Tanghus
273fdb7b64 Added type and callback arguments to most methods. 2012-10-22 15:40:08 +02:00
scambra
41b597e179 Translate formatDate using jquery datepicker 2012-10-19 13:56:19 +02:00
scambra
a24d8db4b2 translate datepicker 2012-10-19 13:56:19 +02:00
Thomas Tanghus
fdf3ec1027 Add wait state to category dialog while processing. 2012-10-19 02:25:39 +02:00
Thomas Tanghus
81536a81e3 More js updates for app/type in OCCategories 2012-10-19 00:39:09 +02:00
Thomas Tanghus
97c884c548 Updated category js for handling favorites and use post instead of get. 2012-10-19 00:09:07 +02:00
Bart Visscher
6081bfa2bc Merge branch 'master' into routing 
Conflicts:
	lib/search/provider/file.php
	settings/ajax/changepassword.php
	settings/settings.php
 2012-10-17 16:38:11 +02:00
scambra
c814a7a841 use interpolation for some translations in js 2012-10-16 20:53:31 +02:00
Lukas Reschke
cdd30216b1 escapeHTML function 2012-10-12 14:10:11 +02:00
Thomas Müller
a0c53619ff Merge pull request #24 from owncloud/js_variable_interpolation 
A suggestion for simple, yet efficient variable interpolation in js translations
 2012-10-10 00:40:47 -07:00
Victor Dubiniuk
71ff6382b5 Prevent closing sharing dialog on picking the date 2012-10-08 22:38:14 +03:00
Victor Dubiniuk
06d00af9f8 Prevent closing sharing dialog on month adjustment. Fixes oc-1884 2012-10-08 22:03:16 +03:00
Bart Visscher
f3a211c03c Implement routing on javascript side 2012-10-05 09:42:36 +02:00
Thomas Tanghus
bb345770af Suggestion for simple, yet efficient variable interpolation in js translations. 2012-10-05 03:33:46 +02:00
Björn Schießle
16eade5a3b share.expiration is null if no expiration date is set. 2012-10-04 11:18:37 +02:00
Michael Gapczynski
7bee735877 Show correct public link url for folders 2012-10-03 16:17:36 -04:00
Bart Visscher
de1bfe9d6b Make the core ajax calls use the router 2012-10-02 21:58:42 +02:00
Bart Visscher
bb136b9adf Make the settings ajax calls use the router 2012-10-02 18:00:23 +02:00
Georg Ehrke
43c85248d4 Share - Dropdown dialog - cut off username if it's longer than 14 chars - bugfix for oc-1871 2012-10-01 16:04:20 +02:00
Bart Visscher
a33dda3c65 Fix double url decoding in fileDownloadPath function 2012-09-29 18:10:23 +02:00
Thomas Müller
7f6a984e57 Merge pull request #20 from scambra/undo-l10n 
undo interpolation in js for 4.5
 2012-09-28 14:32:44 -07:00
Bart Visscher
c9317b5a68 Merge branch 'master' into routing 2012-09-28 21:41:21 +02:00
scambra
8f27881770 undo interpolation in js for 4.5 2012-09-28 19:53:18 +02:00
Bart Visscher
bf1057143c Merge branch 'master' into routing 
Conflicts:
	apps/files/js/filelist.js
	core/js/js.js
	lib/ocs.php
 2012-09-28 15:38:49 +02:00
Christian Reiner
743826bbf3 Reimplementation of CSRF protection including autorefresh 2012-09-28 13:30:44 +02:00
Michael Gapczynski
b4e40b1c21 Fix unsetting share expiration date 2012-09-26 00:09:35 -04:00
Michael Gapczynski
00103d730f Show share expiration date set for shared item 2012-09-26 00:04:27 -04:00
Michael Gapczynski
2bdf89f4d4 Stop autocomplete selection event propogration so share dropdown doesn't disappear, fixes bug oc-1773 2012-09-25 23:18:36 -04:00
Robin Appelman
a22a5d6807 some js style fixes 2012-09-23 03:16:52 +02:00
scambra
d5211f9615 some characters in comments avoid finding some strings to translate 2012-09-21 12:05:01 +02:00
scambra
0f15bc881f fix translating dialog buttons, they are translated in core not dialogs app 2012-09-21 11:48:57 +02:00
scambra
22c6b48d2f translate files_sharing app 2012-09-21 11:48:20 +02:00
Björn Schießle
b1c60841e8 float right element needs to be the first element, otherwise firefox will move it to a new line 2012-09-20 10:31:23 +02:00