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

3061 commits

Author SHA1 Message Date
Michael Gapczynski
ea23854328 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/contacts/templates/part.chooseaddressbook.rowfields.php
 2012-08-06 13:49:54 -04:00
Michael Gapczynski
ba0cf98175 Remove extra line, caused 'headers already sent' issues 2012-08-06 13:33:53 -04:00
Bart Visscher
fe6450002d Change hardcoded urls to use linkTo function 2012-08-06 18:51:41 +02:00
Michael Gapczynski
3b2c853916 Lots of refactoring to share API 2012-08-06 11:27:13 -04:00
Arthur Schiwon
e6759a980b LDAP: layout settings form. Hope it is now a bit clearer and prettier. 2012-08-06 17:25:59 +02:00
Jenkins for ownCloud
9ca8d20a99 [tx-robot] updated from transifex 2012-08-06 02:02:50 +02:00
Arthur Schiwon
95c33e466c LDAP: offer option to disable SSL certificate checks. Works around problems with self-signed certificates, for example. However, the best and right way to solve it is always to import the LDAP server cert to the owncloud server, so you it for testing only. 
Like to hear wether it works, instead appending LDAPTLS_REQCERT=never to ldap.conf.
 2012-08-05 23:00:47 +02:00
Arthur Schiwon
6fd48675e6 remove accidentally added blank lines 2012-08-05 22:03:47 +02:00
Arthur Schiwon
c10010e410 LDAP: check for always available attribute on userExists, fixes oc-1440 2012-08-05 22:02:34 +02:00
Arthur Schiwon
c3cbb463e3 add missing \ 2012-08-05 21:35:37 +02:00
Arthur Schiwon
d546718179 LDAP: sanitize user and group base trees for strripos comparison. fixes oc-1302 2012-08-05 21:28:59 +02:00
Thomas Tanghus
80ca883d4c Correct path to ajax file. 2012-08-05 03:36:16 +02:00
Michael Gapczynski
002ad4ba16 Tweak users delete notification 2012-08-04 16:44:26 -04:00
Michael Gapczynski
086397d8a1 Fix condition checking for resizing breadcrumbs 2012-08-04 15:57:49 -04:00
Michael Gapczynski
207ca3ec06 Dynamically resize breadcrumbs, fix for bug oc-468 2012-08-04 15:50:32 -04:00
Georg Ehrke
da4057ecfd fix label for versioning in admin settings 2012-08-04 18:51:09 +02:00
Jenkins for ownCloud
d7e77f6426 [tx-robot] updated from transifex 2012-08-04 02:04:21 +02:00
Thomas Tanghus
bef63527ce Reorganize ajax scripts. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
3610975bc1 Some fixes for keyboard shortcuts. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
e3de746bb6 FF complained about missing charset. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
578e074c00 White space. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
98057dba5b Revert "Removed text/plain header." 
This reverts commit fa6d26b53c.
 2012-08-03 21:32:27 +02:00
Michael Gapczynski
09bb3bfaf8 Preparing for proper collection implementation 2012-08-03 15:05:45 -04:00
Bart Visscher
b12ed88794 Calendar: remove double html encoding 2012-08-03 16:18:33 +02:00
Bart Visscher
599741bdd6 audit: update appinfo to OC4 2012-08-03 16:05:48 +02:00
Bart Visscher
e36e00dc00 Merge branch 'chunked_upload' 2012-08-03 15:58:17 +02:00
Jenkins for ownCloud
7dc799c167 [tx-robot] updated from transifex 2012-08-03 02:04:12 +02:00
Thomas Tanghus
7dda5527f1 Return properly formatted jsondata. 2012-08-02 19:03:45 +02:00
Thomas Tanghus
d07f4a5ea8 Correct namespace usage. 2012-08-02 19:03:06 +02:00
Thomas Tanghus
40d2bb70d7 Remove logging 2012-08-02 19:01:55 +02:00
Thomas Tanghus
8f3357c305 I was a bit too fast in removing methods yesterday... 2012-08-02 18:57:03 +02:00
Thomas Tanghus
a484ee817c If first addressbook was empty it was seen as if there where no contacts at all. 2012-08-02 18:50:20 +02:00
Thomas Tanghus
a1239a37aa Line length... 2012-08-02 05:02:36 +02:00
Thomas Tanghus
30c3a783d9 Remove onunload handler when delete is cancelled. 2012-08-02 05:01:54 +02:00
Thomas Tanghus
20f8971222 Use popup class style for ninja-mode help. 2012-08-02 04:18:44 +02:00
Thomas Tanghus
f84e92e6e3 More files to delete \o/ 2012-08-02 04:18:44 +02:00
Thomas Tanghus
937058cdec Updated JS namespace. 2012-08-02 04:18:44 +02:00
Jenkins for ownCloud
91e828c6ce [tx-robot] updated from transifex 2012-08-02 02:06:16 +02:00
Thomas Tanghus
f159f607de And then the missing files ;) 2012-08-02 00:02:07 +02:00
Thomas Tanghus
a8faae4f42 Addressbooks settings rewrite and cleanup. 2012-08-02 00:02:07 +02:00
Jenkins for ownCloud
274d1ef87f [tx-robot] updated from transifex 2012-08-01 02:02:35 +02:00
Jenkins for ownCloud
36ccaf51ed [tx-robot] updated from transifex 2012-07-31 22:57:24 +02:00
Michael Gapczynski
94ce8f2168 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/files_sharing/js/share.js
 2012-07-31 15:00:04 -04:00
Thomas Tanghus
5eed59bd54 Changed fix parameter to OC.appSettings(). 2012-07-31 14:18:32 +02:00
Thomas Tanghus
90a1b5a758 Unregister from personal settings. 2012-07-31 12:23:22 +02:00
Thomas Tanghus
19c55e2d44 Implemented app settings in popup. 2012-07-31 12:23:22 +02:00
Michael Gapczynski
dfae77dec1 Add notifications and undo support for replacing files when renaming 2012-07-30 12:22:11 -04:00
Arthur Schiwon
b465fc84ae LDAP: don't die on unexpected collisions, handle empty display-name attributes properly 2012-07-30 17:42:33 +02:00
Michael Gapczynski
29dab0846e Remove another accidently added 3rdparty app 2012-07-30 10:37:54 -04:00
Michael Gapczynski
530e7f03cd Remove accidently added 3rd party apps 2012-07-30 10:34:12 -04:00